diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-05-04 19:48:09 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2016-05-04 19:48:09 +0000 |
| commit | e88818eb7aefcc15667396d28e86acf733ff65aa (patch) | |
| tree | 0ab317b6d5fc4d0bf3d964238f7fde2e90c8b014 /libexec/ftpd/ftpd.c | |
| parent | 644793ee79abf455660ba9c8b8fb4eb3deb24b91 (diff) | |
Kill #ifdef INET6 occurrences in userland.
Prompted by and ok millert@
(tcpdump and libpcap left untouched, the #ifdef force is too strong with
those)
Diffstat (limited to 'libexec/ftpd/ftpd.c')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index b0aad51358f..e0006877129 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.215 2016/04/25 15:43:34 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.216 2016/05/04 19:48:08 jca Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -2318,9 +2318,7 @@ epsvproto2af(int proto) switch (proto) { case 1: return AF_INET; -#ifdef INET6 case 2: return AF_INET6; -#endif default: return -1; } } @@ -2331,9 +2329,7 @@ af2epsvproto(int af) switch (af) { case AF_INET: return 1; -#ifdef INET6 case AF_INET6: return 2; -#endif default: return -1; } } |