aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1995-01-03 17:18:21 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1995-01-03 17:18:21 +0000
commit69bee0e6f243d00fea66c873fb5a8c629bb3aae1 (patch)
tree18afa74c103306cdc11719482ee233b3e8421a72
parent9b786fc227877597fd802e51e7f2e7cc25849685 (diff)
downloadsrc-69bee0e6f243d00fea66c873fb5a8c629bb3aae1.tar.gz
src-69bee0e6f243d00fea66c873fb5a8c629bb3aae1.zip
Notes
Notes: svn path=/vendor/ncftp/dist/; revision=5360 svn path=/vendor/ncftp/1.9.1/; revision=5362; tag=vendor/ncftp/1.9.1
-rw-r--r--usr.bin/ncftp/copyright.h9
-rw-r--r--usr.bin/ncftp/ftp.c4
-rw-r--r--usr.bin/ncftp/main.c2
-rw-r--r--usr.bin/ncftp/patchlevel.h2
4 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/ncftp/copyright.h b/usr.bin/ncftp/copyright.h
index 4e8156cbf691..9c4290ea828f 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 ecb2136280d2..5152b550e08a 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 1d1ed62de147..f7c1d7590042 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 28600409dcba..db9f5f5288b7 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