Index: ftp.cpp =================================================================== RCS file: /home/kde/kdebase/kfm/kioslave/ftp.cpp,v retrieving revision 1.21.4.4 retrieving revision 1.21.4.5 diff -u -p -r1.21.4.4 -r1.21.4.5 --- ftp.cpp 1999/04/06 14:37:47 1.21.4.4 +++ ftp.cpp 1999/05/13 15:06:35 1.21.4.5 @@ -549,10 +549,16 @@ int KProtocolFTP::OpenConnection( const buf.sprintf("type %c",mode); if ( !ftpSendCmd( buf, '2' ) ) return Error(KIO_ERROR_CouldNotConnect, "Could not set ftp to correct mode for transmission"); -#ifdef DONT_TRY_PASV // never defined - define if you don't want to try PASV first + +#ifndef DONT_TRY_PASV // never defined - define if you don't want to try PASV first + if (!strcmp(command,"stor")) // no passive mode for uploading + { +#endif if ( !ftpPort() ) return Error(KIO_ERROR_CouldNotConnect, "Could not setup ftp data port", errno); -#else +#ifndef DONT_TRY_PASV + } + else if ( !ftpPasv() ) return Error(KIO_ERROR_CouldNotConnect, "Could not setup ftp data port", errno); #endif