diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-04 06:46:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-04 06:46:59 +0000 |
| commit | d1516f764d6f38af5f57f45d59e11e418227f393 (patch) | |
| tree | 5c4746b6e156171665e667138b4e0ad14fd044d6 /usr.sbin | |
| parent | 51be33cc35f39cba58a8bd17a5b258073b4789c3 (diff) | |
cleanup; itojun & jasoni
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 8687348bd89..2439beecba8 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.82 2001/03/15 18:28:41 danh Exp $ */ +/* $OpenBSD: inetd.c,v 1.83 2001/07/04 06:46:58 deraadt Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ -static char rcsid[] = "$OpenBSD: inetd.c,v 1.82 2001/03/15 18:28:41 danh Exp $"; +static char rcsid[] = "$OpenBSD: inetd.c,v 1.83 2001/07/04 06:46:58 deraadt Exp $"; #endif /* not lint */ /* @@ -154,6 +154,7 @@ static char rcsid[] = "$OpenBSD: inetd.c,v 1.82 2001/03/15 18:28:41 danh Exp $"; #include <arpa/inet.h> #include <errno.h> +#include <ctype.h> #include <signal.h> #include <netdb.h> #include <syslog.h> @@ -292,7 +293,7 @@ sig_atomic_t wantreap; #define NUMINT (sizeof(intab) / sizeof(struct inent)) char *CONFIG = _PATH_INETDCONF; char **Argv; -char *LastArg; +char *LastArg; char *progname; void logpid __P((void)); @@ -661,11 +662,8 @@ dg_badinput(sa) struct sockaddr *sa; { struct in_addr in; -#ifdef INET6 struct in6_addr *in6; -#endif u_int16_t port; - int i; switch (sa->sa_family) { case AF_INET: @@ -680,7 +678,6 @@ dg_badinput(sa) } /* XXX check for subnet broadcast using getifaddrs(3) */ break; -#ifdef INET6 case AF_INET6: in6 = &((struct sockaddr_in6 *)sa)->sin6_addr; port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port); @@ -698,7 +695,6 @@ dg_badinput(sa) goto v4chk; } break; -#endif default: /* XXX unsupported af, is it safe to assume it to be safe? */ return 0; |