From b32305e3e10c9bb10eb242b8a6c7c8b14ad6f6de Mon Sep 17 00:00:00 2001 From: Ugo Cirmignani Date: Sat, 15 Dec 2018 19:34:14 +0100 Subject: [PATCH] merged with new branch TLS --- ftpCommandElaborate.c | 4 ---- library/openSsl.c | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ftpCommandElaborate.c b/ftpCommandElaborate.c index 72b2b6d..900fccf 100644 --- a/ftpCommandElaborate.c +++ b/ftpCommandElaborate.c @@ -1137,11 +1137,7 @@ int parseCommandRnto(ftpDataType * data, int socketId) if (FILE_IsFile(data->clients[socketId].renameFromFile.text) == 1 || FILE_IsDirectory(data->clients[socketId].renameFromFile.text) == 1) { -<<<<<<< HEAD - returnCode = rename (theClientData->renameFromFile.text, theClientData->renameToFile.text); -======= returnCode = rename (data->clients[socketId].renameFromFile.text, data->clients[socketId].renameToFile.text); ->>>>>>> TLS if (returnCode == 0) { returnCode = socketPrintf(data, socketId, "s", "250 File successfully renamed or moved\r\n"); diff --git a/library/openSsl.c b/library/openSsl.c index 0a92bfa..b68f08c 100644 --- a/library/openSsl.c +++ b/library/openSsl.c @@ -60,6 +60,7 @@ void cleanupOpenssl() { thread_cleanup(); EVP_cleanup(); + } SSL_CTX *createServerContext()