summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/special/ftp/Makefile4
-rw-r--r--libexec/ftpd/Makefile5
-rw-r--r--libexec/ftpd/ftpd.c6
-rw-r--r--sbin/sysctl/Makefile4
-rw-r--r--sbin/sysctl/sysctl.c10
-rw-r--r--usr.bin/fstat/Makefile4
-rw-r--r--usr.bin/fstat/fstat.c12
7 files changed, 9 insertions, 36 deletions
diff --git a/distrib/special/ftp/Makefile b/distrib/special/ftp/Makefile
index 55d46f273c6..aff26010d85 100644
--- a/distrib/special/ftp/Makefile
+++ b/distrib/special/ftp/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2015/11/14 21:49:16 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2016/05/04 19:48:08 jca Exp $
-CFLAGS+=-DSMALL -DINET6
+CFLAGS+=-DSMALL
PROG= ftp
SRCS= fetch.c ftp.c main.c small.c util.c
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 095c3d88343..d30303484cc 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/12/01 22:04:12 deraadt Exp $
+# $OpenBSD: Makefile,v 1.28 2016/05/04 19:48:08 jca Exp $
# $NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
@@ -17,9 +17,6 @@ LSDIR = ${.CURDIR}/../../bin/ls
SRCS += ls.c cmp.c print.c util.c utf8.c
CFLAGS += -I${.CURDIR} -I${LSDIR}
-# not really used
-CPPFLAGS+=-DINET6
-
LDADD+= -lutil
DPADD+= ${LIBUTIL}
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;
}
}
diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile
index fe857d0dc1a..47ed5f26a3d 100644
--- a/sbin/sysctl/Makefile
+++ b/sbin/sysctl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/01/10 03:37:50 guenther Exp $
+# $OpenBSD: Makefile,v 1.11 2016/05/04 19:48:08 jca Exp $
PROG= sysctl
MAN= sysctl.8
-CPPFLAGS+= -DINET6 -D_LIBKVM
+CPPFLAGS+= -D_LIBKVM
afterinstall:
ln -sf ../../sbin/sysctl ${DESTDIR}/usr/sbin
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index e2f62feb027..ae537907659 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.212 2016/02/29 19:44:07 naddy Exp $ */
+/* $OpenBSD: sysctl.c,v 1.213 2016/05/04 19:48:08 jca Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -72,13 +72,11 @@
#include <net/if_pfsync.h>
#include <net/pipex.h>
-#ifdef INET6
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/pim6_var.h>
#include <netinet6/ip6_divert.h>
-#endif
#include <netmpls/mpls.h>
@@ -189,9 +187,7 @@ void parse_baddynamic(int *, size_t, char *, void **, size_t *, int, int);
void usage(void);
int findname(char *, char *, char **, struct list *);
int sysctl_inet(char *, char **, int *, int, int *);
-#ifdef INET6
int sysctl_inet6(char *, char **, int *, int, int *);
-#endif
int sysctl_bpf(char *, char **, int *, int, int *);
int sysctl_mpls(char *, char **, int *, int, int *);
int sysctl_pipex(char *, char **, int *, int, int *);
@@ -565,7 +561,6 @@ parse(char *string, int flags)
}
break;
}
-#ifdef INET6
if (mib[1] == PF_INET6) {
len = sysctl_inet6(string, &bufp, mib, flags, &type);
if (len < 0)
@@ -583,7 +578,6 @@ parse(char *string, int flags)
}
break;
}
-#endif
if (mib[1] == PF_BPF) {
len = sysctl_bpf(string, &bufp, mib, flags, &type);
if (len < 0)
@@ -2018,7 +2012,6 @@ sysctl_inet(char *string, char **bufpp, int mib[], int flags, int *typep)
return (4);
}
-#ifdef INET6
struct ctlname inet6name[] = CTL_IPV6PROTO_NAMES;
struct ctlname ip6name[] = IPV6CTL_NAMES;
struct ctlname icmp6name[] = ICMPV6CTL_NAMES;
@@ -2155,7 +2148,6 @@ sysctl_inet6(char *string, char **bufpp, int mib[], int flags, int *typep)
}
return (4);
}
-#endif
/* handle bpf requests */
int
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 5eac0755816..71a8130a87b 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2014/07/16 20:06:27 okan Exp $
+# $OpenBSD: Makefile,v 1.12 2016/05/04 19:48:08 jca Exp $
PROG= fstat
SRCS= fstat.c fuser.c
@@ -7,6 +7,4 @@ DPADD= ${LIBKVM}
LDADD= -lkvm
LINKS= ${BINDIR}/fstat ${BINDIR}/fuser
-CFLAGS+=-DINET6
-
.include <bsd.prog.mk>
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 2d79265868c..1699daf934a 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fstat.c,v 1.87 2016/04/25 19:18:41 tedu Exp $ */
+/* $OpenBSD: fstat.c,v 1.88 2016/05/04 19:48:08 jca Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -115,9 +115,7 @@ struct kinfo_file *splice_find(char, u_int64_t);
void splice_insert(char, u_int64_t, struct kinfo_file *);
void find_splices(struct kinfo_file *, int);
void print_inet_details(struct kinfo_file *);
-#ifdef INET6
void print_inet6_details(struct kinfo_file *);
-#endif
void print_sock_details(struct kinfo_file *);
void socktrans(struct kinfo_file *);
void vtrans(struct kinfo_file *);
@@ -534,7 +532,6 @@ kqueuetrans(struct kinfo_file *kf)
return;
}
-#ifdef INET6
const char *
inet6_addrstr(struct in6_addr *p)
{
@@ -559,7 +556,6 @@ inet6_addrstr(struct in6_addr *p)
return hbuf;
}
-#endif
void
splice_insert(char type, u_int64_t ptr, struct kinfo_file *data)
@@ -643,7 +639,6 @@ print_inet_details(struct kinfo_file *kf)
}
}
-#ifdef INET6
void
print_inet6_details(struct kinfo_file *kf)
{
@@ -689,17 +684,14 @@ print_inet6_details(struct kinfo_file *kf)
hide((void *)(uintptr_t)kf->so_pcb);
}
}
-#endif
void
print_sock_details(struct kinfo_file *kf)
{
if (kf->so_family == AF_INET)
print_inet_details(kf);
-#ifdef INET6
else if (kf->so_family == AF_INET6)
print_inet6_details(kf);
-#endif
}
void
@@ -742,13 +734,11 @@ socktrans(struct kinfo_file *kf)
getinetproto(kf->so_protocol);
print_inet_details(kf);
break;
-#ifdef INET6
case AF_INET6:
printf("* internet6 %s", stype);
getinetproto(kf->so_protocol);
print_inet6_details(kf);
break;
-#endif
case AF_UNIX:
/* print address of pcb and connected pcb */
printf("* unix %s", stype);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 01:28:06 +0000