diff options
| author | ache <ache@FreeBSD.org> | 1995-01-03 17:22:35 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-01-03 17:22:35 +0000 |
| commit | 3d3758835a59224b4505e5a81fdfd6ce1be9ff44 (patch) | |
| tree | a6291612ed882a142d5646d18daf6935f9f51118 | |
| parent | 4510e641f3a53c4802bedb0db86d8e296b3e910c (diff) | |
| download | FreeBSD-src-3d3758835a59224b4505e5a81fdfd6ce1be9ff44.zip FreeBSD-src-3d3758835a59224b4505e5a81fdfd6ce1be9ff44.tar.gz | |
Merge
| -rw-r--r-- | usr.bin/ncftp/ftp.c | 4 | ||||
| -rw-r--r-- | usr.bin/ncftp/main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ncftp/ftp.c b/usr.bin/ncftp/ftp.c index ecb2136..5152b55 100644 --- a/usr.bin/ncftp/ftp.c +++ b/usr.bin/ncftp/ftp.c @@ -1753,7 +1753,11 @@ int initconn(void) bcopy( (void *)&n[0], (void *)&data_addr.sin_addr, 4 ); bcopy( (void *)&n[4], (void *)&data_addr.sin_port, 2 ); +#ifdef SOCKS + if (Rconnect( data, (struct sockaddr *) &data_addr, (int) sizeof(data_addr) ) < 0 ) { +#else if (Connect( data, &data_addr, sizeof(data_addr) ) < 0 ) { +#endif if (errno == ECONNREFUSED) { dbprintf("Could not connect to port specified by server;\n"); dbprintf("Falling back to PORT mode.\n"); diff --git a/usr.bin/ncftp/main.c b/usr.bin/ncftp/main.c index 1d1ed62..f7c1d75 100644 --- a/usr.bin/ncftp/main.c +++ b/usr.bin/ncftp/main.c @@ -2,7 +2,7 @@ #define _main_c_ -#define FTP_VERSION "1.9.0 (December 22, 1994)" +#define FTP_VERSION "1.9.1 (January 1, 1995)" /* #define BETA 1 */ /* If defined, it prints a little warning message. */ |
