Applied-Software/uFTP
5
0
Fork 0
mirror of https://github.com/kingk85/uFTP.git synced 2025-07-14 15:56:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

merged with new branch TLS

Browse Source
This commit is contained in:
Ugo Cirmignani
2018-12-15 19:34:14 +01:00
parent aa44a0cda1
commit b32305e3e1
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ftpCommandElaborate.c
View File

@ -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");

1
library/openSsl.c
View File

@ -60,6 +60,7 @@ void cleanupOpenssl()
{
thread_cleanup();
EVP_cleanup();
}
SSL_CTX *createServerContext()