diff -rcN version-2.0.1/CHANGES version-2.0.1-patch01/CHANGES *** version-2.0.1/CHANGES Wed May 2 16:27:51 2001 --- version-2.0.1-patch01/CHANGES Fri May 4 18:57:44 2001 *************** *** 1,3 **** --- 1,23 ---- + Version 2.0.2 + ------------- + + bbftpd daemon: + o Correct return code treatment + (loginsequence.c,readcontrol_v2.c,storeafile.c) + o Change Linux compilation option + (Build) + + bbftp client: + o Correct bug on file descriptor close + (bbftp_store_rfio.c) + o Change Linux compilation option + (Build) + + includes: + o Change Linux compilation option (add padding) + (structures.h) + + Version 2.0.1 ------------- diff -rcN version-2.0.1/bbftpc/Build version-2.0.1-patch01/bbftpc/Build *** version-2.0.1/bbftpc/Build Wed May 2 15:36:57 2001 --- version-2.0.1-patch01/bbftpc/Build Fri May 4 17:45:30 2001 *************** *** 58,64 **** *) ;; esac - MYCFLAGS="-malign-double" OBJ=$OS.$rel ;; *) --- 58,63 ---- diff -rcN version-2.0.1/bbftpc/bbftp_store_rfio.c version-2.0.1-patch01/bbftpc/bbftp_store_rfio.c *** version-2.0.1/bbftpc/bbftp_store_rfio.c Wed May 2 15:36:58 2001 --- version-2.0.1-patch01/bbftpc/bbftp_store_rfio.c Fri May 4 18:28:44 2001 *************** *** 8,13 **** --- 8,14 ---- - Port to IRIX - Close all file descriptor not needed in child (bug shown by Alvise Dorigo) + v 2.0.2 2001/05/04 - Correct bug on file descriptor close *****************************************************************************/ #include *************** *** 687,692 **** --- 688,694 ---- int *pidfree ; int *socknumber ; + int *socktoclose ; int i ; int retcode ; int compressionon ; diff -rcN version-2.0.1/bbftpd/Build version-2.0.1-patch01/bbftpd/Build *** version-2.0.1/bbftpd/Build Wed May 2 15:36:58 2001 --- version-2.0.1-patch01/bbftpd/Build Fri May 4 17:45:54 2001 *************** *** 56,62 **** *) ;; esac - MYCFLAGS="-malign-double" OBJ=$OS.$rel ;; *) --- 56,61 ---- diff -rcN version-2.0.1/bbftpd/loginsequence.c version-2.0.1-patch01/bbftpd/loginsequence.c *** version-2.0.1/bbftpd/loginsequence.c Wed May 2 15:36:59 2001 --- version-2.0.1-patch01/bbftpd/loginsequence.c Fri May 4 18:48:56 2001 *************** *** 11,27 **** code was contained in readcontrol.c v 1.8.0 2000/04/14 - Introduce RSA Cryptage v 1.8.3 2000/04/18 - Change the reply message in order ! to stop retry in case of unkown user or incorrect password v 1.8.7 2000/05/24 - Modify headers v 1.8.11 2000/05/24 - Add Pam for Linux (and only pam...) v 1.9.0 2000/08/18 - Use configure to help portage ! - Change the reply message (for future use) v 1.9.0 2000/09/19 - Correct bug for pam v 1.9.4 2000/10/16 - Supress %m v 2.0.0 2000/12/18 - Use incontrolsock instead of msgsock v 2.0.1 2001/04/23 - Correct indentation *****************************************************************************/ --- 11,28 ---- code was contained in readcontrol.c v 1.8.0 2000/04/14 - Introduce RSA Cryptage v 1.8.3 2000/04/18 - Change the reply message in order ! to stop retry in case of unkown user or incorrect password v 1.8.7 2000/05/24 - Modify headers v 1.8.11 2000/05/24 - Add Pam for Linux (and only pam...) v 1.9.0 2000/08/18 - Use configure to help portage ! - Change the reply message (for future use) v 1.9.0 2000/09/19 - Correct bug for pam v 1.9.4 2000/10/16 - Supress %m v 2.0.0 2000/12/18 - Use incontrolsock instead of msgsock v 2.0.1 2001/04/23 - Correct indentation + v 2.0.2 2001/05/04 - Correct return code treatment *****************************************************************************/ *************** *** 132,138 **** /* ** Read the crypt type */ ! if ( retcode = readmessage(incontrolsock,receive_buffer,CRYPTMESSLEN,CONTROLSOCKTO) < 0 ) { /* ** Error ... */ --- 133,139 ---- /* ** Read the crypt type */ ! if ( (retcode = readmessage(incontrolsock,receive_buffer,CRYPTMESSLEN,CONTROLSOCKTO)) < 0 ) { /* ** Error ... */ *************** *** 144,150 **** /* ** RSA */ ! if ( retcode = readmessage(incontrolsock,receive_buffer,RSAMESSLEN,CONTROLSOCKTO) < 0) { return(retcode) ; } if ( decodersapass(receive_buffer,username,password) < 0 ) { --- 145,151 ---- /* ** RSA */ ! if ( (retcode = readmessage(incontrolsock,receive_buffer,RSAMESSLEN,CONTROLSOCKTO)) < 0) { return(retcode) ; } if ( decodersapass(receive_buffer,username,password) < 0 ) { diff -rcN version-2.0.1/bbftpd/readcontrol_v2.c version-2.0.1-patch01/bbftpd/readcontrol_v2.c *** version-2.0.1/bbftpd/readcontrol_v2.c Wed May 2 15:36:59 2001 --- version-2.0.1-patch01/bbftpd/readcontrol_v2.c Fri May 4 18:40:24 2001 *************** *** 1,6 **** /**************************************************************************** ! Copyright (c) 1999 Gilles Farrache In2p3 Computing Center All rights reserved. RETURN: --- 1,6 ---- /**************************************************************************** ! Copyright (c) 1999,2000,2001 Gilles Farrache In2p3 Computing Center All rights reserved. RETURN: *************** *** 9,14 **** --- 9,15 ---- readcontrol_v2.c v 2.0.0 2000/12/19 - Routine creation v 2.0.1 2001/04/23 - Correct indentation + v 2.0.2 2001/05/04 - Correct return code treatment *****************************************************************************/ #include *************** *** 357,363 **** /* ** Create the file */ ! if ( retcode = storecreatefile(realfilename,logmessage) < 0 ) { reply(MSG_BAD_NO_RETRY,logmessage) ; free_all_var() ; free(logmessage) ; --- 358,364 ---- /* ** Create the file */ ! if ( (retcode = storecreatefile(realfilename,logmessage)) < 0 ) { reply(MSG_BAD_NO_RETRY,logmessage) ; free_all_var() ; free(logmessage) ; *************** *** 559,565 **** /* ** Create the file */ ! if ( retcode = retrcheckfile(curfilename,logmessage) < 0 ) { reply(MSG_BAD_NO_RETRY,logmessage) ; free_all_var() ; free(logmessage) ; --- 560,566 ---- /* ** Create the file */ ! if ( (retcode = retrcheckfile(curfilename,logmessage)) < 0 ) { reply(MSG_BAD_NO_RETRY,logmessage) ; free_all_var() ; free(logmessage) ; *************** *** 866,874 **** if ( (retcode = retrtransferfile(curfilename,logmessage)) == 0 ) { /* ** Everything seems to work correctly ! */ ! syslog(LOG_ERR,"retrtransferfile retcode = 0") ; ! free(logmessage) ; return 0 ; } --- 867,873 ---- if ( (retcode = retrtransferfile(curfilename,logmessage)) == 0 ) { /* ** Everything seems to work correctly ! */ free(logmessage) ; return 0 ; } diff -rcN version-2.0.1/bbftpd/storeafile.c version-2.0.1-patch01/bbftpd/storeafile.c *** version-2.0.1/bbftpd/storeafile.c Wed May 2 15:37:00 2001 --- version-2.0.1-patch01/bbftpd/storeafile.c Fri May 4 18:51:34 2001 *************** *** 35,40 **** --- 35,41 ---- on the server v 2.0.0 2000/10/18 - Set state before starting children v 2.0.1 2001/04/23 - Correct indentation + v 2.0.2 2001/05/04 - Correct return code treatment *****************************************************************************/ #include *************** *** 127,133 **** /* ** Read the characteristics of the file */ ! if ( retcode = readmessage(msgsock,receive_buffer,STORMESSLEN,CONTROLSOCKTO) < 0 ) { /* ** Error ... */ --- 128,134 ---- /* ** Read the characteristics of the file */ ! if ( (retcode = readmessage(msgsock,receive_buffer,STORMESSLEN,CONTROLSOCKTO)) < 0 ) { /* ** Error ... */ diff -rcN version-2.0.1/includes/structures.h version-2.0.1-patch01/includes/structures.h *** version-2.0.1/includes/structures.h Thu Mar 22 08:32:34 2001 --- version-2.0.1-patch01/includes/structures.h Fri May 4 18:34:10 2001 *************** *** 6,19 **** structures.h v 0.0.0 1999/11/24 v 1.2.0 2000/11/24 ! v 1.4.0 2000/03/22 - Add message for crypt mode for ! username and password ! v 1.6.0 2000/03/24 - New parameters for get implementation ! v 1.6.1 2000/03/30 - Portage to OSF1 ! v 1.8.0 2000/04/14 - Introduce RSA Cryptage ! v 1.8.10 2000/08/10 - Portage to Linux ! v 1.9.0 2000/08/18 - Use configure to help portage ! v 2.0.0 2000/12/13 - Introduce V2 protocol *****************************************************************************/ --- 6,21 ---- structures.h v 0.0.0 1999/11/24 v 1.2.0 2000/11/24 ! v 1.4.0 2000/03/22 - Add message for crypt mode for ! username and password ! v 1.6.0 2000/03/24 - New parameters for get implementation ! v 1.6.1 2000/03/30 - Portage to OSF1 ! v 1.8.0 2000/04/14 - Introduce RSA Cryptage ! v 1.8.10 2000/08/10 - Portage to Linux ! v 1.9.0 2000/08/18 - Use configure to help portage ! v 2.0.0 2000/12/13 - Introduce V2 protocol ! v 2.0.2 2000/05/04 - Add padding on mess_store in order to avoid usage ! of malign-double on Linux *****************************************************************************/ *************** *** 119,130 **** } ; struct mess_store { ! char filename[MAXLENFILE] ; /* Filename to store or to get*/ ! my64_t filesize ; /* Size of the file (0 for a get) */ ! int blocksize ; /* Blocksize (not used)*/ ! struct sockaddr_in remote_host ; /* Adresse of remote host */ ! int nbport ; /* Number of ports */ ! int port[MAXPORT] ; /* Ports Number */ } ; struct mess_compress { --- 121,133 ---- } ; struct mess_store { ! char filename[MAXLENFILE] ; /* Filename to store or to get*/ ! char pad[4] ; /* Pad to be on a double boundary if MAXLENFILE = 500 */ ! my64_t filesize ; /* Size of the file (0 for a get) */ ! int blocksize ; /* Blocksize (not used)*/ ! struct sockaddr_in remote_host ; /* Adresse of remote host */ ! int nbport ; /* Number of ports */ ! int port[MAXPORT] ; /* Ports Number */ } ; struct mess_compress { diff -rcN version-2.0.1/includes/version.h version-2.0.1-patch01/includes/version.h *** version-2.0.1/includes/version.h Wed May 2 16:27:12 2001 --- version-2.0.1-patch01/includes/version.h Fri May 4 15:43:48 2001 *************** *** 9,13 **** *****************************************************************************/ ! #define VERSION "2.0.1" #define PROTOCOLVERSION 2 --- 9,13 ---- *****************************************************************************/ ! #define VERSION "2.0.1-patch01" #define PROTOCOLVERSION 2