diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-05-06 22:06:10 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-05-06 22:06:10 +0000 |
| commit | 1bc4af8907c99bac151447431ffe62588c3f7dcd (patch) | |
| tree | e9d9f7d065d63779629e614a6f34485634f4ea4f | |
| parent | 7e0b61f65cf01c596230b1bb3374a41352008ef7 (diff) | |
Remove #ifdef INET6 bits, missed in a commit earlier this week
This probably broke passive FTP on IPv6 and [ip::v6]:port syntax in
RAMDISK ftp(1), sorry about that.
The diff was initially ok millert@
| -rw-r--r-- | usr.bin/ftp/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/ftp/fetch.c | 6 | ||||
| -rw-r--r-- | usr.bin/ftp/main.c | 6 |
3 files changed, 3 insertions, 13 deletions
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 0c4fc6a1b26..fc039e142c3 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2015/10/12 16:39:07 deraadt Exp $ +# $OpenBSD: Makefile,v 1.30 2016/05/06 22:06:09 jca Exp $ # Define SMALL to disable command line editing and https support #CFLAGS+=-DSMALL @@ -7,8 +7,6 @@ PROG= ftp SRCS= cmds.c cmdtab.c complete.c cookie.c domacro.c fetch.c ftp.c \ list.c main.c ruserpass.c small.c stringlist.c util.c -CPPFLAGS+= -DINET6 - LDADD+= -ledit -lcurses -lutil -ltls -lssl -lcrypto DPADD+= ${LIBEDIT} ${LIBCURSES} ${LIBUTIL} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO} diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index db80d773566..bf72267164d 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.145 2016/01/28 21:31:50 martijn Exp $ */ +/* $OpenBSD: fetch.c,v 1.146 2016/05/06 22:06:09 jca Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -1161,7 +1161,6 @@ bad_ftp_url: pass = urldecode(pass); } -#ifdef INET6 /* check [host]:port, or [host] */ if (host[0] == '[') { cp = strchr(host, ']'); @@ -1175,9 +1174,6 @@ bad_ftp_url: cp = host; } else cp = host; -#else - cp = host; -#endif /* split off host[:port] if there is */ if (cp) { diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c index 06ad4563251..bff6c6b0784 100644 --- a/usr.bin/ftp/main.c +++ b/usr.bin/ftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.106 2016/03/16 15:41:11 krw Exp $ */ +/* $OpenBSD: main.c,v 1.107 2016/05/06 22:06:09 jca Exp $ */ /* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */ /* @@ -143,11 +143,7 @@ main(volatile int argc, char *argv[]) marg_sl = sl_init(); #endif /* !SMALL */ mark = HASHBYTES; -#ifdef INET6 epsv4 = 1; -#else - epsv4 = 0; -#endif epsv4bad = 0; /* Set default operation mode based on FTPMODE environment variable */ |