diff options
| author | ache <ache@FreeBSD.org> | 1995-01-03 17:18:21 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1995-01-03 17:18:21 +0000 |
| commit | 73e7d767e2332b4ad930e19a23e366a146c41c06 (patch) | |
| tree | 7d7919785bc483667353290b10e0e32c4605c6c2 | |
| parent | 962de1ff22c69fb5c1af3a5d874f8e239a65f260 (diff) | |
| download | FreeBSD-src-73e7d767e2332b4ad930e19a23e366a146c41c06.zip FreeBSD-src-73e7d767e2332b4ad930e19a23e366a146c41c06.tar.gz | |
Upgrade
| -rw-r--r-- | usr.bin/ncftp/copyright.h | 9 | ||||
| -rw-r--r-- | usr.bin/ncftp/ftp.c | 4 | ||||
| -rw-r--r-- | usr.bin/ncftp/main.c | 2 | ||||
| -rw-r--r-- | usr.bin/ncftp/patchlevel.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/ncftp/copyright.h b/usr.bin/ncftp/copyright.h index 4e8156c..9c4290e 100644 --- a/usr.bin/ncftp/copyright.h +++ b/usr.bin/ncftp/copyright.h @@ -1,16 +1,11 @@ /* Copyright.h */ -/* $RCSfile: copyright.h,v $ - * $Revision: 14020.12 $ - * $Date: 93/06/02 13:43:03 $ - */ - /* * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * Copyright (c) 1992-1994 Mike Gleason, NCEMRSoft. + * Copyright (c) 1992-1995 Mike Gleason, NCEMRSoft. * Copyright (c) 1985, 1989 Regents of the University of California. * All rights reserved. * @@ -23,7 +18,7 @@ #ifdef _main_c_ #ifndef lint -static char copyright[] = "@(#) Copyright (c) 1992, 1993 by NCEMRSoft and Copyright (c) 1985, 1989 Regents of the University of California.\n All rights reserved.\n"; +static char copyright[] = "@(#) Copyright (c) 1992, 1993, 1994, 1995 by NCEMRSoft and Copyright (c) 1985, 1989 Regents of the University of California.\n All rights reserved.\n"; #endif /* not lint */ #endif /* _main_c_ */ 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. */ diff --git a/usr.bin/ncftp/patchlevel.h b/usr.bin/ncftp/patchlevel.h index 2860040..db9f5f5 100644 --- a/usr.bin/ncftp/patchlevel.h +++ b/usr.bin/ncftp/patchlevel.h @@ -1,3 +1,5 @@ +v1.9.1 - January 1, 1995. Passive mode fix with the SOCKS library. + v1.9.0 - December 22, 1994. The program won't exit from the interactive shell if it's working from a tty. For example, it won't exit if you do an mget on a pattern that won't match anything. Added padding around jmp_buf's |
