diff --git a/contrib/tcp_wrappers/clean_exit.c b/contrib/tcp_wrappers/clean_exit.c index 41caaf030665..04b1626d1a72 100644 --- a/contrib/tcp_wrappers/clean_exit.c +++ b/contrib/tcp_wrappers/clean_exit.c @@ -1,43 +1,42 @@ /* * clean_exit() cleans up and terminates the program. It should be called * instead of exit() when for some reason the real network daemon will not or * cannot be run. Reason: in the case of a datagram-oriented service we must * discard the not-yet received data from the client. Otherwise, inetd will * see the same datagram again and again, and go into a loop. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19"; #endif #include #include extern void exit(); #include "tcpd.h" /* clean_exit - clean up and exit */ -void clean_exit(request) -struct request_info *request; +void clean_exit(struct request_info *request) { /* * In case of unconnected protocols we must eat up the not-yet received * data or inetd will loop. */ if (request->sink) request->sink(request->fd); /* * Be kind to the inetd. We already reported the problem via the syslogd, * and there is no need for additional garbage in the logfile. */ sleep(5); exit(0); } diff --git a/contrib/tcp_wrappers/diag.c b/contrib/tcp_wrappers/diag.c index ac3df07a202e..f3b8b1aaf589 100644 --- a/contrib/tcp_wrappers/diag.c +++ b/contrib/tcp_wrappers/diag.c @@ -1,69 +1,65 @@ /* * Routines to report various classes of problems. Each report is decorated * with the current context (file name and line number), if available. * * tcpd_warn() reports a problem and proceeds. * * tcpd_jump() reports a problem and jumps. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20"; #endif /* System libraries */ #include #include #include /* Local stuff */ #include "tcpd.h" #include "mystdarg.h" struct tcpd_context tcpd_context; jmp_buf tcpd_buf; /* tcpd_diag - centralize error reporter */ -static void tcpd_diag(severity, tag, format, ap) -int severity; -char *tag; -char *format; -va_list ap; +static void tcpd_diag(int severity, char *tag, char *format, va_list ap) { char fmt[BUFSIZ]; if (tcpd_context.file) sprintf(fmt, "%s: %s, line %d: %s", tag, tcpd_context.file, tcpd_context.line, format); else sprintf(fmt, "%s: %s", tag, format); vsyslog(severity, fmt, ap); } /* tcpd_warn - report problem of some sort and proceed */ void VARARGS(tcpd_warn, char *, format) { va_list ap; VASTART(ap, char *, format); tcpd_diag(LOG_WARNING, "warning", format, ap); VAEND(ap); } /* tcpd_jump - report serious problem and jump */ void VARARGS(tcpd_jump, char *, format) { va_list ap; VASTART(ap, char *, format); tcpd_diag(LOG_ERR, "error", format, ap); VAEND(ap); longjmp(tcpd_buf, AC_ERROR); } diff --git a/contrib/tcp_wrappers/environ.c b/contrib/tcp_wrappers/environ.c index e7f846ddd6b7..93499189d3fb 100644 --- a/contrib/tcp_wrappers/environ.c +++ b/contrib/tcp_wrappers/environ.c @@ -1,224 +1,210 @@ /* * Many systems have putenv() but no setenv(). Other systems have setenv() * but no putenv() (MIPS). Still other systems have neither (NeXT). This is a * re-implementation that hopefully ends all problems. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) environ.c 1.2 94/03/23 16:09:46"; #endif /* System libraries. */ extern char **environ; extern char *strchr(); extern char *strcpy(); extern char *strncpy(); extern char *malloc(); extern char *realloc(); extern int strncmp(); extern void free(); #ifdef no_memcpy #define memcpy(d,s,l) bcopy(s,d,l) #else extern char *memcpy(); #endif /* Local stuff. */ static int addenv(); /* append entry to environment */ static int allocated = 0; /* environ is, or is not, allocated */ #define DO_CLOBBER 1 /* namelength - determine length of name in "name=whatever" */ -static int namelength(name) -char *name; +static int namelength(char *name) { char *equal; equal = strchr(name, '='); return ((equal == 0) ? strlen(name) : (equal - name)); } /* findenv - given name, locate name=value */ -static char **findenv(name, len) -char *name; -int len; +static char **findenv(char *name, int len) { char **envp; for (envp = environ; envp && *envp; envp++) if (strncmp(name, *envp, len) == 0 && (*envp)[len] == '=') return (envp); return (0); } /* getenv - given name, locate value */ -char *getenv(name) -char *name; +char *getenv(char *name) { int len = namelength(name); char **envp = findenv(name, len); return (envp ? *envp + len + 1 : 0); } /* putenv - update or append environment (name,value) pair */ -int putenv(nameval) -char *nameval; +int putenv(char *nameval) { char *equal = strchr(nameval, '='); char *value = (equal ? equal : ""); return (setenv(nameval, value, DO_CLOBBER)); } /* unsetenv - remove variable from environment */ -void unsetenv(name) -char *name; +void unsetenv(char *name) { char **envp; if ((envp = findenv(name, namelength(name))) != 0) while (envp[0] = envp[1]) envp++; } /* setenv - update or append environment (name,value) pair */ -int setenv(name, value, clobber) -char *name; -char *value; -int clobber; +int setenv(char *name, char *value, int clobber) { char *destination; char **envp; int l_name; /* length of name part */ int l_nameval; /* length of name=value */ /* Permit name= and =value. */ l_name = namelength(name); envp = findenv(name, l_name); if (envp != 0 && clobber == 0) return (0); if (*value == '=') value++; l_nameval = l_name + strlen(value) + 1; /* * Use available memory if the old value is long enough. Never free an * old name=value entry because it may not be allocated. */ destination = (envp != 0 && strlen(*envp) >= l_nameval) ? *envp : malloc(l_nameval + 1); if (destination == 0) return (-1); strncpy(destination, name, l_name); destination[l_name] = '='; strcpy(destination + l_name + 1, value); return ((envp == 0) ? addenv(destination) : (*envp = destination, 0)); } /* cmalloc - malloc and copy block of memory */ -static char *cmalloc(new_len, old, old_len) -char *old; -int old_len; +static char *cmalloc(int new_len, char *old, int old_len) { char *new = malloc(new_len); if (new != 0) memcpy(new, old, old_len); return (new); } /* addenv - append environment entry */ -static int addenv(nameval) -char *nameval; +static int addenv(char *nameval) { char **envp; int n_used; /* number of environment entries */ int l_used; /* bytes used excl. terminator */ int l_need; /* bytes needed incl. terminator */ for (envp = environ; envp && *envp; envp++) /* void */ ; n_used = envp - environ; l_used = n_used * sizeof(*envp); l_need = l_used + 2 * sizeof(*envp); envp = allocated ? (char **) realloc((char *) environ, l_need) : (char **) cmalloc(l_need, (char *) environ, l_used); if (envp == 0) { return (-1); } else { allocated = 1; environ = envp; environ[n_used++] = nameval; /* add new entry */ environ[n_used] = 0; /* terminate list */ return (0); } } #ifdef TEST /* * Stand-alone program for test purposes. */ /* printenv - display environment */ static void printenv() { char **envp; for (envp = environ; envp && *envp; envp++) printf("%s\n", *envp); } -int main(argc, argv) -int argc; -char **argv; +int main(int argc, char **argv) { char *cp; int changed = 0; if (argc < 2) { printf("usage: %s name[=value]...\n", argv[0]); return (1); } while (--argc && *++argv) { if (argv[0][0] == '-') { /* unsetenv() test */ unsetenv(argv[0] + 1); changed = 1; } else if (strchr(argv[0], '=') == 0) { /* getenv() test */ cp = getenv(argv[0]); printf("%s: %s\n", argv[0], cp ? cp : "not found"); } else { /* putenv() test */ if (putenv(argv[0])) { perror("putenv"); return (1); } changed = 1; } } if (changed) printenv(); return (0); } #endif /* TEST */ diff --git a/contrib/tcp_wrappers/eval.c b/contrib/tcp_wrappers/eval.c index d68358f3b9c3..cb4ef0650fa7 100644 --- a/contrib/tcp_wrappers/eval.c +++ b/contrib/tcp_wrappers/eval.c @@ -1,136 +1,130 @@ /* * Routines for controlled evaluation of host names, user names, and so on. * They are, in fact, wrappers around the functions that are specific for * the sockets or TLI programming interfaces. The request_info and host_info * structures are used for result cacheing. * * These routines allows us to postpone expensive operations until their * results are really needed. Examples are hostname lookups and double * checks, or username lookups. Information that cannot be retrieved is * given the value "unknown" ("paranoid" in case of hostname problems). * * When ALWAYS_HOSTNAME is off, hostname lookup is done only when required by * tcpd paranoid mode, by access control patterns, or by %letter expansions. * * When ALWAYS_RFC931 mode is off, user lookup is done only when required by * access control patterns or %letter expansions. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) eval.c 1.3 95/01/30 19:51:45"; #endif /* System libraries. */ #include #include /* Local stuff. */ #include "tcpd.h" /* * When a string has the value STRING_UNKNOWN, it means: don't bother, I * tried to look up the data but it was unavailable for some reason. When a * host name has the value STRING_PARANOID it means there was a name/address * conflict. */ char unknown[] = STRING_UNKNOWN; char paranoid[] = STRING_PARANOID; /* eval_user - look up user name */ -char *eval_user(request) -struct request_info *request; +char *eval_user(struct request_info *request) { if (request->user[0] == 0) { strcpy(request->user, unknown); if (request->sink == 0 && request->client->sin && request->server->sin) rfc931(request->client->sin, request->server->sin, request->user); } return (request->user); } /* eval_hostaddr - look up printable address */ -char *eval_hostaddr(host) -struct host_info *host; +char *eval_hostaddr(struct host_info *host) { if (host->addr[0] == 0) { strcpy(host->addr, unknown); if (host->request->hostaddr != 0) host->request->hostaddr(host); } return (host->addr); } /* eval_hostname - look up host name */ -char *eval_hostname(host) -struct host_info *host; +char *eval_hostname(struct host_info *host) { if (host->name[0] == 0) { strcpy(host->name, unknown); if (host->request->hostname != 0) host->request->hostname(host); } return (host->name); } /* eval_hostinfo - return string with host name (preferred) or address */ -char *eval_hostinfo(host) -struct host_info *host; +char *eval_hostinfo(struct host_info *host) { char *hostname; #ifndef ALWAYS_HOSTNAME /* no implicit host lookups */ if (host->name[0] == 0) return (eval_hostaddr(host)); #endif hostname = eval_hostname(host); if (HOSTNAME_KNOWN(hostname)) { return (host->name); } else { return (eval_hostaddr(host)); } } /* eval_client - return string with as much about the client as we know */ -char *eval_client(request) -struct request_info *request; +char *eval_client(struct request_info *request) { static char both[2 * STRING_LENGTH]; char *hostinfo = eval_hostinfo(request->client); #ifndef ALWAYS_RFC931 /* no implicit user lookups */ if (request->user[0] == 0) return (hostinfo); #endif if (STR_NE(eval_user(request), unknown)) { sprintf(both, "%s@%s", request->user, hostinfo); return (both); } else { return (hostinfo); } } /* eval_server - return string with as much about the server as we know */ -char *eval_server(request) -struct request_info *request; +char *eval_server(struct request_info *request) { static char both[2 * STRING_LENGTH]; char *host = eval_hostinfo(request->server); char *daemon = eval_daemon(request); if (STR_NE(host, unknown)) { sprintf(both, "%s@%s", daemon, host); return (both); } else { return (daemon); } } diff --git a/contrib/tcp_wrappers/fakelog.c b/contrib/tcp_wrappers/fakelog.c index 97802dba7fb1..ad4a420ff557 100644 --- a/contrib/tcp_wrappers/fakelog.c +++ b/contrib/tcp_wrappers/fakelog.c @@ -1,62 +1,56 @@ /* * This module intercepts syslog() library calls and redirects their output * to the standard output stream. For interactive testing. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) fakelog.c 1.3 94/12/28 17:42:21"; #endif #include #include "mystdarg.h" /* openlog - dummy */ /* ARGSUSED */ -void openlog(name, logopt, facility) -char *name; -int logopt; -int facility; +void openlog(char *name, int logopt, int facility) { /* void */ } /* vsyslog - format one record */ -void vsyslog(severity, fmt, ap) -int severity; -char *fmt; -va_list ap; +void vsyslog(int severity, char *fmt, va_list ap) { char buf[BUFSIZ]; vprintf(percent_m(buf, fmt), ap); printf("\n"); fflush(stdout); } /* syslog - format one record */ /* VARARGS */ void VARARGS(syslog, int, severity) { va_list ap; char *fmt; VASTART(ap, int, severity); fmt = va_arg(ap, char *); vsyslog(severity, fmt, ap); VAEND(ap); } /* closelog - dummy */ void closelog() { /* void */ } diff --git a/contrib/tcp_wrappers/fix_options.c b/contrib/tcp_wrappers/fix_options.c index b31c61a0382d..76ddaae419b4 100644 --- a/contrib/tcp_wrappers/fix_options.c +++ b/contrib/tcp_wrappers/fix_options.c @@ -1,131 +1,130 @@ /* * Routine to disable IP-level socket options. This code was taken from 4.4BSD * rlogind and kernel source, but all mistakes in it are my fault. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) fix_options.c 1.6 97/04/08 02:29:19"; #endif #include #include #ifdef INET6 #include #endif #include #include #include #include #include #include #ifndef IPOPT_OPTVAL #define IPOPT_OPTVAL 0 #define IPOPT_OLEN 1 #endif #include "tcpd.h" #define BUFFER_SIZE 512 /* Was: BUFSIZ */ /* fix_options - get rid of IP-level socket options */ void -fix_options(request) -struct request_info *request; +fix_options(struct request_info *request) { #ifdef IP_OPTIONS unsigned char optbuf[BUFFER_SIZE / 3], *cp; char lbuf[BUFFER_SIZE], *lp; int optsize = sizeof(optbuf), ipproto; struct protoent *ip; int fd = request->fd; unsigned int opt; int optlen; struct in_addr dummy; #ifdef INET6 struct sockaddr_storage ss; int sslen; /* * check if this is AF_INET socket * XXX IPv6 support? */ sslen = sizeof(ss); if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0) { syslog(LOG_ERR, "getpeername: %m"); clean_exit(request); } if (ss.ss_family != AF_INET) return; #endif if ((ip = getprotobyname("ip")) != 0) ipproto = ip->p_proto; else ipproto = IPPROTO_IP; if (getsockopt(fd, ipproto, IP_OPTIONS, (char *) optbuf, &optsize) == 0 && optsize != 0) { /* * Horror! 4.[34] BSD getsockopt() prepends the first-hop destination * address to the result IP options list when source routing options * are present (see ), but produces no output for * other IP options. Solaris 2.x getsockopt() does produce output for * non-routing IP options, and uses the same format as BSD even when * the space for the destination address is unused. The code below * does the right thing with 4.[34]BSD derivatives and Solaris 2, but * may occasionally miss source routing options on incompatible * systems such as Linux. Their choice. * * Look for source routing options. Drop the connection when one is * found. Just wiping the IP options is insufficient: we would still * help the attacker by providing a real TCP sequence number, and the * attacker would still be able to send packets (blind spoofing). I * discussed this attack with Niels Provos, half a year before the * attack was described in open mailing lists. * * It would be cleaner to just return a yes/no reply and let the caller * decide how to deal with it. Resident servers should not terminate. * However I am not prepared to make changes to internal interfaces * on short notice. */ #define ADDR_LEN sizeof(dummy.s_addr) for (cp = optbuf + ADDR_LEN; cp < optbuf + optsize; cp += optlen) { opt = cp[IPOPT_OPTVAL]; if (opt == IPOPT_LSRR || opt == IPOPT_SSRR) { syslog(LOG_WARNING, "refused connect from %s with IP source routing options", eval_client(request)); shutdown(fd, 2); return; } if (opt == IPOPT_EOL) break; if (opt == IPOPT_NOP) { optlen = 1; } else { optlen = cp[IPOPT_OLEN]; if (optlen <= 0) /* Do not loop! */ break; } } lp = lbuf; for (cp = optbuf; optsize > 0; cp++, optsize--, lp += 3) sprintf(lp, " %2.2x", *cp); syslog(LOG_NOTICE, "connect from %s with IP options (ignored):%s", eval_client(request), lbuf); if (setsockopt(fd, ipproto, IP_OPTIONS, (char *) 0, optsize) != 0) { syslog(LOG_ERR, "setsockopt IP_OPTIONS NULL: %m"); shutdown(fd, 2); } } #endif } diff --git a/contrib/tcp_wrappers/fromhost.c b/contrib/tcp_wrappers/fromhost.c index a46c506e7915..ca065badbd4f 100644 --- a/contrib/tcp_wrappers/fromhost.c +++ b/contrib/tcp_wrappers/fromhost.c @@ -1,52 +1,51 @@ /* * On socket-only systems, fromhost() is nothing but an alias for the * socket-specific sock_host() function. * * On systems with sockets and TLI, fromhost() determines the type of API * (sockets, TLI), then invokes the appropriate API-specific routines. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) fromhost.c 1.17 94/12/28 17:42:23"; #endif #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) /* System libraries. */ #include #include #include /* Local stuff. */ #include "tcpd.h" /* fromhost - find out what network API we should use */ -void fromhost(request) -struct request_info *request; +void fromhost(struct request_info *request) { /* * On systems with streams support the IP network protocol family may be * accessible via more than one programming interface: Berkeley sockets * and the Transport Level Interface (TLI). * * Thus, we must first find out what programming interface to use: sockets * or TLI. On some systems, sockets are not part of the streams system, * so if request->fd is not a stream we simply assume sockets. */ if (ioctl(request->fd, I_FIND, "timod") > 0) { tli_host(request); } else { sock_host(request); } } #endif /* TLI || PTX || TLI_SEQUENT */ diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c index 140225fabace..05c62d194091 100644 --- a/contrib/tcp_wrappers/hosts_access.c +++ b/contrib/tcp_wrappers/hosts_access.c @@ -1,501 +1,479 @@ /* * This module implements a simple access control language that is based on * host (or domain) names, NIS (host) netgroup names, IP addresses (or * network numbers) and daemon process names. When a match is found the * search is terminated, and depending on whether PROCESS_OPTIONS is defined, * a list of options is executed or an optional shell command is executed. * * Host and user names are looked up on demand, provided that suitable endpoint * information is available as sockaddr_in structures or TLI netbufs. As a * side effect, the pattern matching process may change the contents of * request structure fields. * * Diagnostics are reported through syslog(3). * * Compile with -DNETGROUP if your library provides support for netgroups. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22"; #endif /* System libraries. */ #include #ifdef INT32_T typedef uint32_t u_int32_t; #endif #include #ifdef INET6 #include #endif #include #include #include #include #include #include #include #include #ifdef INET6 #include #endif #include #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif /* Local stuff. */ #include "tcpd.h" /* Error handling. */ extern jmp_buf tcpd_buf; /* Delimiters for lists of daemons or clients. */ static char sep[] = ", \t\r\n"; /* Constants to be used in assignments only, not in comparisons... */ #define YES 1 #define NO 0 /* * These variables are globally visible so that they can be redirected in * verification mode. */ char *hosts_allow_table = HOSTS_ALLOW; char *hosts_deny_table = HOSTS_DENY; int hosts_access_verbose = 0; /* * In a long-running process, we are not at liberty to just go away. */ int resident = (-1); /* -1, 0: unknown; +1: yes */ /* Forward declarations. */ static int table_match(char *table, struct request_info *request); static int list_match(char *list, struct request_info *request, int (*match_fn)(char *, struct request_info *)); static int server_match(char *tok, struct request_info *request); static int client_match(char *tok, struct request_info *request); static int host_match(char *tok, struct host_info *host); static int string_match(char *tok, char *string); static int masked_match(char *net_tok, char *mask_tok, char *string); #ifdef INET6 static int masked_match4(char *net_tok, char *mask_tok, char *string); static int masked_match6(char *net_tok, char *mask_tok, char *string); #endif /* Size of logical line buffer. */ #define BUFLEN 2048 /* definition to be used from workarounds.c */ #ifdef NETGROUP int yp_get_default_domain(char **); #endif /* hosts_access - host access control facility */ -int hosts_access(request) -struct request_info *request; +int hosts_access(struct request_info *request) { int verdict; /* * If the (daemon, client) pair is matched by an entry in the file * /etc/hosts.allow, access is granted. Otherwise, if the (daemon, * client) pair is matched by an entry in the file /etc/hosts.deny, * access is denied. Otherwise, access is granted. A non-existent * access-control file is treated as an empty file. * * After a rule has been matched, the optional language extensions may * decide to grant or refuse service anyway. Or, while a rule is being * processed, a serious error is found, and it seems better to play safe * and deny service. All this is done by jumping back into the * hosts_access() routine, bypassing the regular return from the * table_match() function calls below. */ if (resident <= 0) resident++; verdict = setjmp(tcpd_buf); if (verdict != 0) return (verdict == AC_PERMIT); if (table_match(hosts_allow_table, request)) return (YES); if (table_match(hosts_deny_table, request)) return (NO); return (YES); } /* table_match - match table entries with (daemon, client) pair */ -static int table_match(table, request) -char *table; -struct request_info *request; +static int table_match(char *table, struct request_info *request) { FILE *fp; char sv_list[BUFLEN]; /* becomes list of daemons */ char *cl_list; /* becomes list of clients */ char *sh_cmd; /* becomes optional shell command */ int match = NO; struct tcpd_context saved_context; char *cp; saved_context = tcpd_context; /* stupid compilers */ /* * Between the fopen() and fclose() calls, avoid jumps that may cause * file descriptor leaks. */ if ((fp = fopen(table, "r")) != 0) { tcpd_context.file = table; tcpd_context.line = 0; while (match == NO && xgets(sv_list, sizeof(sv_list), fp) != 0) { if (sv_list[strlen(sv_list) - 1] != '\n') { tcpd_warn("missing newline or line too long"); continue; } /* Ignore anything after unescaped # character */ for (cp = strchr(sv_list, '#'); cp != NULL;) { if (cp > sv_list && cp[-1] == '\\') { cp = strchr(cp + 1, '#'); continue; } *cp = '\0'; break; } if (sv_list[strspn(sv_list, " \t\r\n")] == 0) continue; if ((cl_list = split_at(sv_list, ':')) == 0) { tcpd_warn("missing \":\" separator"); continue; } sh_cmd = split_at(cl_list, ':'); match = list_match(sv_list, request, server_match) && list_match(cl_list, request, client_match); } (void) fclose(fp); } else if (errno != ENOENT) { tcpd_warn("cannot open %s: %m", table); } if (match) { if (hosts_access_verbose > 1) syslog(LOG_DEBUG, "matched: %s line %d", tcpd_context.file, tcpd_context.line); if (sh_cmd) { #ifdef PROCESS_OPTIONS process_options(sh_cmd, request); #else char cmd[BUFSIZ]; shell_cmd(percent_x(cmd, sizeof(cmd), sh_cmd, request)); #endif } } tcpd_context = saved_context; return (match); } /* list_match - match a request against a list of patterns with exceptions */ static int list_match(char *list, struct request_info *request, int (*match_fn)(char *, struct request_info *)) { char *tok; /* * Process tokens one at a time. We have exhausted all possible matches * when we reach an "EXCEPT" token or the end of the list. If we do find * a match, look for an "EXCEPT" list and recurse to determine whether * the match is affected by any exceptions. */ for (tok = strtok(list, sep); tok != 0; tok = strtok((char *) 0, sep)) { if (STR_EQ(tok, "EXCEPT")) /* EXCEPT: give up */ return (NO); if (match_fn(tok, request)) { /* YES: look for exceptions */ while ((tok = strtok((char *) 0, sep)) && STR_NE(tok, "EXCEPT")) /* VOID */ ; return (tok == 0 || list_match((char *) 0, request, match_fn) == 0); } } return (NO); } /* server_match - match server information */ -static int server_match(tok, request) -char *tok; -struct request_info *request; +static int server_match(char *tok, struct request_info *request) { char *host; if ((host = split_at(tok + 1, '@')) == 0) { /* plain daemon */ return (string_match(tok, eval_daemon(request))); } else { /* daemon@host */ return (string_match(tok, eval_daemon(request)) && host_match(host, request->server)); } } /* client_match - match client information */ -static int client_match(tok, request) -char *tok; -struct request_info *request; +static int client_match(char *tok, struct request_info *request) { char *host; if ((host = split_at(tok + 1, '@')) == 0) { /* plain host */ return (host_match(tok, request->client)); } else { /* user@host */ return (host_match(host, request->client) && string_match(tok, eval_user(request))); } } /* hostfile_match - look up host patterns from file */ -static int hostfile_match(path, host) -char *path; -struct host_info *host; +static int hostfile_match(char *path, struct host_info *host) { char tok[BUFSIZ]; int match = NO; FILE *fp; if ((fp = fopen(path, "r")) != 0) { while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host))) /* void */ ; fclose(fp); } else if (errno != ENOENT) { tcpd_warn("open %s: %m", path); } return (match); } /* host_match - match host name and/or address against pattern */ -static int host_match(tok, host) -char *tok; -struct host_info *host; +static int host_match(char *tok, struct host_info *host) { char *mask; /* * This code looks a little hairy because we want to avoid unnecessary * hostname lookups. * * The KNOWN pattern requires that both address AND name be known; some * patterns are specific to host names or to host addresses; all other * patterns are satisfied when either the address OR the name match. */ if (tok[0] == '@') { /* netgroup: look it up */ #ifdef NETGROUP static char *mydomain = 0; if (mydomain == 0) yp_get_default_domain(&mydomain); return (innetgr(tok + 1, eval_hostname(host), (char *) 0, mydomain)); #else tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */ return (NO); #endif } else if (tok[0] == '/') { /* /file hack */ return (hostfile_match(tok, host)); } else if (STR_EQ(tok, "KNOWN")) { /* check address and name */ char *name = eval_hostname(host); return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name)); } else if (STR_EQ(tok, "LOCAL")) { /* local: no dots in name */ char *name = eval_hostname(host); return (strchr(name, '.') == 0 && HOSTNAME_KNOWN(name)); } else if ((mask = split_at(tok, '/')) != 0) { /* net/mask */ return (masked_match(tok, mask, eval_hostaddr(host))); } else { /* anything else */ return (string_match(tok, eval_hostaddr(host)) || (NOT_INADDR(tok) && string_match(tok, eval_hostname(host)))); } } /* string_match - match string against pattern */ -static int string_match(tok, string) -char *tok; -char *string; +static int string_match(char *tok, char *string) { int n; #ifdef INET6 /* convert IPv4 mapped IPv6 address to IPv4 address */ if (STRN_EQ(string, "::ffff:", 7) && dot_quad_addr(string + 7) != INADDR_NONE) { string += 7; } #endif if (tok[0] == '.') { /* suffix */ n = strlen(string) - strlen(tok); return (n > 0 && STR_EQ(tok, string + n)); } else if (STR_EQ(tok, "ALL")) { /* all: match any */ return (YES); } else if (STR_EQ(tok, "KNOWN")) { /* not unknown */ return (STR_NE(string, unknown)); } else if (tok[(n = strlen(tok)) - 1] == '.') { /* prefix */ return (STRN_EQ(tok, string, n)); } else { /* exact match */ #ifdef INET6 struct addrinfo hints, *res; struct sockaddr_in6 pat, addr; int len, ret; char ch; len = strlen(tok); if (*tok == '[' && tok[len - 1] == ']') { ch = tok[len - 1]; tok[len - 1] = '\0'; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if ((ret = getaddrinfo(tok + 1, NULL, &hints, &res)) == 0) { memcpy(&pat, res->ai_addr, sizeof(pat)); freeaddrinfo(res); } tok[len - 1] = ch; if (ret != 0 || getaddrinfo(string, NULL, &hints, &res) != 0) return NO; memcpy(&addr, res->ai_addr, sizeof(addr)); freeaddrinfo(res); if (pat.sin6_scope_id != 0 && addr.sin6_scope_id != pat.sin6_scope_id) return NO; return (!memcmp(&pat.sin6_addr, &addr.sin6_addr, sizeof(struct in6_addr))); return (ret); } #endif return (STR_EQ(tok, string)); } } /* masked_match - match address against netnumber/netmask */ #ifdef INET6 -static int masked_match(net_tok, mask_tok, string) -char *net_tok; -char *mask_tok; -char *string; +static int masked_match(char *net_tok, char *mask_tok, char *string) { return (masked_match4(net_tok, mask_tok, string) || masked_match6(net_tok, mask_tok, string)); } -static int masked_match4(net_tok, mask_tok, string) +static int masked_match4(char *net_tok, char *mask_tok, char *string) #else -static int masked_match(net_tok, mask_tok, string) +static int masked_match(char *net_tok, char *mask_tok, char *string) #endif -char *net_tok; -char *mask_tok; -char *string; { #ifdef INET6 u_int32_t net; u_int32_t mask; u_int32_t addr; #else unsigned long net; unsigned long mask; unsigned long addr; #endif /* * Disallow forms other than dotted quad: the treatment that inet_addr() * gives to forms with less than four components is inconsistent with the * access control language. John P. Rouillard . */ if ((addr = dot_quad_addr(string)) == INADDR_NONE) return (NO); if ((net = dot_quad_addr(net_tok)) == INADDR_NONE || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) { #ifndef INET6 tcpd_warn("bad net/mask expression: %s/%s", net_tok, mask_tok); #endif return (NO); /* not tcpd_jump() */ } return ((addr & mask) == net); } #ifdef INET6 -static int masked_match6(net_tok, mask_tok, string) -char *net_tok; -char *mask_tok; -char *string; +static int masked_match6(char *net_tok, char *mask_tok, char *string) { struct addrinfo hints, *res; struct sockaddr_in6 net, addr; u_int32_t mask; int len, mask_len, i = 0; char ch; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if (getaddrinfo(string, NULL, &hints, &res) != 0) return NO; memcpy(&addr, res->ai_addr, sizeof(addr)); freeaddrinfo(res); if (IN6_IS_ADDR_V4MAPPED(&addr.sin6_addr)) { if ((*(u_int32_t *)&net.sin6_addr.s6_addr[12] = dot_quad_addr(net_tok)) == INADDR_NONE || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) return (NO); return ((*(u_int32_t *)&addr.sin6_addr.s6_addr[12] & mask) == *(u_int32_t *)&net.sin6_addr.s6_addr[12]); } /* match IPv6 address against netnumber/prefixlen */ len = strlen(net_tok); if (*net_tok != '[' || net_tok[len - 1] != ']') return NO; ch = net_tok[len - 1]; net_tok[len - 1] = '\0'; if (getaddrinfo(net_tok + 1, NULL, &hints, &res) != 0) { net_tok[len - 1] = ch; return NO; } memcpy(&net, res->ai_addr, sizeof(net)); freeaddrinfo(res); net_tok[len - 1] = ch; if ((mask_len = atoi(mask_tok)) < 0 || mask_len > 128) return NO; if (net.sin6_scope_id != 0 && addr.sin6_scope_id != net.sin6_scope_id) return NO; while (mask_len > 0) { if (mask_len < 32) { mask = htonl(~(0xffffffff >> mask_len)); if ((*(u_int32_t *)&addr.sin6_addr.s6_addr[i] & mask) != (*(u_int32_t *)&net.sin6_addr.s6_addr[i] & mask)) return NO; break; } if (*(u_int32_t *)&addr.sin6_addr.s6_addr[i] != *(u_int32_t *)&net.sin6_addr.s6_addr[i]) return NO; i += 4; mask_len -= 32; } return YES; } #endif /* INET6 */ diff --git a/contrib/tcp_wrappers/hosts_ctl.c b/contrib/tcp_wrappers/hosts_ctl.c index e57f30aaa4a4..5477c49fdcdd 100644 --- a/contrib/tcp_wrappers/hosts_ctl.c +++ b/contrib/tcp_wrappers/hosts_ctl.c @@ -1,38 +1,34 @@ /* * hosts_ctl() combines common applications of the host access control * library routines. It bundles its arguments then calls the hosts_access() * access control checker. The host name and user name arguments should be * empty strings, STRING_UNKNOWN or real data. If a match is found, the * optional shell command is executed. * * Restriction: this interface does not pass enough information to support * selective remote username lookups or selective hostname double checks. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) hosts_ctl.c 1.4 94/12/28 17:42:27"; #endif #include #include "tcpd.h" /* hosts_ctl - limited interface to the hosts_access() routine */ -int hosts_ctl(daemon, name, addr, user) -char *daemon; -char *name; -char *addr; -char *user; +int hosts_ctl(char *daemon, char *name, char *addr, char *user) { struct request_info request; return (hosts_access(request_init(&request, RQ_DAEMON, daemon, RQ_CLIENT_NAME, name, RQ_CLIENT_ADDR, addr, RQ_USER, user, 0))); } diff --git a/contrib/tcp_wrappers/inetcf.c b/contrib/tcp_wrappers/inetcf.c index d68faa06b127..44854c0f6f34 100644 --- a/contrib/tcp_wrappers/inetcf.c +++ b/contrib/tcp_wrappers/inetcf.c @@ -1,321 +1,312 @@ /* $FreeBSD$ */ /* * Routines to parse an inetd.conf or tlid.conf file. This would be a great * job for a PERL script. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23"; #endif #include #include #include #include #include #include #include "tcpd.h" #include "inetcf.h" #include "scaffold.h" /* * Network configuration files may live in unusual places. Here are some * guesses. Shorter names follow longer ones. */ char *inet_files[] = { "/private/etc/inetd.conf", /* NEXT */ "/etc/inet/inetd.conf", /* SYSV4 */ "/usr/etc/inetd.conf", /* IRIX?? */ "/etc/inetd.conf", /* BSD */ "/etc/net/tlid.conf", /* SYSV4?? */ "/etc/saf/tlid.conf", /* SYSV4?? */ "/etc/tlid.conf", /* SYSV4?? */ 0, }; static void inet_chk(char *protocol, char *path, char *arg0, char *arg1); static char *base_name(char *path); extern char *percent_m(char *obuf, char *ibuf); /* * Structure with everything we know about a service. */ struct inet_ent { struct inet_ent *next; int type; char name[1]; }; static struct inet_ent *inet_list = 0; static char whitespace[] = " \t\r\n"; /* inet_conf - read in and examine inetd.conf (or tlid.conf) entries */ -char *inet_cfg(conf) -char *conf; +char *inet_cfg(char *conf) { char buf[BUFSIZ]; FILE *fp; char *service; char *protocol; char *user; char *path; char *arg0; char *arg1; struct tcpd_context saved_context; int i; struct stat st; saved_context = tcpd_context; /* * The inetd.conf (or tlid.conf) information is so useful that we insist * on its availability. When no file is given run a series of educated * guesses. */ if (conf != 0) { if ((fp = fopen(conf, "r")) == 0) { fprintf(stderr, percent_m(buf, "open %s: %m\n"), conf); exit(1); } } else { for (i = 0; inet_files[i] && (fp = fopen(inet_files[i], "r")) == 0; i++) /* void */ ; if (fp == 0) { fprintf(stderr, "Cannot find your inetd.conf or tlid.conf file.\n"); fprintf(stderr, "Please specify its location.\n"); exit(1); } conf = inet_files[i]; check_path(conf, &st); } /* * Process the file. After the 7.0 wrapper release it became clear that * there are many more inetd.conf formats than the 8 systems that I had * studied. EP/IX uses a two-line specification for rpc services; HP-UX * permits long lines to be broken with backslash-newline. */ tcpd_context.file = conf; tcpd_context.line = 0; while (xgets(buf, sizeof(buf), fp)) { service = strtok(buf, whitespace); /* service */ if (service == 0 || *service == '#') continue; if (STR_NE(service, "stream") && STR_NE(service, "dgram")) strtok((char *) 0, whitespace); /* endpoint */ protocol = strtok((char *) 0, whitespace); (void) strtok((char *) 0, whitespace); /* wait */ if ((user = strtok((char *) 0, whitespace)) == 0) continue; if (user[0] == '/') { /* user */ path = user; } else { /* path */ if ((path = strtok((char *) 0, whitespace)) == 0) continue; } if (path[0] == '?') /* IRIX optional service */ path++; if (STR_EQ(path, "internal")) continue; if (path[strspn(path, "-0123456789")] == 0) { /* * ConvexOS puts RPC version numbers before path names. Jukka * Ukkonen . */ if ((path = strtok((char *) 0, whitespace)) == 0) continue; } if ((arg0 = strtok((char *) 0, whitespace)) == 0) { tcpd_warn("incomplete line"); continue; } if (arg0[strspn(arg0, "0123456789")] == 0) { /* * We're reading a tlid.conf file, the format is: * * ...stuff... path arg_count arguments mod_count modules */ if ((arg0 = strtok((char *) 0, whitespace)) == 0) { tcpd_warn("incomplete line"); continue; } } if ((arg1 = strtok((char *) 0, whitespace)) == 0) arg1 = ""; inet_chk(protocol, path, arg0, arg1); } fclose(fp); tcpd_context = saved_context; return (conf); } /* inet_chk - examine one inetd.conf (tlid.conf?) entry */ -static void inet_chk(protocol, path, arg0, arg1) -char *protocol; -char *path; -char *arg0; -char *arg1; +static void inet_chk(char *protocol, char *path, char *arg0, char *arg1) { char daemon[BUFSIZ]; struct stat st; int wrap_status = WR_MAYBE; char *base_name_path = base_name(path); char *tcpd_proc_name = (arg0[0] == '/' ? base_name(arg0) : arg0); /* * Always warn when the executable does not exist or when it is not * executable. */ if (check_path(path, &st) < 0) { tcpd_warn("%s: not found: %m", path); } else if ((st.st_mode & 0100) == 0) { tcpd_warn("%s: not executable", path); } /* * Cheat on the miscd tests, nobody uses it anymore. */ if (STR_EQ(base_name_path, "miscd")) { inet_set(arg0, WR_YES); return; } /* * While we are here... */ if (STR_EQ(tcpd_proc_name, "rexd") || STR_EQ(tcpd_proc_name, "rpc.rexd")) tcpd_warn("%s may be an insecure service", tcpd_proc_name); /* * The tcpd program gets most of the attention. */ if (STR_EQ(base_name_path, "tcpd")) { if (STR_EQ(tcpd_proc_name, "tcpd")) tcpd_warn("%s is recursively calling itself", tcpd_proc_name); wrap_status = WR_YES; /* * Check: some sites install the wrapper set-uid. */ if ((st.st_mode & 06000) != 0) tcpd_warn("%s: file is set-uid or set-gid", path); /* * Check: some sites insert tcpd in inetd.conf, instead of replacing * the daemon pathname. */ if (arg0[0] == '/' && STR_EQ(tcpd_proc_name, base_name(arg1))) tcpd_warn("%s inserted before %s", path, arg0); /* * Check: make sure files exist and are executable. On some systems * the network daemons are set-uid so we cannot complain. Note that * tcpd takes the basename only in case of absolute pathnames. */ if (arg0[0] == '/') { /* absolute path */ if (check_path(arg0, &st) < 0) { tcpd_warn("%s: not found: %m", arg0); } else if ((st.st_mode & 0100) == 0) { tcpd_warn("%s: not executable", arg0); } } else { /* look in REAL_DAEMON_DIR */ sprintf(daemon, "%s/%s", REAL_DAEMON_DIR, arg0); if (check_path(daemon, &st) < 0) { tcpd_warn("%s: not found in %s: %m", arg0, REAL_DAEMON_DIR); } else if ((st.st_mode & 0100) == 0) { tcpd_warn("%s: not executable", daemon); } } } else { /* * No tcpd program found. Perhaps they used the "simple installation" * recipe. Look for a file with the same basename in REAL_DAEMON_DIR. * Draw some conservative conclusions when a distinct file is found. */ sprintf(daemon, "%s/%s", REAL_DAEMON_DIR, arg0); if (STR_EQ(path, daemon)) { #ifdef __FreeBSD__ wrap_status = WR_MAYBE; #else wrap_status = WR_NOT; #endif } else if (check_path(daemon, &st) >= 0) { wrap_status = WR_MAYBE; } else if (errno == ENOENT) { wrap_status = WR_NOT; } else { tcpd_warn("%s: file lookup: %m", daemon); wrap_status = WR_MAYBE; } } /* * Alas, we cannot wrap rpc/tcp services. */ if (wrap_status == WR_YES && STR_EQ(protocol, "rpc/tcp")) tcpd_warn("%s: cannot wrap rpc/tcp services", tcpd_proc_name); inet_set(tcpd_proc_name, wrap_status); } /* inet_set - remember service status */ -void inet_set(name, type) -char *name; -int type; +void inet_set(char *name, int type) { struct inet_ent *ip = (struct inet_ent *) malloc(sizeof(struct inet_ent) + strlen(name)); if (ip == 0) { fprintf(stderr, "out of memory\n"); exit(1); } ip->next = inet_list; strcpy(ip->name, name); ip->type = type; inet_list = ip; } /* inet_get - look up service status */ -int inet_get(name) -char *name; +int inet_get(char *name) { struct inet_ent *ip; if (inet_list == 0) return (WR_MAYBE); for (ip = inet_list; ip; ip = ip->next) if (STR_EQ(ip->name, name)) return (ip->type); return (-1); } /* base_name - compute last pathname component */ -static char *base_name(path) -char *path; +static char *base_name(char *path) { char *cp; if ((cp = strrchr(path, '/')) != 0) path = cp + 1; return (path); } diff --git a/contrib/tcp_wrappers/misc.c b/contrib/tcp_wrappers/misc.c index 258d7091adce..c5fb1c6e92fc 100644 --- a/contrib/tcp_wrappers/misc.c +++ b/contrib/tcp_wrappers/misc.c @@ -1,109 +1,103 @@ /* * Misc routines that are used by tcpd and by tcpdchk. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsic[] = "@(#) misc.c 1.2 96/02/11 17:01:29"; #endif #include #include #include #include #include #include #include "tcpd.h" #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif /* xgets - fgets() with backslash-newline stripping */ -char *xgets(ptr, len, fp) -char *ptr; -int len; -FILE *fp; +char *xgets(char *ptr, int len, FILE *fp) { int got; char *start = ptr; while (fgets(ptr, len, fp)) { got = strlen(ptr); if (got >= 1 && ptr[got - 1] == '\n') { tcpd_context.line++; if (got >= 2 && ptr[got - 2] == '\\') { got -= 2; } else { return (start); } } ptr += got; len -= got; ptr[0] = 0; } return (ptr > start ? start : 0); } /* split_at - break string at delimiter or return NULL */ -char *split_at(string, delimiter) -char *string; -int delimiter; +char *split_at(char *string, int delimiter) { char *cp; #ifdef INET6 int bracket = 0; for (cp = string; cp && *cp; cp++) { switch (*cp) { case '[': bracket++; break; case ']': bracket--; break; default: if (bracket == 0 && *cp == delimiter) { *cp++ = 0; return cp; } break; } } return (NULL); #else if ((cp = strchr(string, delimiter)) != 0) *cp++ = 0; return (cp); #endif } /* dot_quad_addr - convert dotted quad to internal form */ -unsigned long dot_quad_addr(str) -char *str; +unsigned long dot_quad_addr(char *str) { int in_run = 0; int runs = 0; char *cp = str; /* Count the number of runs of non-dot characters. */ while (*cp) { if (*cp == '.') { in_run = 0; } else if (in_run == 0) { in_run = 1; runs++; } cp++; } return (runs == 4 ? inet_addr(str) : INADDR_NONE); } diff --git a/contrib/tcp_wrappers/miscd.c b/contrib/tcp_wrappers/miscd.c index 1ab835c45061..4e7db2402cd6 100644 --- a/contrib/tcp_wrappers/miscd.c +++ b/contrib/tcp_wrappers/miscd.c @@ -1,120 +1,118 @@ /* * Front end to the ULTRIX miscd service. The front end logs the remote host * name and then invokes the real miscd daemon. Install as "/usr/etc/miscd", * after renaming the real miscd daemon to the name defined with the * REAL_MISCD macro. * * Connections and diagnostics are logged through syslog(3). * * The Ultrix miscd program implements (among others) the systat service, which * pipes the output from who(1) to stdout. This information is potentially * useful to systems crackers. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) miscd.c 1.10 96/02/11 17:01:30"; #endif /* System libraries. */ #include #include #include #include #include #include #include #ifndef MAXPATHNAMELEN #define MAXPATHNAMELEN BUFSIZ #endif #ifndef STDIN_FILENO #define STDIN_FILENO 0 #endif /* Local stuff. */ #include "patchlevel.h" #include "tcpd.h" int allow_severity = SEVERITY; /* run-time adjustable */ int deny_severity = LOG_WARNING; /* ditto */ -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { struct request_info request; char path[MAXPATHNAMELEN]; /* Attempt to prevent the creation of world-writable files. */ #ifdef DAEMON_UMASK umask(DAEMON_UMASK); #endif /* * Open a channel to the syslog daemon. Older versions of openlog() * require only two arguments. */ #ifdef LOG_MAIL (void) openlog(argv[0], LOG_PID, FACILITY); #else (void) openlog(argv[0], LOG_PID); #endif /* * Find out the endpoint addresses of this conversation. Host name * lookups and double checks will be done on demand. */ request_init(&request, RQ_DAEMON, argv[0], RQ_FILE, STDIN_FILENO, 0); fromhost(&request); /* * Optionally look up and double check the remote host name. Sites * concerned with security may choose to refuse connections from hosts * that pretend to have someone elses host name. */ #ifdef PARANOID if (STR_EQ(eval_hostname(request.client), paranoid)) refuse(&request); #endif /* * The BSD rlogin and rsh daemons that came out after 4.3 BSD disallow * socket options at the IP level. They do so for a good reason. * Unfortunately, we cannot use this with SunOS 4.1.x because the * getsockopt() system call can panic the system. */ #ifdef KILL_IP_OPTIONS fix_options(&request); #endif /* * Check whether this host can access the service in argv[0]. The * access-control code invokes optional shell commands as specified in * the access-control tables. */ #ifdef HOSTS_ACCESS if (!hosts_access(&request)) refuse(&request); #endif /* Report request and invoke the real daemon program. */ syslog(allow_severity, "connect from %s", eval_client(&request)); sprintf(path, "%s/miscd", REAL_DAEMON_DIR); closelog(); (void) execv(path, argv); syslog(LOG_ERR, "error: cannot execute %s: %m", path); clean_exit(&request); /* NOTREACHED */ } diff --git a/contrib/tcp_wrappers/myvsyslog.c b/contrib/tcp_wrappers/myvsyslog.c index 20401f1f371b..d8cf9fd7b65f 100644 --- a/contrib/tcp_wrappers/myvsyslog.c +++ b/contrib/tcp_wrappers/myvsyslog.c @@ -1,33 +1,30 @@ /* * vsyslog() for sites without. In order to enable this code, build with * -Dvsyslog=myvsyslog. We use a different name so that no accidents will * happen when vsyslog() exists. On systems with vsyslog(), syslog() is * typically implemented in terms of vsyslog(). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) myvsyslog.c 1.1 94/12/28 17:42:33"; #endif #ifdef vsyslog #include #include "tcpd.h" #include "mystdarg.h" -myvsyslog(severity, format, ap) -int severity; -char *format; -va_list ap; +myvsyslog(int severity, char *format, va_list ap) { char fbuf[BUFSIZ]; char obuf[3 * STRING_LENGTH]; vsprintf(obuf, percent_m(fbuf, format), ap); syslog(severity, "%s", obuf); } #endif diff --git a/contrib/tcp_wrappers/ncr.c b/contrib/tcp_wrappers/ncr.c index b903fb85a565..e62a48948ce5 100644 --- a/contrib/tcp_wrappers/ncr.c +++ b/contrib/tcp_wrappers/ncr.c @@ -1,81 +1,80 @@ /* * This part for NCR UNIX with is from Andrew Maffei (arm@aqua.whoi.edu). It * assumes TLI throughout. In order to look up endpoint address information * we must talk to the "timod" streams module. For some reason "timod" wants * to sit directly on top of the device driver. Therefore we pop off all * streams modules except the driver, install the "timod" module so that we * can figure out network addresses, and then restore the original state. */ #ifndef lint static char sccsid[] = "@(#) ncr.c 1.1 94/12/28 17:42:34"; #endif #include #include #include #include #include #include #include "tcpd.h" #define MAX_MODULE_COUNT 10 /* XXX */ /* fromhost - tear down the streams stack then rebuild it */ -void fromhost(request) -struct request_info *request; +void fromhost(struct request_info *request) { int i; int num_mod; struct str_list str_list; struct str_mlist mod_buffer[MAX_MODULE_COUNT]; int fd = request->fd; str_list.sl_nmods = MAX_MODULE_COUNT; str_list.sl_modlist = &mod_buffer[0]; /* * On systems with WIN streams support we have to be careful about what * is on the stream we are passed. This code POPs off all modules above * the pseudo driver, pushes timod, gets the host address information, * pops timod and then pushes all modules back on the stream. * * Some state may be lost in this process. /usr/etc/tlid seems to do special * things to the stream depending on the TCP port being serviced. (not a * very nice thing to do!). It is unclear what to do if this code breaks * - the stream may be left in an unknown condition. */ if ((num_mod = ioctl(fd, I_LIST, NULL)) < 0) tcpd_warn("fromhost: LIST failed: %m"); if (ioctl(fd, I_LIST, &str_list) < 0) tcpd_warn("fromhost: LIST failed: %m"); /* * POP stream modules except for the driver. */ for (i = 0; i < num_mod - 1; i++) if (ioctl(fd, I_POP, 0) < 0) tcpd_warn("fromhost: POP %s: %m", mod_buffer[i].l_name); /* * PUSH timod so that host address ioctls can be executed. */ if (ioctl(fd, I_PUSH, "timod") < 0) tcpd_warn("fromhost: PUSH timod: %m"); tli_host(request); /* * POP timod, we're done with it now. */ if (ioctl(fd, I_POP, 0) < 0) tcpd_warn("fromhost: POP timod: %m"); /* * Restore stream modules. */ for (i = num_mod - 2; i >= 0; i--) if (ioctl(fd, I_PUSH, mod_buffer[i].l_name) < 0) tcpd_warn("fromhost: PUSH %s: %m", mod_buffer[i].l_name); } diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c index 64ad355faa61..481ba2d372d5 100644 --- a/contrib/tcp_wrappers/options.c +++ b/contrib/tcp_wrappers/options.c @@ -1,538 +1,509 @@ /* * General skeleton for adding options to the access control language. The * features offered by this module are documented in the hosts_options(5) * manual page (source file: hosts_options.5, "nroff -man" format). * * Notes and warnings for those who want to add features: * * In case of errors, abort options processing and deny access. There are too * many irreversible side effects to make error recovery feasible. For * example, it makes no sense to continue after we have already changed the * userid. * * In case of errors, do not terminate the process: the routines might be * called from a long-running daemon that should run forever. Instead, call * tcpd_jump() which does a non-local goto back into the hosts_access() * routine. * * In case of severe errors, use clean_exit() instead of directly calling * exit(), or the inetd may loop on an UDP request. * * In verification mode (for example, with the "tcpdmatch" command) the * "dry_run" flag is set. In this mode, an option function should just "say" * what it is going to do instead of really doing it. * * Some option functions do not return (for example, the twist option passes * control to another program). In verification mode (dry_run flag is set) * such options should clear the "dry_run" flag to inform the caller of this * course of action. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31"; #endif /* System libraries. */ #include #include #include #include #include #include #include #define SYSLOG_NAMES #include #include #include #include #include #include #include #include #ifndef MAXPATHNAMELEN #define MAXPATHNAMELEN BUFSIZ #endif /* Local stuff. */ #include "tcpd.h" /* Options runtime support. */ int dry_run = 0; /* flag set in verification mode */ extern jmp_buf tcpd_buf; /* tcpd_jump() support */ /* Options parser support. */ static char whitespace_eq[] = "= \t\r\n"; #define whitespace (whitespace_eq + 1) static char *get_field(char *string); /* chew :-delimited field off string */ static char *chop_string(char *string); /* strip leading and trailing blanks */ /* List of functions that implement the options. Add yours here. */ static void user_option(); /* execute "user name.group" option */ static void group_option(); /* execute "group name" option */ static void umask_option(); /* execute "umask mask" option */ static void linger_option(); /* execute "linger time" option */ static void keepalive_option(); /* execute "keepalive" option */ static void spawn_option(); /* execute "spawn command" option */ static void twist_option(); /* execute "twist command" option */ static void rfc931_option(); /* execute "rfc931" option */ static void setenv_option(); /* execute "setenv name value" */ static void nice_option(); /* execute "nice" option */ static void severity_option(); /* execute "severity value" */ static void allow_option(); /* execute "allow" option */ static void deny_option(); /* execute "deny" option */ static void banners_option(); /* execute "banners path" option */ /* Structure of the options table. */ struct option { char *name; /* keyword name, case is ignored */ - void (*func) (); /* function that does the real work */ + void (*func) (char *value, struct request_info *request); + /* function that does the real work */ int flags; /* see below... */ }; #define NEED_ARG (1<<1) /* option requires argument */ #define USE_LAST (1<<2) /* option must be last */ #define OPT_ARG (1<<3) /* option has optional argument */ #define EXPAND_ARG (1<<4) /* do %x expansion on argument */ #define need_arg(o) ((o)->flags & NEED_ARG) #define opt_arg(o) ((o)->flags & OPT_ARG) #define permit_arg(o) ((o)->flags & (NEED_ARG | OPT_ARG)) #define use_last(o) ((o)->flags & USE_LAST) #define expand_arg(o) ((o)->flags & EXPAND_ARG) /* List of known keywords. Add yours here. */ static struct option option_table[] = { "user", user_option, NEED_ARG, "group", group_option, NEED_ARG, "umask", umask_option, NEED_ARG, "linger", linger_option, NEED_ARG, "keepalive", keepalive_option, 0, "spawn", spawn_option, NEED_ARG | EXPAND_ARG, "twist", twist_option, NEED_ARG | EXPAND_ARG | USE_LAST, "rfc931", rfc931_option, OPT_ARG, "setenv", setenv_option, NEED_ARG | EXPAND_ARG, "nice", nice_option, OPT_ARG, "severity", severity_option, NEED_ARG, "allow", allow_option, USE_LAST, "deny", deny_option, USE_LAST, "banners", banners_option, NEED_ARG, 0, }; /* process_options - process access control options */ -void process_options(options, request) -char *options; -struct request_info *request; +void process_options(char *options, struct request_info *request) { char *key; char *value; char *curr_opt; char *next_opt; struct option *op; char bf[BUFSIZ]; for (curr_opt = get_field(options); curr_opt; curr_opt = next_opt) { next_opt = get_field((char *) 0); /* * Separate the option into name and value parts. For backwards * compatibility we ignore exactly one '=' between name and value. */ curr_opt = chop_string(curr_opt); if (*(value = curr_opt + strcspn(curr_opt, whitespace_eq))) { if (*value != '=') { *value++ = 0; value += strspn(value, whitespace); } if (*value == '=') { *value++ = 0; value += strspn(value, whitespace); } } if (*value == 0) value = 0; key = curr_opt; /* * Disallow missing option names (and empty option fields). */ if (*key == 0) tcpd_jump("missing option name"); /* * Lookup the option-specific info and do some common error checks. * Delegate option-specific processing to the specific functions. */ for (op = option_table; op->name && STR_NE(op->name, key); op++) /* VOID */ ; if (op->name == 0) tcpd_jump("bad option name: \"%s\"", key); if (!value && need_arg(op)) tcpd_jump("option \"%s\" requires value", key); if (value && !permit_arg(op)) tcpd_jump("option \"%s\" requires no value", key); if (next_opt && use_last(op)) tcpd_jump("option \"%s\" must be at end", key); if (value && expand_arg(op)) value = chop_string(percent_x(bf, sizeof(bf), value, request)); if (hosts_access_verbose) syslog(LOG_DEBUG, "option: %s %s", key, value ? value : ""); (*(op->func)) (value, request); } } /* allow_option - grant access */ /* ARGSUSED */ static void allow_option(value, request) char *value; struct request_info *request; { longjmp(tcpd_buf, AC_PERMIT); } /* deny_option - deny access */ /* ARGSUSED */ static void deny_option(value, request) char *value; struct request_info *request; { longjmp(tcpd_buf, AC_DENY); } /* banners_option - expand %, terminate each line with CRLF */ -static void banners_option(value, request) -char *value; -struct request_info *request; +static void banners_option(char *value, struct request_info *request) { char path[MAXPATHNAMELEN]; char ibuf[BUFSIZ]; char obuf[2 * BUFSIZ]; struct stat st; int ch; FILE *fp; sprintf(path, "%s/%s", value, eval_daemon(request)); if ((fp = fopen(path, "r")) != 0) { while ((ch = fgetc(fp)) == 0) write(request->fd, "", 1); ungetc(ch, fp); while (fgets(ibuf, sizeof(ibuf) - 1, fp)) { if (split_at(ibuf, '\n')) strcat(ibuf, "\r\n"); percent_x(obuf, sizeof(obuf), ibuf, request); write(request->fd, obuf, strlen(obuf)); } fclose(fp); } else if (stat(value, &st) < 0) { tcpd_warn("%s: %m", value); } } /* group_option - switch group id */ /* ARGSUSED */ -static void group_option(value, request) -char *value; -struct request_info *request; +static void group_option(char *value, struct request_info *request) { struct group *grp; struct group *getgrnam(); if ((grp = getgrnam(value)) == 0) tcpd_jump("unknown group: \"%s\"", value); endgrent(); if (dry_run == 0 && setgid(grp->gr_gid)) tcpd_jump("setgid(%s): %m", value); } /* user_option - switch user id */ /* ARGSUSED */ -static void user_option(value, request) -char *value; -struct request_info *request; +static void user_option(char *value, struct request_info *request) { struct passwd *pwd; struct passwd *getpwnam(); char *group; if ((group = split_at(value, '.')) != 0) group_option(group, request); if ((pwd = getpwnam(value)) == 0) tcpd_jump("unknown user: \"%s\"", value); endpwent(); if (dry_run == 0 && setuid(pwd->pw_uid)) tcpd_jump("setuid(%s): %m", value); } /* umask_option - set file creation mask */ /* ARGSUSED */ -static void umask_option(value, request) -char *value; -struct request_info *request; +static void umask_option(char *value, struct request_info *request) { unsigned mask; char junk; if (sscanf(value, "%o%c", &mask, &junk) != 1 || (mask & 0777) != mask) tcpd_jump("bad umask value: \"%s\"", value); (void) umask(mask); } /* spawn_option - spawn a shell command and wait */ /* ARGSUSED */ -static void spawn_option(value, request) -char *value; -struct request_info *request; +static void spawn_option(char *value, struct request_info *request) { if (dry_run == 0) shell_cmd(value); } /* linger_option - set the socket linger time (Marc Boucher ) */ /* ARGSUSED */ -static void linger_option(value, request) -char *value; -struct request_info *request; +static void linger_option(char *value, struct request_info *request) { struct linger linger; char junk; if (sscanf(value, "%d%c", &linger.l_linger, &junk) != 1 || linger.l_linger < 0) tcpd_jump("bad linger value: \"%s\"", value); if (dry_run == 0) { linger.l_onoff = (linger.l_linger != 0); if (setsockopt(request->fd, SOL_SOCKET, SO_LINGER, (char *) &linger, sizeof(linger)) < 0) tcpd_warn("setsockopt SO_LINGER %d: %m", linger.l_linger); } } /* keepalive_option - set the socket keepalive option */ /* ARGSUSED */ -static void keepalive_option(value, request) -char *value; -struct request_info *request; +static void keepalive_option(char *value, struct request_info *request) { static int on = 1; if (dry_run == 0 && setsockopt(request->fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, sizeof(on)) < 0) tcpd_warn("setsockopt SO_KEEPALIVE: %m"); } /* nice_option - set nice value */ /* ARGSUSED */ -static void nice_option(value, request) -char *value; -struct request_info *request; +static void nice_option(char *value, struct request_info *request) { int niceval = 10; char junk; if (value != 0 && sscanf(value, "%d%c", &niceval, &junk) != 1) tcpd_jump("bad nice value: \"%s\"", value); if (dry_run == 0 && nice(niceval) < 0) tcpd_warn("nice(%d): %m", niceval); } /* twist_option - replace process by shell command */ -static void twist_option(value, request) -char *value; -struct request_info *request; +static void twist_option(char *value, struct request_info *request) { char *error; if (dry_run != 0) { dry_run = 0; } else { if (resident > 0) tcpd_jump("twist option in resident process"); syslog(deny_severity, "twist %s to %s", eval_client(request), value); /* Before switching to the shell, set up stdin, stdout and stderr. */ #define maybe_dup2(from, to) ((from == to) ? to : (close(to), dup(from))) if (maybe_dup2(request->fd, 0) != 0 || maybe_dup2(request->fd, 1) != 1 || maybe_dup2(request->fd, 2) != 2) { error = "twist_option: dup: %m"; } else { if (request->fd > 2) close(request->fd); (void) execl("/bin/sh", "sh", "-c", value, (char *) 0); error = "twist_option: /bin/sh: %m"; } /* Something went wrong: we MUST terminate the process. */ tcpd_warn(error); clean_exit(request); } } /* rfc931_option - look up remote user name */ -static void rfc931_option(value, request) -char *value; -struct request_info *request; +static void rfc931_option(char *value, struct request_info *request) { int timeout; char junk; if (value != 0) { if (sscanf(value, "%d%c", &timeout, &junk) != 1 || timeout <= 0) tcpd_jump("bad rfc931 timeout: \"%s\"", value); rfc931_timeout = timeout; } (void) eval_user(request); } /* setenv_option - set environment variable */ /* ARGSUSED */ -static void setenv_option(value, request) -char *value; -struct request_info *request; +static void setenv_option(char *value, struct request_info *request) { char *var_value; if (*(var_value = value + strcspn(value, whitespace))) *var_value++ = 0; if (setenv(chop_string(value), chop_string(var_value), 1)) tcpd_jump("memory allocation failure"); } /* severity_map - lookup facility or severity value */ -static int severity_map(table, name) -const CODE *table; -char *name; +static int severity_map(const CODE *table, char *name) { const CODE *t; int ret = -1; for (t = table; t->c_name; t++) if (STR_EQ(t->c_name, name)) { ret = t->c_val; break; } if (ret == -1) tcpd_jump("bad syslog facility or severity: \"%s\"", name); return (ret); } /* severity_option - change logging severity for this event (Dave Mitchell) */ /* ARGSUSED */ -static void severity_option(value, request) -char *value; -struct request_info *request; +static void severity_option(char *value, struct request_info *request) { char *level = split_at(value, '.'); allow_severity = deny_severity = level ? severity_map(facilitynames, value) | severity_map(prioritynames, level) : severity_map(prioritynames, value); } /* get_field - return pointer to next field in string */ -static char *get_field(string) -char *string; +static char *get_field(char *string) { static char *last = ""; char *src; char *dst; char *ret; int ch; /* * This function returns pointers to successive fields within a given * string. ":" is the field separator; warn if the rule ends in one. It * replaces a "\:" sequence by ":", without treating the result of * substitution as field terminator. A null argument means resume search * where the previous call terminated. This function destroys its * argument. * * Work from explicit source or from memory. While processing \: we * overwrite the input. This way we do not have to maintain buffers for * copies of input fields. */ src = dst = ret = (string ? string : last); if (src[0] == 0) return (0); while (ch = *src) { if (ch == ':') { if (*++src == 0) tcpd_warn("rule ends in \":\""); break; } if (ch == '\\' && src[1] == ':') src++; *dst++ = *src++; } last = src; *dst = 0; return (ret); } /* chop_string - strip leading and trailing blanks from string */ -static char *chop_string(string) -register char *string; +static char *chop_string(register char *string) { char *start = 0; char *end; char *cp; for (cp = string; *cp; cp++) { if (!isspace(*cp)) { if (start == 0) start = cp; end = cp; } } return (start ? (end[1] = 0, start) : cp); } diff --git a/contrib/tcp_wrappers/percent_m.c b/contrib/tcp_wrappers/percent_m.c index 1019b82d8c36..1cedbd9c4c0c 100644 --- a/contrib/tcp_wrappers/percent_m.c +++ b/contrib/tcp_wrappers/percent_m.c @@ -1,42 +1,40 @@ /* * Replace %m by system error message. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) percent_m.c 1.1 94/12/28 17:42:37"; #endif #include #include #include #ifndef SYS_ERRLIST_DEFINED extern char *sys_errlist[]; extern int sys_nerr; #endif #include "mystdarg.h" -char *percent_m(obuf, ibuf) -char *obuf; -char *ibuf; +char *percent_m(char *obuf, char *ibuf) { char *bp = obuf; char *cp = ibuf; while (*bp = *cp) if (*cp == '%' && cp[1] == 'm') { if (errno < sys_nerr && errno > 0) { strcpy(bp, sys_errlist[errno]); } else { sprintf(bp, "Unknown error %d", errno); } bp += strlen(bp); cp += 2; } else { bp++, cp++; } return (obuf); } diff --git a/contrib/tcp_wrappers/percent_x.c b/contrib/tcp_wrappers/percent_x.c index 9b37329cf369..433dc4f9a153 100644 --- a/contrib/tcp_wrappers/percent_x.c +++ b/contrib/tcp_wrappers/percent_x.c @@ -1,87 +1,84 @@ /* * percent_x() takes a string and performs % expansions. It aborts the * program when the expansion would overflow the output buffer. The result * of % expansion may be passed on to a shell process. For this * reason, characters with a special meaning to shells are replaced by * underscores. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) percent_x.c 1.4 94/12/28 17:42:37"; #endif /* System libraries. */ #include #include #include #include extern void exit(); /* Local stuff. */ #include "tcpd.h" /* percent_x - do % expansion, abort if result buffer is too small */ -char *percent_x(result, result_len, string, request) -char *result; -int result_len; -char *string; -struct request_info *request; +char *percent_x(char *result, int result_len, char *string, + struct request_info *request) { char *bp = result; char *end = result + result_len - 1; /* end of result buffer */ char *expansion; int expansion_len; static char ok_chars[] = "1234567890!@%-_=+:,./\ abcdefghijklmnopqrstuvwxyz\ ABCDEFGHIJKLMNOPQRSTUVWXYZ"; char *str = string; char *cp; int ch; /* * Warning: we may be called from a child process or after pattern * matching, so we cannot use clean_exit() or tcpd_jump(). */ while (*str) { if (*str == '%' && (ch = str[1]) != 0) { str += 2; expansion = ch == 'a' ? eval_hostaddr(request->client) : ch == 'A' ? eval_hostaddr(request->server) : ch == 'c' ? eval_client(request) : ch == 'd' ? eval_daemon(request) : ch == 'h' ? eval_hostinfo(request->client) : ch == 'H' ? eval_hostinfo(request->server) : ch == 'n' ? eval_hostname(request->client) : ch == 'N' ? eval_hostname(request->server) : ch == 'p' ? eval_pid(request) : ch == 's' ? eval_server(request) : ch == 'u' ? eval_user(request) : ch == '%' ? "%" : (tcpd_warn("unrecognized %%%c", ch), ""); for (cp = expansion; *(cp += strspn(cp, ok_chars)); /* */ ) *cp = '_'; expansion_len = cp - expansion; } else { expansion = str++; expansion_len = 1; } if (bp + expansion_len >= end) { tcpd_warn("percent_x: expansion too long: %.30s...", result); sleep(5); exit(0); } memcpy(bp, expansion, expansion_len); bp += expansion_len; } *bp = 0; return (result); } diff --git a/contrib/tcp_wrappers/ptx.c b/contrib/tcp_wrappers/ptx.c index b9c312b82cdc..e8ea7ed08676 100644 --- a/contrib/tcp_wrappers/ptx.c +++ b/contrib/tcp_wrappers/ptx.c @@ -1,103 +1,101 @@ /* * The Dynix/PTX TLI implementation is not quite compatible with System V * Release 4. Some important functions are not present so we are limited to * IP-based services. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) ptx.c 1.3 94/12/28 17:42:38"; #endif #ifdef PTX /* System libraries. */ #include #include #include #include #include #include #include #include /* Local stuff. */ #include "tcpd.h" /* Forward declarations. */ static void ptx_sink(); /* tli_host - determine TLI endpoint info, PTX version */ -void tli_host(request) -struct request_info *request; +void tli_host(struct request_info *request) { static struct sockaddr_in client; static struct sockaddr_in server; /* * getpeerinaddr() was suggested by someone at Sequent. It seems to work * with connection-oriented (TCP) services such as rlogind and telnetd, * but it returns 0.0.0.0 with datagram (UDP) services. No problem: UDP * needs special treatment anyway, in case we must refuse service. */ if (getpeerinaddr(request->fd, &client, sizeof(client)) == 0 && client.sin_addr.s_addr != 0) { request->client->sin = &client; if (getmyinaddr(request->fd, &server, sizeof(server)) == 0) { request->server->sin = &server; } else { tcpd_warn("warning: getmyinaddr: %m"); } sock_methods(request); } else { /* * Another suggestion was to temporarily switch to the socket * interface, identify the endpoint addresses with socket calls, then * to switch back to TLI. This seems to works OK with UDP services, * which is exactly what we should be looking at right now. */ #define SWAP_MODULE(f, old, new) (ioctl(f, I_POP, old), ioctl(f, I_PUSH, new)) if (SWAP_MODULE(request->fd, "timod", "sockmod") != 0) tcpd_warn("replace timod by sockmod: %m"); sock_host(request); if (SWAP_MODULE(request->fd, "sockmod", "timod") != 0) tcpd_warn("replace sockmod by timod: %m"); if (request->sink != 0) request->sink = ptx_sink; } } /* ptx_sink - absorb unreceived IP datagram */ -static void ptx_sink(fd) -int fd; +static void ptx_sink(int fd) { char buf[BUFSIZ]; struct sockaddr sa; int size = sizeof(sa); /* * Eat up the not-yet received datagram. Where needed, switch to the * socket programming interface. */ if (ioctl(fd, I_FIND, "timod") != 0) ioctl(fd, I_POP, "timod"); if (ioctl(fd, I_FIND, "sockmod") == 0) ioctl(fd, I_PUSH, "sockmod"); (void) recvfrom(fd, buf, sizeof(buf), 0, &sa, &size); } #endif /* PTX */ diff --git a/contrib/tcp_wrappers/refuse.c b/contrib/tcp_wrappers/refuse.c index fd04e08ae9bf..833ecbe7e3e1 100644 --- a/contrib/tcp_wrappers/refuse.c +++ b/contrib/tcp_wrappers/refuse.c @@ -1,39 +1,38 @@ /* * refuse() reports a refused connection, and takes the consequences: in * case of a datagram-oriented service, the unread datagram is taken from * the input queue (or inetd would see the same datagram again and again); * the program is terminated. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) refuse.c 1.5 94/12/28 17:42:39"; #endif /* System libraries. */ #include #include /* Local stuff. */ #include "tcpd.h" /* refuse - refuse request */ -void refuse(request) -struct request_info *request; +void refuse(struct request_info *request) { #ifdef INET6 syslog(deny_severity, "refused connect from %s (%s)", eval_client(request), eval_hostaddr(request->client)); #else syslog(deny_severity, "refused connect from %s", eval_client(request)); #endif clean_exit(request); /* NOTREACHED */ } diff --git a/contrib/tcp_wrappers/rfc931.c b/contrib/tcp_wrappers/rfc931.c index 033254b61261..e2adafb8f6ff 100644 --- a/contrib/tcp_wrappers/rfc931.c +++ b/contrib/tcp_wrappers/rfc931.c @@ -1,232 +1,226 @@ /* * rfc931() speaks a common subset of the RFC 931, AUTH, TAP, IDENT and RFC * 1413 protocols. It queries an RFC 931 etc. compatible daemon on a remote * host to look up the owner of a connection. The information should not be * used for authentication purposes. This routine intercepts alarm signals. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #include #ifndef SEEK_SET #define SEEK_SET 0 #endif /* Local stuff. */ #include "tcpd.h" #define RFC931_PORT 113 /* Semi-well-known port */ #define ANY_PORT 0 /* Any old port will do */ int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */ static jmp_buf timebuf; /* fsocket - open stdio stream on top of socket */ -static FILE *fsocket(domain, type, protocol) -int domain; -int type; -int protocol; +static FILE *fsocket(int domain, int type, int protocol) { int s; FILE *fp; if ((s = socket(domain, type, protocol)) < 0) { tcpd_warn("socket: %m"); return (0); } else { if ((fp = fdopen(s, "r+")) == 0) { tcpd_warn("fdopen: %m"); close(s); } return (fp); } } /* timeout - handle timeouts */ static void timeout(int sig) { longjmp(timebuf, sig); } /* rfc931 - return remote user name, given socket structures */ -void rfc931(rmt_sin, our_sin, dest) #ifdef INET6 -struct sockaddr *rmt_sin; -struct sockaddr *our_sin; +void rfc931(struct sockaddr *rmt_sin, struct sockaddr *our_sin, char *dest) #else -struct sockaddr_in *rmt_sin; -struct sockaddr_in *our_sin; +void rfc931(struct sockaddr_in *rmt_sin, struct sockaddr_in *our_sin, + char *dest) #endif -char *dest; { unsigned rmt_port; unsigned our_port; #ifdef INET6 struct sockaddr_storage rmt_query_sin; struct sockaddr_storage our_query_sin; int alen; #else struct sockaddr_in rmt_query_sin; struct sockaddr_in our_query_sin; #endif char user[256]; /* XXX */ char buffer[512]; /* XXX */ char *cp; char *result = unknown; FILE *fp; #ifdef INET6 /* address family must be the same */ if (rmt_sin->sa_family != our_sin->sa_family) { STRN_CPY(dest, result, STRING_LENGTH); return; } switch (our_sin->sa_family) { case AF_INET: alen = sizeof(struct sockaddr_in); break; case AF_INET6: alen = sizeof(struct sockaddr_in6); break; default: STRN_CPY(dest, result, STRING_LENGTH); return; } #endif /* * If we use a single, buffered, bidirectional stdio stream ("r+" or * "w+" mode) we may read our own output. Such behaviour would make sense * with resources that support random-access operations, but not with * sockets. ANSI C suggests several functions which can be called when * you want to change IO direction, fseek seems the most portable. */ #ifdef INET6 if ((fp = fsocket(our_sin->sa_family, SOCK_STREAM, 0)) != 0) { #else if ((fp = fsocket(AF_INET, SOCK_STREAM, 0)) != 0) { #endif /* * Set up a timer so we won't get stuck while waiting for the server. */ if (setjmp(timebuf) == 0) { signal(SIGALRM, timeout); alarm(rfc931_timeout); /* * Bind the local and remote ends of the query socket to the same * IP addresses as the connection under investigation. We go * through all this trouble because the local or remote system * might have more than one network address. The RFC931 etc. * client sends only port numbers; the server takes the IP * addresses from the query socket. */ #ifdef INET6 memcpy(&our_query_sin, our_sin, alen); memcpy(&rmt_query_sin, rmt_sin, alen); switch (our_sin->sa_family) { case AF_INET: ((struct sockaddr_in *)&our_query_sin)->sin_port = htons(ANY_PORT); ((struct sockaddr_in *)&rmt_query_sin)->sin_port = htons(RFC931_PORT); break; case AF_INET6: ((struct sockaddr_in6 *)&our_query_sin)->sin6_port = htons(ANY_PORT); ((struct sockaddr_in6 *)&rmt_query_sin)->sin6_port = htons(RFC931_PORT); break; } if (bind(fileno(fp), (struct sockaddr *) & our_query_sin, alen) >= 0 && connect(fileno(fp), (struct sockaddr *) & rmt_query_sin, alen) >= 0) { #else our_query_sin = *our_sin; our_query_sin.sin_port = htons(ANY_PORT); rmt_query_sin = *rmt_sin; rmt_query_sin.sin_port = htons(RFC931_PORT); if (bind(fileno(fp), (struct sockaddr *) & our_query_sin, sizeof(our_query_sin)) >= 0 && connect(fileno(fp), (struct sockaddr *) & rmt_query_sin, sizeof(rmt_query_sin)) >= 0) { #endif /* * Send query to server. Neglect the risk that a 13-byte * write would have to be fragmented by the local system and * cause trouble with buggy System V stdio libraries. */ fprintf(fp, "%u,%u\r\n", #ifdef INET6 ntohs(((struct sockaddr_in *)rmt_sin)->sin_port), ntohs(((struct sockaddr_in *)our_sin)->sin_port)); #else ntohs(rmt_sin->sin_port), ntohs(our_sin->sin_port)); #endif fflush(fp); fseek(fp, 0, SEEK_SET); /* * Read response from server. Use fgets()/sscanf() so we can * work around System V stdio libraries that incorrectly * assume EOF when a read from a socket returns less than * requested. */ if (fgets(buffer, sizeof(buffer), fp) != 0 && ferror(fp) == 0 && feof(fp) == 0 && sscanf(buffer, "%u , %u : USERID :%*[^:]:%255s", &rmt_port, &our_port, user) == 3 #ifdef INET6 && ntohs(((struct sockaddr_in *)rmt_sin)->sin_port) == rmt_port && ntohs(((struct sockaddr_in *)our_sin)->sin_port) == our_port) { #else && ntohs(rmt_sin->sin_port) == rmt_port && ntohs(our_sin->sin_port) == our_port) { #endif /* * Strip trailing carriage return. It is part of the * protocol, not part of the data. */ if (cp = strchr(user, '\r')) *cp = 0; result = user; } } alarm(0); } fclose(fp); } STRN_CPY(dest, result, STRING_LENGTH); } diff --git a/contrib/tcp_wrappers/safe_finger.c b/contrib/tcp_wrappers/safe_finger.c index 7b8f3cd638a8..dba8f1bf023d 100644 --- a/contrib/tcp_wrappers/safe_finger.c +++ b/contrib/tcp_wrappers/safe_finger.c @@ -1,196 +1,192 @@ /* * safe_finger - finger client wrapper that protects against nasty stuff * from finger servers. Use this program for automatic reverse finger * probes, not the raw finger command. * * Build with: cc -o safe_finger safe_finger.c * * The problem: some programs may react to stuff in the first column. Other * programs may get upset by thrash anywhere on a line. File systems may * fill up as the finger server keeps sending data. Text editors may bomb * out on extremely long lines. The finger server may take forever because * it is somehow wedged. The code below takes care of all this badness. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) safe_finger.c 1.4 94/12/28 17:42:41"; #endif /* System libraries */ #include #include #include #include #include #include extern void exit(); /* Local stuff */ char path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin"; #define TIME_LIMIT 60 /* Do not keep listinging forever */ #define INPUT_LENGTH 100000 /* Do not keep listinging forever */ #define LINE_LENGTH 128 /* Editors can choke on long lines */ #define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */ #define UNPRIV_NAME "nobody" /* Preferred privilege level */ #define UNPRIV_UGID 32767 /* Default uid and gid */ int finger_pid; void cleanup(sig) int sig; { kill(finger_pid, SIGKILL); exit(0); } -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { int c; int line_length = 0; int finger_status; int wait_pid; int input_count = 0; struct passwd *pwd; /* * First of all, let's don't run with superuser privileges. */ if (getuid() == 0 || geteuid() == 0) { if ((pwd = getpwnam(UNPRIV_NAME)) && pwd->pw_uid > 0) { setgid(pwd->pw_gid); setuid(pwd->pw_uid); } else { setgid(UNPRIV_UGID); setuid(UNPRIV_UGID); } } /* * Redirect our standard input through the raw finger command. */ if (putenv(path)) { fprintf(stderr, "%s: putenv: out of memory", argv[0]); exit(1); } argv[0] = FINGER_PROGRAM; finger_pid = pipe_stdin(argv); /* * Don't wait forever (Peter Wemm ). */ signal(SIGALRM, cleanup); (void) alarm(TIME_LIMIT); /* * Main filter loop. */ while ((c = getchar()) != EOF) { if (input_count++ >= INPUT_LENGTH) { /* don't listen forever */ fclose(stdin); printf("\n\n Input truncated to %d bytes...\n", input_count - 1); break; } if (c == '\n') { /* good: end of line */ putchar(c); line_length = 0; } else { if (line_length >= LINE_LENGTH) { /* force end of line */ printf("\\\n"); line_length = 0; } if (line_length == 0) { /* protect left margin */ putchar(' '); line_length++; } if (isascii(c) && (isprint(c) || isspace(c))) { /* text */ if (c == '\\') { putchar(c); line_length++; } putchar(c); line_length++; } else { /* quote all other thash */ printf("\\%03o", c & 0377); line_length += 4; } } } /* * Wait until the finger child process has terminated and account for its * exit status. Which will always be zero on most systems. */ while ((wait_pid = wait(&finger_status)) != -1 && wait_pid != finger_pid) /* void */ ; return (wait_pid != finger_pid || finger_status != 0); } /* perror_exit - report system error text and terminate */ -void perror_exit(text) -char *text; +void perror_exit(char *text) { perror(text); exit(1); } /* pipe_stdin - pipe stdin through program (from my ANSI to OLD C converter) */ -int pipe_stdin(argv) -char **argv; +int pipe_stdin(char **argv) { int pipefds[2]; int pid; int i; struct stat st; /* * The code that sets up the pipe requires that file descriptors 0,1,2 * are already open. All kinds of mysterious things will happen if that * is not the case. The following loops makes sure that descriptors 0,1,2 * are set up properly. */ for (i = 0; i < 3; i++) { if (fstat(i, &st) == -1 && open("/dev/null", 2) != i) perror_exit("open /dev/null"); } /* * Set up the pipe that interposes the command into our standard input * stream. */ if (pipe(pipefds)) perror_exit("pipe"); switch (pid = fork()) { case -1: /* error */ perror_exit("fork"); /* NOTREACHED */ case 0: /* child */ (void) close(pipefds[0]); /* close reading end */ (void) close(1); /* connect stdout to pipe */ if (dup(pipefds[1]) != 1) perror_exit("dup"); (void) close(pipefds[1]); /* close redundant fd */ (void) execvp(argv[0], argv); perror_exit(argv[0]); /* NOTREACHED */ default: /* parent */ (void) close(pipefds[1]); /* close writing end */ (void) close(0); /* connect stdin to pipe */ if (dup(pipefds[0]) != 0) perror_exit("dup"); (void) close(pipefds[0]); /* close redundant fd */ return (pid); } } diff --git a/contrib/tcp_wrappers/scaffold.c b/contrib/tcp_wrappers/scaffold.c index 325f702a53d4..cb4211fc98ac 100644 --- a/contrib/tcp_wrappers/scaffold.c +++ b/contrib/tcp_wrappers/scaffold.c @@ -1,259 +1,251 @@ /* * Routines for testing only. Not really industrial strength. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccs_id[] = "@(#) scaffold.c 1.6 97/03/21 19:27:24"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #include #include #include #include #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif /* Application-specific. */ #include "tcpd.h" #include "scaffold.h" /* * These are referenced by the options module and by rfc931.c. */ int allow_severity = SEVERITY; int deny_severity = LOG_WARNING; #ifndef INET6 /* dup_hostent - create hostent in one memory block */ -static struct hostent *dup_hostent(hp) -struct hostent *hp; +static struct hostent *dup_hostent(struct hostent *hp) { struct hostent_block { struct hostent host; char *addr_list[1]; }; struct hostent_block *hb; int count; char *data; char *addr; for (count = 0; hp->h_addr_list[count] != 0; count++) /* void */ ; if ((hb = (struct hostent_block *) malloc(sizeof(struct hostent_block) + (hp->h_length + sizeof(char *)) * count)) == 0) { fprintf(stderr, "Sorry, out of memory\n"); exit(1); } memset((char *) &hb->host, 0, sizeof(hb->host)); hb->host.h_length = hp->h_length; hb->host.h_addr_list = hb->addr_list; hb->host.h_addr_list[count] = 0; data = (char *) (hb->host.h_addr_list + count + 1); for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { hb->host.h_addr_list[count] = data + hp->h_length * count; memcpy(hb->host.h_addr_list[count], addr, hp->h_length); } return (&hb->host); } #endif /* find_inet_addr - find all addresses for this host, result to free() */ #ifdef INET6 -struct addrinfo *find_inet_addr(host) -char *host; +struct addrinfo *find_inet_addr(char *host) { struct addrinfo hints, *res; memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if (getaddrinfo(host, NULL, &hints, &res) == 0) return (res); memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_CANONNAME; if (getaddrinfo(host, NULL, &hints, &res) != 0) { tcpd_warn("%s: host not found", host); return (0); } if (res->ai_family != AF_INET6 && res->ai_family != AF_INET) { tcpd_warn("%d: not an internet host", res->ai_family); freeaddrinfo(res); return (0); } if (!res->ai_canonname) { tcpd_warn("%s: hostname alias", host); tcpd_warn("(cannot obtain official name)", res->ai_canonname); } else if (STR_NE(host, res->ai_canonname)) { tcpd_warn("%s: hostname alias", host); tcpd_warn("(official name: %.*s)", STRING_LENGTH, res->ai_canonname); } return (res); } #else -struct hostent *find_inet_addr(host) -char *host; +struct hostent *find_inet_addr(char *host) { struct in_addr addr; struct hostent *hp; static struct hostent h; static char *addr_list[2]; /* * Host address: translate it to internal form. */ if ((addr.s_addr = dot_quad_addr(host)) != INADDR_NONE) { h.h_addr_list = addr_list; h.h_addr_list[0] = (char *) &addr; h.h_length = sizeof(addr); return (dup_hostent(&h)); } /* * Map host name to a series of addresses. Watch out for non-internet * forms or aliases. The NOT_INADDR() is here in case gethostbyname() has * been "enhanced" to accept numeric addresses. Make a copy of the * address list so that later gethostbyXXX() calls will not clobber it. */ if (NOT_INADDR(host) == 0) { tcpd_warn("%s: not an internet address", host); return (0); } if ((hp = gethostbyname(host)) == 0) { tcpd_warn("%s: host not found", host); return (0); } if (hp->h_addrtype != AF_INET) { tcpd_warn("%d: not an internet host", hp->h_addrtype); return (0); } if (STR_NE(host, hp->h_name)) { tcpd_warn("%s: hostname alias", host); tcpd_warn("(official name: %.*s)", STRING_LENGTH, hp->h_name); } return (dup_hostent(hp)); } #endif /* check_dns - give each address thorough workout, return address count */ -int check_dns(host) -char *host; +int check_dns(char *host) { struct request_info request; #ifdef INET6 struct sockaddr_storage sin; struct addrinfo *hp, *res; #else struct sockaddr_in sin; struct hostent *hp; #endif int count; char *addr; if ((hp = find_inet_addr(host)) == 0) return (0); request_init(&request, RQ_CLIENT_SIN, &sin, 0); sock_methods(&request); #ifndef INET6 memset((char *) &sin, 0, sizeof(sin)); sin.sin_family = AF_INET; #endif #ifdef INET6 for (res = hp, count = 0; res; res = res->ai_next, count++) { memcpy(&sin, res->ai_addr, res->ai_addrlen); #else for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { memcpy((char *) &sin.sin_addr, addr, sizeof(sin.sin_addr)); #endif /* * Force host name and address conversions. Use the request structure * as a cache. Detect hostname lookup problems. Any name/name or * name/address conflicts will be reported while eval_hostname() does * its job. */ request_set(&request, RQ_CLIENT_ADDR, "", RQ_CLIENT_NAME, "", 0); if (STR_EQ(eval_hostname(request.client), unknown)) tcpd_warn("host address %s->name lookup failed", eval_hostaddr(request.client)); } #ifdef INET6 freeaddrinfo(hp); #else free((char *) hp); #endif return (count); } /* dummy function to intercept the real shell_cmd() */ /* ARGSUSED */ -void shell_cmd(command) -char *command; +void shell_cmd(char *command) { if (hosts_access_verbose) printf("command: %s", command); } /* dummy function to intercept the real clean_exit() */ /* ARGSUSED */ -void clean_exit(request) -struct request_info *request; +void clean_exit(struct request_info *request) { exit(0); } /* check_path - examine accessibility */ -int check_path(path, st) -char *path; -struct stat *st; +int check_path(char *path, struct stat *st) { struct stat stbuf; char buf[BUFSIZ]; if (stat(path, st) < 0) return (-1); #ifdef notdef if (st->st_uid != 0) tcpd_warn("%s: not owned by root", path); if (st->st_mode & 020) tcpd_warn("%s: group writable", path); #endif if (st->st_mode & 002) tcpd_warn("%s: world writable", path); if (path[0] == '/' && path[1] != 0) { strrchr(strcpy(buf, path), '/')[0] = 0; (void) check_path(buf[0] ? buf : "/", &stbuf); } return (0); } diff --git a/contrib/tcp_wrappers/setenv.c b/contrib/tcp_wrappers/setenv.c index 03c706280c64..6f5720d3a849 100644 --- a/contrib/tcp_wrappers/setenv.c +++ b/contrib/tcp_wrappers/setenv.c @@ -1,34 +1,31 @@ /* * Some systems do not have setenv(). This one is modeled after 4.4 BSD, but * is implemented in terms of portable primitives only: getenv(), putenv() * and malloc(). It should therefore be safe to use on every UNIX system. * * If clobber == 0, do not overwrite an existing variable. * * Returns nonzero if memory allocation fails. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) setenv.c 1.1 93/03/07 22:47:58"; #endif /* setenv - update or insert environment (name,value) pair */ -int setenv(name, value, clobber) -char *name; -char *value; -int clobber; +int setenv(char *name, char *value, int clobber) { char *malloc(); char *getenv(); char *cp; if (clobber == 0 && getenv(name) != 0) return (0); if ((cp = malloc(strlen(name) + strlen(value) + 2)) == 0) return (1); sprintf(cp, "%s=%s", name, value); return (putenv(cp)); } diff --git a/contrib/tcp_wrappers/shell_cmd.c b/contrib/tcp_wrappers/shell_cmd.c index 917a0443fe13..446f25466fdf 100644 --- a/contrib/tcp_wrappers/shell_cmd.c +++ b/contrib/tcp_wrappers/shell_cmd.c @@ -1,94 +1,93 @@ /* * shell_cmd() takes a shell command after % substitutions. The * command is executed by a /bin/sh child process, with standard input, * standard output and standard error connected to /dev/null. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #include extern void exit(); /* Local stuff. */ #include "tcpd.h" /* Forward declarations. */ static void do_child(char *command); /* shell_cmd - execute shell command */ -void shell_cmd(command) -char *command; +void shell_cmd(char *command) { int child_pid; int wait_pid; /* * Most of the work is done within the child process, to minimize the * risk of damage to the parent. */ switch (child_pid = fork()) { case -1: /* error */ tcpd_warn("cannot fork: %m"); break; case 00: /* child */ do_child(command); /* NOTREACHED */ default: /* parent */ while ((wait_pid = wait((int *) 0)) != -1 && wait_pid != child_pid) /* void */ ; } } /* do_child - exec command with { stdin, stdout, stderr } to /dev/null */ static void do_child(char *command) { char *error; int tmp_fd; /* * Systems with POSIX sessions may send a SIGHUP to grandchildren if the * child exits first. This is sick, sessions were invented for terminals. */ signal(SIGHUP, SIG_IGN); /* Set up new stdin, stdout, stderr, and exec the shell command. */ for (tmp_fd = 0; tmp_fd < 3; tmp_fd++) (void) close(tmp_fd); if (open("/dev/null", 2) != 0) { error = "open /dev/null: %m"; } else if (dup(0) != 1 || dup(0) != 2) { error = "dup: %m"; } else { (void) execl("/bin/sh", "sh", "-c", command, (char *) 0); error = "execl /bin/sh: %m"; } /* Something went wrong. We MUST terminate the child process. */ tcpd_warn(error); _exit(0); } diff --git a/contrib/tcp_wrappers/socket.c b/contrib/tcp_wrappers/socket.c index 51a6fcee4b9a..e98e6772ad72 100644 --- a/contrib/tcp_wrappers/socket.c +++ b/contrib/tcp_wrappers/socket.c @@ -1,425 +1,421 @@ /* * This module determines the type of socket (datagram, stream), the client * socket address and port, the server socket address and port. In addition, * it provides methods to map a transport address to a printable host name * or address. Socket address information results are in static memory. * * The result from the hostname lookup method is STRING_PARANOID when a host * pretends to have someone elses name, or when a host name is available but * could not be verified. * * When lookup or conversion fails the result is set to STRING_UNKNOWN. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #ifndef INET6 extern char *inet_ntoa(); #endif /* Local stuff. */ #include "tcpd.h" /* Forward declarations. */ static void sock_sink(int); #ifdef APPEND_DOT /* * Speed up DNS lookups by terminating the host name with a dot. Should be * done with care. The speedup can give problems with lookups from sources * that lack DNS-style trailing dot magic, such as local files or NIS maps. */ -static struct hostent *gethostbyname_dot(name) -char *name; +static struct hostent *gethostbyname_dot(char *name) { char dot_name[MAXHOSTNAMELEN + 1]; /* * Don't append dots to unqualified names. Such names are likely to come * from local hosts files or from NIS. */ if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) { return (gethostbyname(name)); } else { sprintf(dot_name, "%s.", name); return (gethostbyname(dot_name)); } } #define gethostbyname gethostbyname_dot #endif /* sock_host - look up endpoint addresses and install conversion methods */ -void sock_host(request) -struct request_info *request; +void sock_host(struct request_info *request) { #ifdef INET6 static struct sockaddr_storage client; static struct sockaddr_storage server; #else static struct sockaddr_in client; static struct sockaddr_in server; #endif int len; char buf[BUFSIZ]; int fd = request->fd; sock_methods(request); /* * Look up the client host address. Hal R. Brand * suggested how to get the client host info in case of UDP connections: * peek at the first message without actually looking at its contents. We * really should verify that client.sin_family gets the value AF_INET, * but this program has already caused too much grief on systems with * broken library code. */ len = sizeof(client); if (getpeername(fd, (struct sockaddr *) & client, &len) < 0) { request->sink = sock_sink; len = sizeof(client); if (recvfrom(fd, buf, sizeof(buf), MSG_PEEK, (struct sockaddr *) & client, &len) < 0) { tcpd_warn("can't get client address: %m"); return; /* give up */ } #ifdef really_paranoid memset(buf, 0, sizeof(buf)); #endif } #ifdef INET6 request->client->sin = (struct sockaddr *)&client; #else request->client->sin = &client; #endif /* * Determine the server binding. This is used for client username * lookups, and for access control rules that trigger on the server * address or name. */ len = sizeof(server); if (getsockname(fd, (struct sockaddr *) & server, &len) < 0) { tcpd_warn("getsockname: %m"); return; } #ifdef INET6 request->server->sin = (struct sockaddr *)&server; #else request->server->sin = &server; #endif } /* sock_hostaddr - map endpoint address to printable form */ -void sock_hostaddr(host) -struct host_info *host; +void sock_hostaddr(struct host_info *host) { #ifdef INET6 struct sockaddr *sin = host->sin; int salen; if (!sin) return; #ifdef SIN6_LEN salen = sin->sa_len; #else salen = (sin->sa_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6); #endif getnameinfo(sin, salen, host->addr, sizeof(host->addr), NULL, 0, NI_NUMERICHOST); #else struct sockaddr_in *sin = host->sin; if (sin != 0) STRN_CPY(host->addr, inet_ntoa(sin->sin_addr), sizeof(host->addr)); #endif } /* sock_hostname - map endpoint address to host name */ -void sock_hostname(host) -struct host_info *host; +void sock_hostname(struct host_info *host) { #ifdef INET6 struct sockaddr *sin = host->sin; struct sockaddr_in sin4; struct addrinfo hints, *res, *res0 = NULL; int salen, alen, err = 1; char *ap = NULL, *rap, hname[NI_MAXHOST]; if (sin != NULL) { if (sin->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sin; if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { memset(&sin4, 0, sizeof(sin4)); #ifdef SIN6_LEN sin4.sin_len = sizeof(sin4); #endif sin4.sin_family = AF_INET; sin4.sin_port = sin6->sin6_port; sin4.sin_addr.s_addr = *(u_int32_t *)&sin6->sin6_addr.s6_addr[12]; sin = (struct sockaddr *)&sin4; } } switch (sin->sa_family) { case AF_INET: ap = (char *)&((struct sockaddr_in *)sin)->sin_addr; alen = sizeof(struct in_addr); salen = sizeof(struct sockaddr_in); break; case AF_INET6: ap = (char *)&((struct sockaddr_in6 *)sin)->sin6_addr; alen = sizeof(struct in6_addr); salen = sizeof(struct sockaddr_in6); break; default: break; } if (ap) err = getnameinfo(sin, salen, hname, sizeof(hname), NULL, 0, NI_NAMEREQD); } if (!err) { STRN_CPY(host->name, hname, sizeof(host->name)); /* reject numeric addresses */ memset(&hints, 0, sizeof(hints)); hints.ai_family = sin->sa_family; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST; if ((err = getaddrinfo(host->name, NULL, &hints, &res0)) == 0) { freeaddrinfo(res0); tcpd_warn("host name/name mismatch: " "reverse lookup results in non-FQDN %s", host->name); strcpy(host->name, paranoid); /* name is bad, clobber it */ } err = !err; } if (!err) { /* we are now sure that this is non-numeric */ /* * Verify that the address is a member of the address list returned * by gethostbyname(hostname). * * Verify also that gethostbyaddr() and gethostbyname() return the same * hostname, or rshd and rlogind may still end up being spoofed. * * On some sites, gethostbyname("localhost") returns "localhost.domain". * This is a DNS artefact. We treat it as a special case. When we * can't believe the address list from gethostbyname("localhost") * we're in big trouble anyway. */ memset(&hints, 0, sizeof(hints)); hints.ai_family = sin->sa_family; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_CANONNAME; if (getaddrinfo(host->name, NULL, &hints, &res0) != 0) { /* * Unable to verify that the host name matches the address. This * may be a transient problem or a botched name server setup. */ tcpd_warn("can't verify hostname: getaddrinfo(%s, %s) failed", host->name, (sin->sa_family == AF_INET) ? "AF_INET" : "AF_INET6"); } else if ((res0->ai_canonname == NULL || STR_NE(host->name, res0->ai_canonname)) && STR_NE(host->name, "localhost")) { /* * The gethostbyaddr() and gethostbyname() calls did not return * the same hostname. This could be a nameserver configuration * problem. It could also be that someone is trying to spoof us. */ tcpd_warn("host name/name mismatch: %s != %.*s", host->name, STRING_LENGTH, (res0->ai_canonname == NULL) ? "" : res0->ai_canonname); } else { /* * The address should be a member of the address list returned by * gethostbyname(). We should first verify that the h_addrtype * field is AF_INET, but this program has already caused too much * grief on systems with broken library code. */ for (res = res0; res; res = res->ai_next) { if (res->ai_family != sin->sa_family) continue; switch (res->ai_family) { case AF_INET: rap = (char *)&((struct sockaddr_in *)res->ai_addr)->sin_addr; break; case AF_INET6: /* need to check scope_id */ if (((struct sockaddr_in6 *)sin)->sin6_scope_id != ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id) { continue; } rap = (char *)&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr; break; default: continue; } if (memcmp(rap, ap, alen) == 0) { freeaddrinfo(res0); return; /* name is good, keep it */ } } /* * The host name does not map to the initial address. Perhaps * someone has messed up. Perhaps someone compromised a name * server. */ getnameinfo(sin, salen, hname, sizeof(hname), NULL, 0, NI_NUMERICHOST); tcpd_warn("host name/address mismatch: %s != %.*s", hname, STRING_LENGTH, (res0->ai_canonname == NULL) ? "" : res0->ai_canonname); } strcpy(host->name, paranoid); /* name is bad, clobber it */ if (res0) freeaddrinfo(res0); } #else /* INET6 */ struct sockaddr_in *sin = host->sin; struct hostent *hp; int i; /* * On some systems, for example Solaris 2.3, gethostbyaddr(0.0.0.0) does * not fail. Instead it returns "INADDR_ANY". Unfortunately, this does * not work the other way around: gethostbyname("INADDR_ANY") fails. We * have to special-case 0.0.0.0, in order to avoid false alerts from the * host name/address checking code below. */ if (sin != 0 && sin->sin_addr.s_addr != 0 && (hp = gethostbyaddr((char *) &(sin->sin_addr), sizeof(sin->sin_addr), AF_INET)) != 0) { STRN_CPY(host->name, hp->h_name, sizeof(host->name)); /* * Verify that the address is a member of the address list returned * by gethostbyname(hostname). * * Verify also that gethostbyaddr() and gethostbyname() return the same * hostname, or rshd and rlogind may still end up being spoofed. * * On some sites, gethostbyname("localhost") returns "localhost.domain". * This is a DNS artefact. We treat it as a special case. When we * can't believe the address list from gethostbyname("localhost") * we're in big trouble anyway. */ if ((hp = gethostbyname(host->name)) == 0) { /* * Unable to verify that the host name matches the address. This * may be a transient problem or a botched name server setup. */ tcpd_warn("can't verify hostname: gethostbyname(%s) failed", host->name); } else if (STR_NE(host->name, hp->h_name) && STR_NE(host->name, "localhost")) { /* * The gethostbyaddr() and gethostbyname() calls did not return * the same hostname. This could be a nameserver configuration * problem. It could also be that someone is trying to spoof us. */ tcpd_warn("host name/name mismatch: %s != %.*s", host->name, STRING_LENGTH, hp->h_name); } else { /* * The address should be a member of the address list returned by * gethostbyname(). We should first verify that the h_addrtype * field is AF_INET, but this program has already caused too much * grief on systems with broken library code. */ for (i = 0; hp->h_addr_list[i]; i++) { if (memcmp(hp->h_addr_list[i], (char *) &sin->sin_addr, sizeof(sin->sin_addr)) == 0) return; /* name is good, keep it */ } /* * The host name does not map to the initial address. Perhaps * someone has messed up. Perhaps someone compromised a name * server. */ tcpd_warn("host name/address mismatch: %s != %.*s", inet_ntoa(sin->sin_addr), STRING_LENGTH, hp->h_name); } strcpy(host->name, paranoid); /* name is bad, clobber it */ } #endif /* INET6 */ } /* sock_sink - absorb unreceived IP datagram */ static void sock_sink(int fd) { char buf[BUFSIZ]; #ifdef INET6 struct sockaddr_storage sin; #else struct sockaddr_in sin; #endif int size = sizeof(sin); /* * Eat up the not-yet received datagram. Some systems insist on a * non-zero source address argument in the recvfrom() call below. */ (void) recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *) & sin, &size); } diff --git a/contrib/tcp_wrappers/strcasecmp.c b/contrib/tcp_wrappers/strcasecmp.c index a54e82816171..c14407b4aea7 100644 --- a/contrib/tcp_wrappers/strcasecmp.c +++ b/contrib/tcp_wrappers/strcasecmp.c @@ -1,94 +1,91 @@ /* * Copyright (c) 1987 Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted * provided that the above copyright notice and this paragraph are * duplicated in all such forms and that any documentation, * advertising materials, and other materials related to such * distribution and use acknowledge that the software was developed * by the University of California, Berkeley. The name of the * University may not be used to endorse or promote products derived * from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcasecmp.c 5.6 (Berkeley) 6/27/88"; #endif /* LIBC_SCCS and not lint */ /* Some environments don't define u_char -- WZV */ #if 0 #include #else typedef unsigned char u_char; #endif /* * This array is designed for mapping upper and lower case letter * together for a case independent comparison. The mappings are * based upon ascii character sequences. */ static u_char charmap[] = { '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007', '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017', '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027', '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037', '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047', '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057', '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067', '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077', '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147', '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157', '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167', '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137', '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147', '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157', '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167', '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177', '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207', '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217', '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227', '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237', '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247', '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257', '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267', '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277', '\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347', '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357', '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367', '\370', '\371', '\372', '\333', '\334', '\335', '\336', '\337', '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347', '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357', '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367', '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377', }; -strcasecmp(s1, s2) - char *s1, *s2; +strcasecmp(char *s1, char *s2) { register u_char *cm = charmap, *us1 = (u_char *)s1, *us2 = (u_char *)s2; while (cm[*us1] == cm[*us2++]) if (*us1++ == '\0') return(0); return(cm[*us1] - cm[*--us2]); } -strncasecmp(s1, s2, n) - char *s1, *s2; - register int n; +strncasecmp(char *s1, char *s2, register int n) { register u_char *cm = charmap, *us1 = (u_char *)s1, *us2 = (u_char *)s2; while (--n >= 0 && cm[*us1] == cm[*us2++]) if (*us1++ == '\0') return(0); return(n < 0 ? 0 : cm[*us1] - cm[*--us2]); } diff --git a/contrib/tcp_wrappers/tcpd.c b/contrib/tcp_wrappers/tcpd.c index e6352cba9a56..a0ba42f71f86 100644 --- a/contrib/tcp_wrappers/tcpd.c +++ b/contrib/tcp_wrappers/tcpd.c @@ -1,137 +1,135 @@ /* * General front end for stream and datagram IP services. This program logs * the remote host name and then invokes the real daemon. For example, * install as /usr/etc/{tftpd,fingerd,telnetd,ftpd,rlogind,rshd,rexecd}, * after saving the real daemons in the directory specified with the * REAL_DAEMON_DIR macro. This arrangement requires that the network daemons * are started by inetd or something similar. Connections and diagnostics * are logged through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) tcpd.c 1.10 96/02/11 17:01:32"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #include #ifndef MAXPATHNAMELEN #define MAXPATHNAMELEN BUFSIZ #endif #ifndef STDIN_FILENO #define STDIN_FILENO 0 #endif /* Local stuff. */ #include "patchlevel.h" #include "tcpd.h" int allow_severity = SEVERITY; /* run-time adjustable */ int deny_severity = LOG_WARNING; /* ditto */ -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { struct request_info request; char path[MAXPATHNAMELEN]; /* Attempt to prevent the creation of world-writable files. */ #ifdef DAEMON_UMASK umask(DAEMON_UMASK); #endif /* * If argv[0] is an absolute path name, ignore REAL_DAEMON_DIR, and strip * argv[0] to its basename. */ if (argv[0][0] == '/') { strlcpy(path, argv[0], sizeof(path)); argv[0] = strrchr(argv[0], '/') + 1; } else { snprintf(path, sizeof(path), "%s/%s", REAL_DAEMON_DIR, argv[0]); } /* * Open a channel to the syslog daemon. Older versions of openlog() * require only two arguments. */ #ifdef LOG_MAIL (void) openlog(argv[0], LOG_PID, FACILITY); #else (void) openlog(argv[0], LOG_PID); #endif /* * Find out the endpoint addresses of this conversation. Host name * lookups and double checks will be done on demand. */ request_init(&request, RQ_DAEMON, argv[0], RQ_FILE, STDIN_FILENO, 0); fromhost(&request); /* * Optionally look up and double check the remote host name. Sites * concerned with security may choose to refuse connections from hosts * that pretend to have someone elses host name. */ #ifdef PARANOID if (STR_EQ(eval_hostname(request.client), paranoid)) refuse(&request); #endif /* * The BSD rlogin and rsh daemons that came out after 4.3 BSD disallow * socket options at the IP level. They do so for a good reason. * Unfortunately, we cannot use this with SunOS 4.1.x because the * getsockopt() system call can panic the system. */ #ifdef KILL_IP_OPTIONS fix_options(&request); #endif /* * Check whether this host can access the service in argv[0]. The * access-control code invokes optional shell commands as specified in * the access-control tables. */ #ifdef HOSTS_ACCESS if (!hosts_access(&request)) refuse(&request); #endif /* Report request and invoke the real daemon program. */ #ifdef INET6 syslog(allow_severity, "connect from %s (%s)", eval_client(&request), eval_hostaddr(request.client)); #else syslog(allow_severity, "connect from %s", eval_client(&request)); #endif closelog(); (void) execv(path, argv); syslog(LOG_ERR, "error: cannot execute %s: %m", path); clean_exit(&request); /* NOTREACHED */ } diff --git a/contrib/tcp_wrappers/tcpdchk.c b/contrib/tcp_wrappers/tcpdchk.c index c0bd6c610f77..a59de92edb3d 100644 --- a/contrib/tcp_wrappers/tcpdchk.c +++ b/contrib/tcp_wrappers/tcpdchk.c @@ -1,526 +1,513 @@ /* * tcpdchk - examine all tcpd access control rules and inetd.conf entries * * Usage: tcpdchk [-a] [-d] [-i inet_conf] [-v] * * -a: complain about implicit "allow" at end of rule. * * -d: rules in current directory. * * -i: location of inetd.conf file. * * -v: show all rules. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) tcpdchk.c 1.8 97/02/12 02:13:25"; #endif /* System libraries. */ #include #include #ifdef INET6 #include #endif #include #include #include #include #include #include #include #include #include #include #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif #ifndef S_ISDIR #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif /* Application-specific. */ #include "tcpd.h" #include "inetcf.h" #include "scaffold.h" /* * Stolen from hosts_access.c... */ static char sep[] = ", \t\n"; #define BUFLEN 2048 int resident = 0; int hosts_access_verbose = 0; char *hosts_allow_table = HOSTS_ALLOW; char *hosts_deny_table = HOSTS_DENY; extern jmp_buf tcpd_buf; /* * Local stuff. */ static void usage(void); static void parse_table(char *table, struct request_info *request); static void print_list(char *title, char *list); static void check_daemon_list(char *list); static void check_client_list(char *list); static void check_daemon(char *pat); static void check_user(char *pat); static int check_host(char *pat); static int reserved_name(char *pat); #define PERMIT 1 #define DENY 0 #define YES 1 #define NO 0 static int defl_verdict; static char *myname; static int allow_check; static char *inetcf; -int main(argc, argv) -int argc; -char **argv; +int main(int argc, char **argv) { struct request_info request; struct stat st; int c; myname = argv[0]; /* * Parse the JCL. */ while ((c = getopt(argc, argv, "adi:v")) != EOF) { switch (c) { case 'a': allow_check = 1; break; case 'd': hosts_allow_table = "hosts.allow"; hosts_deny_table = "hosts.deny"; break; case 'i': inetcf = optarg; break; case 'v': hosts_access_verbose++; break; default: usage(); /* NOTREACHED */ } } if (argc != optind) usage(); /* * When confusion really strikes... */ if (check_path(REAL_DAEMON_DIR, &st) < 0) { tcpd_warn("REAL_DAEMON_DIR %s: %m", REAL_DAEMON_DIR); } else if (!S_ISDIR(st.st_mode)) { tcpd_warn("REAL_DAEMON_DIR %s is not a directory", REAL_DAEMON_DIR); } /* * Process the inet configuration file (or its moral equivalent). This * information is used later to find references in hosts.allow/deny to * unwrapped services, and other possible problems. */ inetcf = inet_cfg(inetcf); if (hosts_access_verbose) printf("Using network configuration file: %s\n", inetcf); /* * These are not run from inetd but may have built-in access control. */ inet_set("portmap", WR_NOT); inet_set("rpcbind", WR_NOT); /* * Check accessibility of access control files. */ (void) check_path(hosts_allow_table, &st); (void) check_path(hosts_deny_table, &st); /* * Fake up an arbitrary service request. */ request_init(&request, RQ_DAEMON, "daemon_name", RQ_SERVER_NAME, "server_hostname", RQ_SERVER_ADDR, "server_addr", RQ_USER, "user_name", RQ_CLIENT_NAME, "client_hostname", RQ_CLIENT_ADDR, "client_addr", RQ_FILE, 1, 0); /* * Examine all access-control rules. */ defl_verdict = PERMIT; parse_table(hosts_allow_table, &request); defl_verdict = DENY; parse_table(hosts_deny_table, &request); return (0); } /* usage - explain */ static void usage(void) { fprintf(stderr, "usage: %s [-a] [-d] [-i inet_conf] [-v]\n", myname); fprintf(stderr, " -a: report rules with implicit \"ALLOW\" at end\n"); fprintf(stderr, " -d: use allow/deny files in current directory\n"); fprintf(stderr, " -i: location of inetd.conf file\n"); fprintf(stderr, " -v: list all rules\n"); exit(1); } /* parse_table - like table_match(), but examines _all_ entries */ -static void parse_table(table, request) -char *table; -struct request_info *request; +static void parse_table(char *table, struct request_info *request) { FILE *fp; int real_verdict; char sv_list[BUFLEN]; /* becomes list of daemons */ char *cl_list; /* becomes list of requests */ char *sh_cmd; /* becomes optional shell command */ char buf[BUFSIZ]; int verdict; struct tcpd_context saved_context; saved_context = tcpd_context; /* stupid compilers */ if (fp = fopen(table, "r")) { tcpd_context.file = table; tcpd_context.line = 0; while (xgets(sv_list, sizeof(sv_list), fp)) { if (sv_list[strlen(sv_list) - 1] != '\n') { tcpd_warn("missing newline or line too long"); continue; } if (sv_list[0] == '#' || sv_list[strspn(sv_list, " \t\r\n")] == 0) continue; if ((cl_list = split_at(sv_list, ':')) == 0) { tcpd_warn("missing \":\" separator"); continue; } sh_cmd = split_at(cl_list, ':'); if (hosts_access_verbose) printf("\n>>> Rule %s line %d:\n", tcpd_context.file, tcpd_context.line); if (hosts_access_verbose) print_list("daemons: ", sv_list); check_daemon_list(sv_list); if (hosts_access_verbose) print_list("clients: ", cl_list); check_client_list(cl_list); #ifdef PROCESS_OPTIONS real_verdict = defl_verdict; if (sh_cmd) { verdict = setjmp(tcpd_buf); if (verdict != 0) { real_verdict = (verdict == AC_PERMIT); } else { dry_run = 1; process_options(sh_cmd, request); if (dry_run == 1 && real_verdict && allow_check) tcpd_warn("implicit \"allow\" at end of rule"); } } else if (defl_verdict && allow_check) { tcpd_warn("implicit \"allow\" at end of rule"); } if (hosts_access_verbose) printf("access: %s\n", real_verdict ? "granted" : "denied"); #else if (sh_cmd) shell_cmd(percent_x(buf, sizeof(buf), sh_cmd, request)); if (hosts_access_verbose) printf("access: %s\n", defl_verdict ? "granted" : "denied"); #endif } (void) fclose(fp); } else if (errno != ENOENT) { tcpd_warn("cannot open %s: %m", table); } tcpd_context = saved_context; } /* print_list - pretty-print a list */ -static void print_list(title, list) -char *title; -char *list; +static void print_list(char *title, char *list) { char buf[BUFLEN]; char *cp; char *next; fputs(title, stdout); strcpy(buf, list); for (cp = strtok(buf, sep); cp != 0; cp = next) { fputs(cp, stdout); next = strtok((char *) 0, sep); if (next != 0) fputs(" ", stdout); } fputs("\n", stdout); } /* check_daemon_list - criticize daemon list */ -static void check_daemon_list(list) -char *list; +static void check_daemon_list(char *list) { char buf[BUFLEN]; char *cp; char *host; int daemons = 0; strcpy(buf, list); for (cp = strtok(buf, sep); cp != 0; cp = strtok((char *) 0, sep)) { if (STR_EQ(cp, "EXCEPT")) { daemons = 0; } else { daemons++; if ((host = split_at(cp + 1, '@')) != 0 && check_host(host) > 1) { tcpd_warn("host %s has more than one address", host); tcpd_warn("(consider using an address instead)"); } check_daemon(cp); } } if (daemons == 0) tcpd_warn("daemon list is empty or ends in EXCEPT"); } /* check_client_list - criticize client list */ -static void check_client_list(list) -char *list; +static void check_client_list(char *list) { char buf[BUFLEN]; char *cp; char *host; int clients = 0; strcpy(buf, list); for (cp = strtok(buf, sep); cp != 0; cp = strtok((char *) 0, sep)) { if (STR_EQ(cp, "EXCEPT")) { clients = 0; } else { clients++; if (host = split_at(cp + 1, '@')) { /* user@host */ check_user(cp); check_host(host); } else { check_host(cp); } } } if (clients == 0) tcpd_warn("client list is empty or ends in EXCEPT"); } /* check_daemon - criticize daemon pattern */ -static void check_daemon(pat) -char *pat; +static void check_daemon(char *pat) { if (pat[0] == '@') { tcpd_warn("%s: daemon name begins with \"@\"", pat); } else if (pat[0] == '/') { tcpd_warn("%s: daemon name begins with \"/\"", pat); } else if (pat[0] == '.') { tcpd_warn("%s: daemon name begins with dot", pat); } else if (pat[strlen(pat) - 1] == '.') { tcpd_warn("%s: daemon name ends in dot", pat); } else if (STR_EQ(pat, "ALL") || STR_EQ(pat, unknown)) { /* void */ ; } else if (STR_EQ(pat, "FAIL")) { /* obsolete */ tcpd_warn("FAIL is no longer recognized"); tcpd_warn("(use EXCEPT or DENY instead)"); } else if (reserved_name(pat)) { tcpd_warn("%s: daemon name may be reserved word", pat); } else { switch (inet_get(pat)) { case WR_UNKNOWN: tcpd_warn("%s: no such process name in %s", pat, inetcf); inet_set(pat, WR_YES); /* shut up next time */ break; case WR_NOT: tcpd_warn("%s: service possibly not wrapped", pat); inet_set(pat, WR_YES); break; } } } /* check_user - criticize user pattern */ -static void check_user(pat) -char *pat; +static void check_user(char *pat) { if (pat[0] == '@') { /* @netgroup */ tcpd_warn("%s: user name begins with \"@\"", pat); } else if (pat[0] == '/') { tcpd_warn("%s: user name begins with \"/\"", pat); } else if (pat[0] == '.') { tcpd_warn("%s: user name begins with dot", pat); } else if (pat[strlen(pat) - 1] == '.') { tcpd_warn("%s: user name ends in dot", pat); } else if (STR_EQ(pat, "ALL") || STR_EQ(pat, unknown) || STR_EQ(pat, "KNOWN")) { /* void */ ; } else if (STR_EQ(pat, "FAIL")) { /* obsolete */ tcpd_warn("FAIL is no longer recognized"); tcpd_warn("(use EXCEPT or DENY instead)"); } else if (reserved_name(pat)) { tcpd_warn("%s: user name may be reserved word", pat); } } #ifdef INET6 -static int is_inet6_addr(pat) - char *pat; +static int is_inet6_addr(char *pat) { struct addrinfo hints, *res; int len, ret; char ch; if (*pat != '[') return (0); len = strlen(pat); if ((ch = pat[len - 1]) != ']') return (0); pat[len - 1] = '\0'; memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if ((ret = getaddrinfo(pat + 1, NULL, &hints, &res)) == 0) freeaddrinfo(res); pat[len - 1] = ch; return (ret == 0); } #endif /* check_host - criticize host pattern */ -static int check_host(pat) -char *pat; +static int check_host(char *pat) { char buf[BUFSIZ]; char *mask; int addr_count = 1; FILE *fp; struct tcpd_context saved_context; char *cp; char *wsp = " \t\r\n"; if (pat[0] == '@') { /* @netgroup */ #ifdef NO_NETGRENT /* SCO has no *netgrent() support */ #else #ifdef NETGROUP char *machinep; char *userp; char *domainp; setnetgrent(pat + 1); if (getnetgrent(&machinep, &userp, &domainp) == 0) tcpd_warn("%s: unknown or empty netgroup", pat + 1); endnetgrent(); #else tcpd_warn("netgroup support disabled"); #endif #endif } else if (pat[0] == '/') { /* /path/name */ if ((fp = fopen(pat, "r")) != 0) { saved_context = tcpd_context; tcpd_context.file = pat; tcpd_context.line = 0; while (fgets(buf, sizeof(buf), fp)) { tcpd_context.line++; for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp)) check_host(cp); } tcpd_context = saved_context; fclose(fp); } else if (errno != ENOENT) { tcpd_warn("open %s: %m", pat); } } else if (mask = split_at(pat, '/')) { /* network/netmask */ #ifdef INET6 int mask_len; if ((dot_quad_addr(pat) == INADDR_NONE || dot_quad_addr(mask) == INADDR_NONE) && (!is_inet6_addr(pat) || ((mask_len = atoi(mask)) < 0 || mask_len > 128))) #else if (dot_quad_addr(pat) == INADDR_NONE || dot_quad_addr(mask) == INADDR_NONE) #endif tcpd_warn("%s/%s: bad net/mask pattern", pat, mask); } else if (STR_EQ(pat, "FAIL")) { /* obsolete */ tcpd_warn("FAIL is no longer recognized"); tcpd_warn("(use EXCEPT or DENY instead)"); } else if (reserved_name(pat)) { /* other reserved */ /* void */ ; #ifdef INET6 } else if (is_inet6_addr(pat)) { /* IPv6 address */ addr_count = 1; #endif } else if (NOT_INADDR(pat)) { /* internet name */ if (pat[strlen(pat) - 1] == '.') { tcpd_warn("%s: domain or host name ends in dot", pat); } else if (pat[0] != '.') { addr_count = check_dns(pat); } } else { /* numeric form */ if (STR_EQ(pat, "0.0.0.0") || STR_EQ(pat, "255.255.255.255")) { /* void */ ; } else if (pat[0] == '.') { tcpd_warn("%s: network number begins with dot", pat); } else if (pat[strlen(pat) - 1] != '.') { check_dns(pat); } } return (addr_count); } /* reserved_name - determine if name is reserved */ -static int reserved_name(pat) -char *pat; +static int reserved_name(char *pat) { return (STR_EQ(pat, unknown) || STR_EQ(pat, "KNOWN") || STR_EQ(pat, paranoid) || STR_EQ(pat, "ALL") || STR_EQ(pat, "LOCAL")); } diff --git a/contrib/tcp_wrappers/tcpdmatch.c b/contrib/tcp_wrappers/tcpdmatch.c index 0e77ba4910f5..e549f6e9115d 100644 --- a/contrib/tcp_wrappers/tcpdmatch.c +++ b/contrib/tcp_wrappers/tcpdmatch.c @@ -1,389 +1,382 @@ /* * tcpdmatch - explain what tcpd would do in a specific case * * usage: tcpdmatch [-d] [-i inet_conf] daemon[@host] [user@]host * * -d: use the access control tables in the current directory. * * -i: location of inetd.conf file. * * All errors are reported to the standard error stream, including the errors * that would normally be reported via the syslog daemon. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) tcpdmatch.c 1.5 96/02/11 17:01:36"; #endif /* System libraries. */ #include #include #include #include #include #include #include #include #include #include #include #include #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif #ifndef S_ISDIR #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif /* Application-specific. */ #include "tcpd.h" #include "inetcf.h" #include "scaffold.h" static void usage(char *myname); static void tcpdmatch(struct request_info *request); /* The main program */ -int main(argc, argv) -int argc; -char **argv; +int main(int argc, char **argv) { #ifdef INET6 struct addrinfo hints, *hp, *res; #else struct hostent *hp; #endif char *myname = argv[0]; char *client; char *server; char *addr; char *user; char *daemon; struct request_info request; int ch; char *inetcf = 0; int count; #ifdef INET6 struct sockaddr_storage server_sin; struct sockaddr_storage client_sin; #else struct sockaddr_in server_sin; struct sockaddr_in client_sin; #endif struct stat st; /* * Show what rule actually matched. */ hosts_access_verbose = 2; /* * Parse the JCL. */ while ((ch = getopt(argc, argv, "di:")) != EOF) { switch (ch) { case 'd': hosts_allow_table = "hosts.allow"; hosts_deny_table = "hosts.deny"; break; case 'i': inetcf = optarg; break; default: usage(myname); /* NOTREACHED */ } } if (argc != optind + 2) usage(myname); /* * When confusion really strikes... */ if (check_path(REAL_DAEMON_DIR, &st) < 0) { tcpd_warn("REAL_DAEMON_DIR %s: %m", REAL_DAEMON_DIR); } else if (!S_ISDIR(st.st_mode)) { tcpd_warn("REAL_DAEMON_DIR %s is not a directory", REAL_DAEMON_DIR); } /* * Default is to specify a daemon process name. When daemon@host is * specified, separate the two parts. */ if ((server = split_at(argv[optind], '@')) == 0) server = unknown; if (argv[optind][0] == '/') { daemon = strrchr(argv[optind], '/') + 1; tcpd_warn("%s: daemon name normalized to: %s", argv[optind], daemon); } else { daemon = argv[optind]; } /* * Default is to specify a client hostname or address. When user@host is * specified, separate the two parts. */ if ((client = split_at(argv[optind + 1], '@')) != 0) { user = argv[optind + 1]; } else { client = argv[optind + 1]; user = unknown; } /* * Analyze the inetd (or tlid) configuration file, so that we can warn * the user about services that may not be wrapped, services that are not * configured, or services that are wrapped in an incorrect manner. Allow * for services that are not run from inetd, or that have tcpd access * control built into them. */ inetcf = inet_cfg(inetcf); inet_set("portmap", WR_NOT); inet_set("rpcbind", WR_NOT); switch (inet_get(daemon)) { case WR_UNKNOWN: tcpd_warn("%s: no such process name in %s", daemon, inetcf); break; case WR_NOT: tcpd_warn("%s: service possibly not wrapped", daemon); break; } /* * Check accessibility of access control files. */ (void) check_path(hosts_allow_table, &st); (void) check_path(hosts_deny_table, &st); /* * Fill in what we have figured out sofar. Use socket and DNS routines * for address and name conversions. We attach stdout to the request so * that banner messages will become visible. */ request_init(&request, RQ_DAEMON, daemon, RQ_USER, user, RQ_FILE, 1, 0); sock_methods(&request); /* * If a server hostname is specified, insist that the name maps to at * most one address. eval_hostname() warns the user about name server * problems, while using the request.server structure as a cache for host * address and name conversion results. */ if (NOT_INADDR(server) == 0 || HOSTNAME_KNOWN(server)) { if ((hp = find_inet_addr(server)) == 0) exit(1); #ifndef INET6 memset((char *) &server_sin, 0, sizeof(server_sin)); server_sin.sin_family = AF_INET; #endif request_set(&request, RQ_SERVER_SIN, &server_sin, 0); #ifdef INET6 for (res = hp, count = 0; res; res = res->ai_next, count++) { memcpy(&server_sin, res->ai_addr, res->ai_addrlen); #else for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { memcpy((char *) &server_sin.sin_addr, addr, sizeof(server_sin.sin_addr)); #endif /* * Force evaluation of server host name and address. Host name * conflicts will be reported while eval_hostname() does its job. */ request_set(&request, RQ_SERVER_NAME, "", RQ_SERVER_ADDR, "", 0); if (STR_EQ(eval_hostname(request.server), unknown)) tcpd_warn("host address %s->name lookup failed", eval_hostaddr(request.server)); } if (count > 1) { fprintf(stderr, "Error: %s has more than one address\n", server); fprintf(stderr, "Please specify an address instead\n"); exit(1); } #ifdef INET6 freeaddrinfo(hp); #else free((char *) hp); #endif } else { request_set(&request, RQ_SERVER_NAME, server, 0); } /* * If a client address is specified, we simulate the effect of client * hostname lookup failure. */ if (dot_quad_addr(client) != INADDR_NONE) { request_set(&request, RQ_CLIENT_ADDR, client, 0); tcpdmatch(&request); exit(0); } #ifdef INET6 memset(&hints, 0, sizeof(hints)); hints.ai_family = AF_INET6; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if (getaddrinfo(client, NULL, &hints, &res) == 0) { freeaddrinfo(res); request_set(&request, RQ_CLIENT_ADDR, client, 0); tcpdmatch(&request); exit(0); } #endif /* * Perhaps they are testing special client hostname patterns that aren't * really host names at all. */ if (NOT_INADDR(client) && HOSTNAME_KNOWN(client) == 0) { request_set(&request, RQ_CLIENT_NAME, client, 0); tcpdmatch(&request); exit(0); } /* * Otherwise, assume that a client hostname is specified, and insist that * the address can be looked up. The reason for this requirement is that * in real life the client address is available (at least with IP). Let * eval_hostname() figure out if this host is properly registered, while * using the request.client structure as a cache for host name and * address conversion results. */ if ((hp = find_inet_addr(client)) == 0) exit(1); #ifdef INET6 request_set(&request, RQ_CLIENT_SIN, &client_sin, 0); for (res = hp, count = 0; res; res = res->ai_next, count++) { memcpy(&client_sin, res->ai_addr, res->ai_addrlen); /* * getnameinfo() doesn't do reverse lookup against link-local * address. So, we pass through host name evaluation against * such addresses. */ if (res->ai_family != AF_INET6 || !IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6 *)res->ai_addr)->sin6_addr)) { /* * Force evaluation of client host name and address. Host name * conflicts will be reported while eval_hostname() does its job. */ request_set(&request, RQ_CLIENT_NAME, "", RQ_CLIENT_ADDR, "", 0); if (STR_EQ(eval_hostname(request.client), unknown)) tcpd_warn("host address %s->name lookup failed", eval_hostaddr(request.client)); } tcpdmatch(&request); if (res->ai_next) printf("\n"); } freeaddrinfo(hp); #else memset((char *) &client_sin, 0, sizeof(client_sin)); client_sin.sin_family = AF_INET; request_set(&request, RQ_CLIENT_SIN, &client_sin, 0); for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { memcpy((char *) &client_sin.sin_addr, addr, sizeof(client_sin.sin_addr)); /* * Force evaluation of client host name and address. Host name * conflicts will be reported while eval_hostname() does its job. */ request_set(&request, RQ_CLIENT_NAME, "", RQ_CLIENT_ADDR, "", 0); if (STR_EQ(eval_hostname(request.client), unknown)) tcpd_warn("host address %s->name lookup failed", eval_hostaddr(request.client)); tcpdmatch(&request); if (hp->h_addr_list[count + 1]) printf("\n"); } free((char *) hp); #endif exit(0); } /* Explain how to use this program */ -static void usage(myname) -char *myname; +static void usage(char *myname) { fprintf(stderr, "usage: %s [-d] [-i inet_conf] daemon[@host] [user@]host\n", myname); fprintf(stderr, " -d: use allow/deny files in current directory\n"); fprintf(stderr, " -i: location of inetd.conf file\n"); exit(1); } /* Print interesting expansions */ -static void expand(text, pattern, request) -char *text; -char *pattern; -struct request_info *request; +static void expand(char *text, char *pattern, struct request_info *request) { char buf[BUFSIZ]; if (STR_NE(percent_x(buf, sizeof(buf), pattern, request), unknown)) printf("%s %s\n", text, buf); } /* Try out a (server,client) pair */ -static void tcpdmatch(request) -struct request_info *request; +static void tcpdmatch(struct request_info *request) { int verdict; /* * Show what we really know. Suppress uninteresting noise. */ expand("client: hostname", "%n", request); expand("client: address ", "%a", request); expand("client: username", "%u", request); expand("server: hostname", "%N", request); expand("server: address ", "%A", request); expand("server: process ", "%d", request); /* * Reset stuff that might be changed by options handlers. In dry-run * mode, extension language routines that would not return should inform * us of their plan, by clearing the dry_run flag. This is a bit clumsy * but we must be able to verify hosts with more than one network * address. */ rfc931_timeout = RFC931_TIMEOUT; allow_severity = SEVERITY; deny_severity = LOG_WARNING; dry_run = 1; /* * When paranoid mode is enabled, access is rejected no matter what the * access control rules say. */ #ifdef PARANOID if (STR_EQ(eval_hostname(request->client), paranoid)) { printf("access: denied (PARANOID mode)\n\n"); return; } #endif /* * Report the access control verdict. */ verdict = hosts_access(request); printf("access: %s\n", dry_run == 0 ? "delegated" : verdict ? "granted" : "denied"); } diff --git a/contrib/tcp_wrappers/tli-sequent.c b/contrib/tcp_wrappers/tli-sequent.c index c0ad75685f4c..e75a01f2723f 100644 --- a/contrib/tcp_wrappers/tli-sequent.c +++ b/contrib/tcp_wrappers/tli-sequent.c @@ -1,192 +1,190 @@ /* * Warning - this relies heavily on the TLI implementation in PTX 2.X and will * probably not work under PTX 4. * * Author: Tim Wright, Sequent Computer Systems Ltd., UK. * * Modified slightly to conform to the new internal interfaces - Wietse */ #ifndef lint static char sccsid[] = "@(#) tli-sequent.c 1.1 94/12/28 17:42:51"; #endif #ifdef TLI_SEQUENT /* System libraries. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include extern char *sys_errlist[]; extern int sys_nerr; extern int t_errno; extern char *t_errlist[]; extern int t_nerr; /* Local stuff. */ #include "tcpd.h" #include "tli-sequent.h" /* Forward declarations. */ static char *tli_error(); static void tli_sink(); /* tli_host - determine endpoint info */ -int tli_host(request) -struct request_info *request; +int tli_host(struct request_info *request) { static struct sockaddr_in client; static struct sockaddr_in server; struct _ti_user *tli_state_ptr; union T_primitives *TSI_prim_ptr; struct strpeek peek; int len; /* * Use DNS and socket routines for name and address conversions. */ sock_methods(request); /* * Find out the client address using getpeerinaddr(). This call is the * TLI equivalent to getpeername() under Dynix/ptx. */ len = sizeof(client); t_sync(request->fd); if (getpeerinaddr(request->fd, &client, len) < 0) { tcpd_warn("can't get client address: %s", tli_error()); return; } request->client->sin = &client; /* Call TLI utility routine to get information on endpoint */ if ((tli_state_ptr = _t_checkfd(request->fd)) == NULL) return; if (tli_state_ptr->ti_servtype == T_CLTS) { /* UDP - may need to get address the hard way */ if (client.sin_addr.s_addr == 0) { /* The UDP endpoint is not connected so we didn't get the */ /* remote address - get it the hard way ! */ /* Look at the control part of the top message on the stream */ /* we don't want to remove it from the stream so we use I_PEEK */ peek.ctlbuf.maxlen = tli_state_ptr->ti_ctlsize; peek.ctlbuf.len = 0; peek.ctlbuf.buf = tli_state_ptr->ti_ctlbuf; /* Don't even look at the data */ peek.databuf.maxlen = -1; peek.databuf.len = 0; peek.databuf.buf = 0; peek.flags = 0; switch (ioctl(request->fd, I_PEEK, &peek)) { case -1: tcpd_warn("can't peek at endpoint: %s", tli_error()); return; case 0: /* No control part - we're hosed */ tcpd_warn("can't get UDP info: %s", tli_error()); return; default: /* FALL THROUGH */ ; } /* Can we even check the PRIM_type ? */ if (peek.ctlbuf.len < sizeof(long)) { tcpd_warn("UDP control info garbage"); return; } TSI_prim_ptr = (union T_primitives *) peek.ctlbuf.buf; if (TSI_prim_ptr->type != T_UNITDATA_IND) { tcpd_warn("wrong type for UDP control info"); return; } /* Validate returned unitdata indication packet */ if ((peek.ctlbuf.len < sizeof(struct T_unitdata_ind)) || ((TSI_prim_ptr->unitdata_ind.OPT_length != 0) && (peek.ctlbuf.len < TSI_prim_ptr->unitdata_ind.OPT_length + TSI_prim_ptr->unitdata_ind.OPT_offset))) { tcpd_warn("UDP control info garbaged"); return; } /* Extract the address */ memcpy(&client, peek.ctlbuf.buf + TSI_prim_ptr->unitdata_ind.SRC_offset, TSI_prim_ptr->unitdata_ind.SRC_length); } request->sink = tli_sink; } if (getmyinaddr(request->fd, &server, len) < 0) tcpd_warn("can't get local address: %s", tli_error()); else request->server->sin = &server; } /* tli_error - convert tli error number to text */ -static char *tli_error() +static char *tli_error(void) { static char buf[40]; if (t_errno != TSYSERR) { if (t_errno < 0 || t_errno >= t_nerr) { sprintf(buf, "Unknown TLI error %d", t_errno); return (buf); } else { return (t_errlist[t_errno]); } } else { if (errno < 0 || errno >= sys_nerr) { sprintf(buf, "Unknown UNIX error %d", errno); return (buf); } else { return (sys_errlist[errno]); } } } /* tli_sink - absorb unreceived datagram */ -static void tli_sink(fd) -int fd; +static void tli_sink(int fd) { struct t_unitdata *unit; int flags; /* * Something went wrong. Absorb the datagram to keep inetd from looping. * Allocate storage for address, control and data. If that fails, sleep * for a couple of seconds in an attempt to keep inetd from looping too * fast. */ if ((unit = (struct t_unitdata *) t_alloc(fd, T_UNITDATA, T_ALL)) == 0) { tcpd_warn("t_alloc: %s", tli_error()); sleep(5); } else { (void) t_rcvudata(fd, unit, &flags); t_free((void *) unit, T_UNITDATA); } } #endif /* TLI_SEQUENT */ diff --git a/contrib/tcp_wrappers/tli.c b/contrib/tcp_wrappers/tli.c index d05f1156b0fb..f362004f9f58 100644 --- a/contrib/tcp_wrappers/tli.c +++ b/contrib/tcp_wrappers/tli.c @@ -1,371 +1,365 @@ /* * tli_host() determines the type of transport (connected, connectionless), * the transport address of a client host, and the transport address of a * server endpoint. In addition, it provides methods to map a transport * address to a printable host name or address. Socket address results are * in static memory; tli structures are allocated from the heap. * * The result from the hostname lookup method is STRING_PARANOID when a host * pretends to have someone elses name, or when a host name is available but * could not be verified. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) tli.c 1.15 97/03/21 19:27:25"; #endif #ifdef TLI /* System libraries. */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include extern char *nc_sperror(); extern char *sys_errlist[]; extern int sys_nerr; extern int t_errno; extern char *t_errlist[]; extern int t_nerr; /* Local stuff. */ #include "tcpd.h" /* Forward declarations. */ static void tli_endpoints(); static struct netconfig *tli_transport(); static void tli_hostname(); static void tli_hostaddr(); static void tli_cleanup(); static char *tli_error(); static void tli_sink(); /* tli_host - look up endpoint addresses and install conversion methods */ -void tli_host(request) -struct request_info *request; +void tli_host(struct request_info *request) { #ifdef INET6 static struct sockaddr_storage client; static struct sockaddr_storage server; #else static struct sockaddr_in client; static struct sockaddr_in server; #endif /* * If we discover that we are using an IP transport, pretend we never * were here. Otherwise, use the transport-independent method and stick * to generic network addresses. XXX hard-coded protocol family name. */ tli_endpoints(request); #ifdef INET6 if ((request->config = tli_transport(request->fd)) != 0 && (STR_EQ(request->config->nc_protofmly, "inet") || STR_EQ(request->config->nc_protofmly, "inet6"))) { #else if ((request->config = tli_transport(request->fd)) != 0 && STR_EQ(request->config->nc_protofmly, "inet")) { #endif if (request->client->unit != 0) { #ifdef INET6 client = *(struct sockaddr_storage *) request->client->unit->addr.buf; request->client->sin = (struct sockaddr *) &client; #else client = *(struct sockaddr_in *) request->client->unit->addr.buf; request->client->sin = &client; #endif } if (request->server->unit != 0) { #ifdef INET6 server = *(struct sockaddr_storage *) request->server->unit->addr.buf; request->server->sin = (struct sockaddr *) &server; #else server = *(struct sockaddr_in *) request->server->unit->addr.buf; request->server->sin = &server; #endif } tli_cleanup(request); sock_methods(request); } else { request->hostname = tli_hostname; request->hostaddr = tli_hostaddr; request->cleanup = tli_cleanup; } } /* tli_cleanup - cleanup some dynamically-allocated data structures */ -static void tli_cleanup(request) -struct request_info *request; +static void tli_cleanup(struct request_info *request) { if (request->config != 0) freenetconfigent(request->config); if (request->client->unit != 0) t_free((char *) request->client->unit, T_UNITDATA); if (request->server->unit != 0) t_free((char *) request->server->unit, T_UNITDATA); } /* tli_endpoints - determine TLI client and server endpoint information */ -static void tli_endpoints(request) -struct request_info *request; +static void tli_endpoints(struct request_info *request) { struct t_unitdata *server; struct t_unitdata *client; int fd = request->fd; int flags; /* * Determine the client endpoint address. With unconnected services, peek * at the sender address of the pending protocol data unit without * popping it off the receive queue. This trick works because only the * address member of the unitdata structure has been allocated. * * Beware of successful returns with zero-length netbufs (for example, * Solaris 2.3 with ticlts transport). The netdir(3) routines can't * handle that. Assume connection-less transport when TI_GETPEERNAME * produces no usable result, even when t_rcvudata() is unable to figure * out the peer address. Better to hang than to loop. */ if ((client = (struct t_unitdata *) t_alloc(fd, T_UNITDATA, T_ADDR)) == 0) { tcpd_warn("t_alloc: %s", tli_error()); return; } if (ioctl(fd, TI_GETPEERNAME, &client->addr) < 0 || client->addr.len == 0) { request->sink = tli_sink; if (t_rcvudata(fd, client, &flags) < 0 || client->addr.len == 0) { tcpd_warn("can't get client address: %s", tli_error()); t_free((void *) client, T_UNITDATA); return; } } request->client->unit = client; /* * Look up the server endpoint address. This can be used for filtering on * server address or name, or to look up the client user. */ if ((server = (struct t_unitdata *) t_alloc(fd, T_UNITDATA, T_ADDR)) == 0) { tcpd_warn("t_alloc: %s", tli_error()); return; } if (ioctl(fd, TI_GETMYNAME, &server->addr) < 0) { tcpd_warn("TI_GETMYNAME: %m"); t_free((void *) server, T_UNITDATA); return; } request->server->unit = server; } /* tli_transport - find out TLI transport type */ static struct netconfig *tli_transport(fd) int fd; { struct stat from_client; struct stat from_config; void *handlep; struct netconfig *config; /* * Assuming that the network device is a clone device, we must compare * the major device number of stdin to the minor device number of the * devices listed in the netconfig table. */ if (fstat(fd, &from_client) != 0) { tcpd_warn("fstat(fd %d): %m", fd); return (0); } if ((handlep = setnetconfig()) == 0) { tcpd_warn("setnetconfig: %m"); return (0); } while (config = getnetconfig(handlep)) { if (stat(config->nc_device, &from_config) == 0) { #ifdef NO_CLONE_DEVICE /* * If the network devices are not cloned (as is the case for * Solaris 8 Beta), we must compare the major device numbers. */ if (major(from_config.st_rdev) == major(from_client.st_rdev)) #else if (minor(from_config.st_rdev) == major(from_client.st_rdev)) #endif break; } } if (config == 0) { tcpd_warn("unable to identify transport protocol"); return (0); } /* * Something else may clobber our getnetconfig() result, so we'd better * acquire our private copy. */ if ((config = getnetconfigent(config->nc_netid)) == 0) { tcpd_warn("getnetconfigent(%s): %s", config->nc_netid, nc_sperror()); return (0); } return (config); } /* tli_hostaddr - map TLI transport address to printable address */ -static void tli_hostaddr(host) -struct host_info *host; +static void tli_hostaddr(struct host_info *host) { struct request_info *request = host->request; struct netconfig *config = request->config; struct t_unitdata *unit = host->unit; char *uaddr; if (config != 0 && unit != 0 && (uaddr = taddr2uaddr(config, &unit->addr)) != 0) { STRN_CPY(host->addr, uaddr, sizeof(host->addr)); free(uaddr); } } /* tli_hostname - map TLI transport address to hostname */ -static void tli_hostname(host) -struct host_info *host; +static void tli_hostname(struct host_info *host) { struct request_info *request = host->request; struct netconfig *config = request->config; struct t_unitdata *unit = host->unit; struct nd_hostservlist *servlist; if (config != 0 && unit != 0 && netdir_getbyaddr(config, &servlist, &unit->addr) == ND_OK) { struct nd_hostserv *service = servlist->h_hostservs; struct nd_addrlist *addr_list; int found = 0; if (netdir_getbyname(config, service, &addr_list) != ND_OK) { /* * Unable to verify that the name matches the address. This may * be a transient problem or a botched name server setup. We * decide to play safe. */ tcpd_warn("can't verify hostname: netdir_getbyname(%.*s) failed", STRING_LENGTH, service->h_host); } else { /* * Look up the host address in the address list we just got. The * comparison is done on the textual representation, because the * transport address is an opaque structure that may have holes * with uninitialized garbage. This approach obviously loses when * the address does not have a textual representation. */ char *uaddr = eval_hostaddr(host); char *ua; int i; for (i = 0; found == 0 && i < addr_list->n_cnt; i++) { if ((ua = taddr2uaddr(config, &(addr_list->n_addrs[i]))) != 0) { found = !strcmp(ua, uaddr); free(ua); } } netdir_free((void *) addr_list, ND_ADDRLIST); /* * When the host name does not map to the initial address, assume * someone has compromised a name server. More likely someone * botched it, but that could be dangerous, too. */ if (found == 0) tcpd_warn("host name/address mismatch: %s != %.*s", host->addr, STRING_LENGTH, service->h_host); } STRN_CPY(host->name, found ? service->h_host : paranoid, sizeof(host->name)); netdir_free((void *) servlist, ND_HOSTSERVLIST); } } /* tli_error - convert tli error number to text */ static char *tli_error() { static char buf[40]; if (t_errno != TSYSERR) { if (t_errno < 0 || t_errno >= t_nerr) { sprintf(buf, "Unknown TLI error %d", t_errno); return (buf); } else { return (t_errlist[t_errno]); } } else { if (errno < 0 || errno >= sys_nerr) { sprintf(buf, "Unknown UNIX error %d", errno); return (buf); } else { return (sys_errlist[errno]); } } } /* tli_sink - absorb unreceived datagram */ -static void tli_sink(fd) -int fd; +static void tli_sink(int fd) { struct t_unitdata *unit; int flags; /* * Something went wrong. Absorb the datagram to keep inetd from looping. * Allocate storage for address, control and data. If that fails, sleep * for a couple of seconds in an attempt to keep inetd from looping too * fast. */ if ((unit = (struct t_unitdata *) t_alloc(fd, T_UNITDATA, T_ALL)) == 0) { tcpd_warn("t_alloc: %s", tli_error()); sleep(5); } else { (void) t_rcvudata(fd, unit, &flags); t_free((void *) unit, T_UNITDATA); } } #endif /* TLI */ diff --git a/contrib/tcp_wrappers/try-from.c b/contrib/tcp_wrappers/try-from.c index 925e144d90b1..dff7b7f7fc9a 100644 --- a/contrib/tcp_wrappers/try-from.c +++ b/contrib/tcp_wrappers/try-from.c @@ -1,85 +1,83 @@ /* * This program can be called via a remote shell command to find out if the * hostname and address are properly recognized, if username lookup works, * and (SysV only) if the TLI on top of IP heuristics work. * * Example: "rsh host /some/where/try-from". * * Diagnostics are reported through syslog(3) and redirected to stderr. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) try-from.c 1.2 94/12/28 17:42:55"; #endif /* System libraries. */ #include #include #include #include #ifdef TLI #include #include #endif #ifndef STDIN_FILENO #define STDIN_FILENO 0 #endif /* Local stuff. */ #include "tcpd.h" int allow_severity = SEVERITY; /* run-time adjustable */ int deny_severity = LOG_WARNING; /* ditto */ -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { struct request_info request; char buf[BUFSIZ]; char *cp; /* * Simplify the process name, just like tcpd would. */ if ((cp = strrchr(argv[0], '/')) != 0) argv[0] = cp + 1; /* * Turn on the "IP-underneath-TLI" detection heuristics. */ #ifdef TLI if (ioctl(0, I_FIND, "timod") == 0) ioctl(0, I_PUSH, "timod"); #endif /* TLI */ /* * Look up the endpoint information. */ request_init(&request, RQ_DAEMON, argv[0], RQ_FILE, STDIN_FILENO, 0); (void) fromhost(&request); /* * Show some results. Name and address information is looked up when we * ask for it. */ #define EXPAND(str) percent_x(buf, sizeof(buf), str, &request) puts(EXPAND("client address (%%a): %a")); puts(EXPAND("client hostname (%%n): %n")); puts(EXPAND("client username (%%u): %u")); puts(EXPAND("client info (%%c): %c")); puts(EXPAND("server address (%%A): %A")); puts(EXPAND("server hostname (%%N): %N")); puts(EXPAND("server process (%%d): %d")); puts(EXPAND("server info (%%s): %s")); return (0); } diff --git a/contrib/tcp_wrappers/update.c b/contrib/tcp_wrappers/update.c index db7375313ad4..b5e517ec738d 100644 --- a/contrib/tcp_wrappers/update.c +++ b/contrib/tcp_wrappers/update.c @@ -1,130 +1,129 @@ /* * Routines for controlled update/initialization of request structures. * * request_init() initializes its argument. Pointers and string-valued members * are initialized to zero, to indicate that no lookup has been attempted. * * request_set() adds information to an already initialized request structure. * * Both functions take a variable-length name-value list. * * Diagnostics are reported through syslog(3). * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56"; #endif /* System libraries */ #include #include #include #include /* Local stuff. */ #include "mystdarg.h" #include "tcpd.h" /* request_fill - request update engine */ -static struct request_info *request_fill(request, ap) -struct request_info *request; -va_list ap; +static struct request_info *request_fill(struct request_info *request, + va_list ap) { int key; char *ptr; while ((key = va_arg(ap, int)) > 0) { switch (key) { default: tcpd_warn("request_fill: invalid key: %d", key); return (request); case RQ_FILE: request->fd = va_arg(ap, int); continue; case RQ_CLIENT_SIN: #ifdef INET6 request->client->sin = va_arg(ap, struct sockaddr *); #else request->client->sin = va_arg(ap, struct sockaddr_in *); #endif continue; case RQ_SERVER_SIN: #ifdef INET6 request->server->sin = va_arg(ap, struct sockaddr *); #else request->server->sin = va_arg(ap, struct sockaddr_in *); #endif continue; /* * All other fields are strings with the same maximal length. */ case RQ_DAEMON: ptr = request->daemon; break; case RQ_USER: ptr = request->user; break; case RQ_CLIENT_NAME: ptr = request->client->name; break; case RQ_CLIENT_ADDR: ptr = request->client->addr; break; case RQ_SERVER_NAME: ptr = request->server->name; break; case RQ_SERVER_ADDR: ptr = request->server->addr; break; } STRN_CPY(ptr, va_arg(ap, char *), STRING_LENGTH); } return (request); } /* request_init - initialize request structure */ struct request_info *VARARGS(request_init, struct request_info *, request) { static struct request_info default_info; struct request_info *r; va_list ap; /* * Initialize data members. We do not assign default function pointer * members, to avoid pulling in the whole socket module when it is not * really needed. */ VASTART(ap, struct request_info *, request); *request = default_info; request->fd = -1; strcpy(request->daemon, unknown); sprintf(request->pid, "%d", getpid()); request->client->request = request; request->server->request = request; r = request_fill(request, ap); VAEND(ap); return (r); } /* request_set - update request structure */ struct request_info *VARARGS(request_set, struct request_info *, request) { struct request_info *r; va_list ap; VASTART(ap, struct request_info *, request); r = request_fill(request, ap); VAEND(ap); return (r); } diff --git a/contrib/tcp_wrappers/vfprintf.c b/contrib/tcp_wrappers/vfprintf.c index d6f37d59bfe8..32e991d72636 100644 --- a/contrib/tcp_wrappers/vfprintf.c +++ b/contrib/tcp_wrappers/vfprintf.c @@ -1,125 +1,120 @@ /* * vfprintf() and vprintf() clones. They will produce unexpected results * when excessive dynamic ("*") field widths are specified. To be used for * testing purposes only. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. */ #ifndef lint static char sccsid[] = "@(#) vfprintf.c 1.2 94/03/23 17:44:46"; #endif #include #include #ifdef __STDC__ #include #else #include #endif /* vfprintf - print variable-length argument list to stream */ -int vfprintf(fp, format, ap) -FILE *fp; -char *format; -va_list ap; +int vfprintf(FILE *fp, char *format, va_list ap) { char fmt[BUFSIZ]; /* format specifier */ register char *fmtp; register char *cp; int count = 0; /* * Iterate over characters in the format string, picking up arguments * when format specifiers are found. */ for (cp = format; *cp; cp++) { if (*cp != '%') { putc(*cp, fp); /* ordinary character */ count++; } else { /* * Format specifiers are handled one at a time, since we can only * deal with arguments one at a time. Try to determine the end of * the format specifier. We do not attempt to fully parse format * strings, since we are ging to let fprintf() do the hard work. * In regular expression notation, we recognize: * * %-?0?([0-9]+|\*)?\.?([0-9]+|\*)?l?[a-z] * * which includes some combinations that do not make sense. */ fmtp = fmt; *fmtp++ = *cp++; if (*cp == '-') /* left-adjusted field? */ *fmtp++ = *cp++; if (*cp == '0') /* zero-padded field? */ *fmtp++ = *cp++; if (*cp == '*') { /* dynamic field witdh */ sprintf(fmtp, "%d", va_arg(ap, int)); fmtp += strlen(fmtp); cp++; } else { while (isdigit(*cp)) /* hard-coded field width */ *fmtp++ = *cp++; } if (*cp == '.') /* width/precision separator */ *fmtp++ = *cp++; if (*cp == '*') { /* dynamic precision */ sprintf(fmtp, "%d", va_arg(ap, int)); fmtp += strlen(fmtp); cp++; } else { while (isdigit(*cp)) /* hard-coded precision */ *fmtp++ = *cp++; } if (*cp == 'l') /* long whatever */ *fmtp++ = *cp++; if (*cp == 0) /* premature end, punt */ break; *fmtp++ = *cp; /* type (checked below) */ *fmtp = 0; /* Execute the format string - let fprintf() do the hard work. */ switch (fmtp[-1]) { case 's': /* string-valued argument */ count += fprintf(fp, fmt, va_arg(ap, char *)); break; case 'c': /* integral-valued argument */ case 'd': case 'u': case 'o': case 'x': if (fmtp[-2] == 'l') count += fprintf(fp, fmt, va_arg(ap, long)); else count += fprintf(fp, fmt, va_arg(ap, int)); break; case 'e': /* float-valued argument */ case 'f': case 'g': count += fprintf(fp, fmt, va_arg(ap, double)); break; default: /* anything else */ putc(fmtp[-1], fp); count++; break; } } } return (count); } /* vprintf - print variable-length argument list to stdout */ -vprintf(format, ap) -char *format; -va_list ap; +vprintf(char *format, va_list ap) { return (vfprintf(stdout, format, ap)); } diff --git a/contrib/tcp_wrappers/workarounds.c b/contrib/tcp_wrappers/workarounds.c index 38e653993f40..581f8ac5573e 100644 --- a/contrib/tcp_wrappers/workarounds.c +++ b/contrib/tcp_wrappers/workarounds.c @@ -1,322 +1,304 @@ /* * Workarounds for known system software bugs. This module provides wrappers * around library functions and system calls that are known to have problems * on some systems. Most of these workarounds won't do any harm on regular * systems. * * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. * * $FreeBSD$ */ #ifndef lint char sccsid[] = "@(#) workarounds.c 1.6 96/03/19 16:22:25"; #endif #include #include #include #include #include #include #include #include #include #include #ifdef USE_GETDOMAIN #include #endif #include "tcpd.h" /* * Some AIX versions advertise a too small MAXHOSTNAMELEN value (32). * Result: long hostnames would be truncated, and connections would be * dropped because of host name verification failures. Adrian van Bloois * (A.vanBloois@info.nic.surfnet.nl) figured out what was the problem. */ #if (MAXHOSTNAMELEN < 64) #undef MAXHOSTNAMELEN #endif /* In case not defined in . */ #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 /* storage for host name */ #endif /* * Some DG/UX inet_addr() versions return a struct/union instead of a long. * You have this problem when the compiler complains about illegal lvalues * or something like that. The following code fixes this mutant behaviour. * It should not be enabled on "normal" systems. * * Bug reported by ben@piglet.cr.usgs.gov (Rev. Ben A. Mesander). */ #ifdef INET_ADDR_BUG #undef inet_addr -long fix_inet_addr(string) -char *string; +long fix_inet_addr(char *string) { return (inet_addr(string).s_addr); } #endif /* INET_ADDR_BUG */ /* * With some System-V versions, the fgets() library function does not * account for partial reads from e.g. sockets. The result is that fgets() * gives up too soon, causing username lookups to fail. Problem first * reported for IRIX 4.0.5, by Steve Kotsopoulos . * The following code works around the problem. It does no harm on "normal" * systems. */ #ifdef BROKEN_FGETS #undef fgets -char *fix_fgets(buf, len, fp) -char *buf; -int len; -FILE *fp; +char *fix_fgets(char *buf, int len, FILE *fp) { char *cp = buf; int c; /* * Copy until the buffer fills up, until EOF, or until a newline is * found. */ while (len > 1 && (c = getc(fp)) != EOF) { len--; *cp++ = c; if (c == '\n') break; } /* * Return 0 if nothing was read. This is correct even when a silly buffer * length was specified. */ if (cp > buf) { *cp = 0; return (buf); } else { return (0); } } #endif /* BROKEN_FGETS */ /* * With early SunOS 5 versions, recvfrom() does not completely fill in the * source address structure when doing a non-destructive read. The following * code works around the problem. It does no harm on "normal" systems. */ #ifdef RECVFROM_BUG #undef recvfrom -int fix_recvfrom(sock, buf, buflen, flags, from, fromlen) -int sock; -char *buf; -int buflen; -int flags; -struct sockaddr *from; -int *fromlen; +int fix_recvfrom(int sock, char *buf, int buflen, int flags, + struct sockaddr *from, int *fromlen) { int ret; /* Assume that both ends of a socket belong to the same address family. */ if ((ret = recvfrom(sock, buf, buflen, flags, from, fromlen)) >= 0) { if (from->sa_family == 0) { struct sockaddr my_addr; int my_addr_len = sizeof(my_addr); if (getsockname(0, &my_addr, &my_addr_len)) { tcpd_warn("getsockname: %m"); } else { from->sa_family = my_addr.sa_family; } } } return (ret); } #endif /* RECVFROM_BUG */ /* * The Apollo SR10.3 and some SYSV4 getpeername(2) versions do not return an * error in case of a datagram-oriented socket. Instead, they claim that all * UDP requests come from address 0.0.0.0. The following code works around * the problem. It does no harm on "normal" systems. */ #ifdef GETPEERNAME_BUG #undef getpeername -int fix_getpeername(sock, sa, len) -int sock; -struct sockaddr *sa; -int *len; +int fix_getpeername(int sock, struct sockaddr *sa, int *len) { int ret; #ifdef INET6 struct sockaddr *sin = sa; #else struct sockaddr_in *sin = (struct sockaddr_in *) sa; #endif if ((ret = getpeername(sock, sa, len)) >= 0 #ifdef INET6 && ((sin->su_si.si_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&sin->su_sin6.sin6_addr)) || (sin->su_si.si_family == AF_INET && sin->su_sin.sin_addr.s_addr == 0))) { #else && sa->sa_family == AF_INET && sin->sin_addr.s_addr == 0) { #endif errno = ENOTCONN; return (-1); } else { return (ret); } } #endif /* GETPEERNAME_BUG */ /* * According to Karl Vogel (vogelke@c-17igp.wpafb.af.mil) some Pyramid * versions have no yp_default_domain() function. We use getdomainname() * instead. */ #ifdef USE_GETDOMAIN -int yp_get_default_domain(ptr) -char **ptr; +int yp_get_default_domain(char **ptr) { static char mydomain[MAXHOSTNAMELEN]; *ptr = mydomain; return (getdomainname(mydomain, MAXHOSTNAMELEN)); } #endif /* USE_GETDOMAIN */ #ifndef INADDR_NONE #define INADDR_NONE 0xffffffff #endif /* * Solaris 2.4 gethostbyname() has problems with multihomed hosts. When * doing DNS through NIS, only one host address ends up in the address list. * All other addresses end up in the hostname alias list, interspersed with * copies of the official host name. This would wreak havoc with tcpd's * hostname double checks. Below is a workaround that should do no harm when * accidentally left in. A side effect of the workaround is that address * list members are no longer properly aligned for structure access. */ #ifdef SOLARIS_24_GETHOSTBYNAME_BUG #undef gethostbyname -struct hostent *fix_gethostbyname(name) -char *name; +struct hostent *fix_gethostbyname(char *name) { struct hostent *hp; struct in_addr addr; char **o_addr_list; char **o_aliases; char **n_addr_list; int broken_gethostbyname = 0; if ((hp = gethostbyname(name)) && !hp->h_addr_list[1] && hp->h_aliases[1]) { for (o_aliases = n_addr_list = hp->h_aliases; *o_aliases; o_aliases++) { if ((addr.s_addr = inet_addr(*o_aliases)) != INADDR_NONE) { memcpy(*n_addr_list++, (char *) &addr, hp->h_length); broken_gethostbyname = 1; } } if (broken_gethostbyname) { o_addr_list = hp->h_addr_list; memcpy(*n_addr_list++, *o_addr_list, hp->h_length); *n_addr_list = 0; hp->h_addr_list = hp->h_aliases; hp->h_aliases = o_addr_list + 1; } } return (hp); } #endif /* SOLARIS_24_GETHOSTBYNAME_BUG */ /* * Horror! Some FreeBSD 2.0 libc routines call strtok(). Since tcpd depends * heavily on strtok(), strange things may happen. Workaround: use our * private strtok(). This has been fixed in the meantime. */ #ifdef USE_STRSEP -char *fix_strtok(buf, sep) -char *buf; -char *sep; +char *fix_strtok(char *buf, char *sep) { static char *state; char *result; if (buf) state = buf; while ((result = strsep(&state, sep)) && result[0] == 0) /* void */ ; return (result); } #endif /* USE_STRSEP */ /* * IRIX 5.3 (and possibly earlier versions, too) library routines call the * non-reentrant strtok() library routine, causing hosts to slip through * allow/deny filters. Workaround: don't rely on the vendor and use our own * strtok() function. FreeBSD 2.0 has a similar problem (fixed in 2.0.5). */ #ifdef LIBC_CALLS_STRTOK -char *my_strtok(buf, sep) -char *buf; -char *sep; +char *my_strtok(char *buf, char *sep) { static char *state; char *result; if (buf) state = buf; /* * Skip over separator characters and detect end of string. */ if (*(state += strspn(state, sep)) == 0) return (0); /* * Skip over non-separator characters and terminate result. */ result = state; if (*(state += strcspn(state, sep)) != 0) *state++ = 0; return (result); } #endif /* LIBC_CALLS_STRTOK */