diff options
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/fingerd/fingerd.c | 4 | ||||
| -rw-r--r-- | libexec/ftpd/ftpcmd.y | 10 | ||||
| -rw-r--r-- | libexec/ftpd/ftpd.c | 8 | ||||
| -rw-r--r-- | libexec/getty/main.c | 14 | ||||
| -rw-r--r-- | libexec/identd/README | 44 | ||||
| -rw-r--r-- | libexec/identd/config.c | 4 | ||||
| -rw-r--r-- | libexec/identd/error.h | 4 | ||||
| -rw-r--r-- | libexec/identd/identd.c | 8 | ||||
| -rw-r--r-- | libexec/identd/identd.h | 4 | ||||
| -rw-r--r-- | libexec/identd/openbsd.c | 6 | ||||
| -rw-r--r-- | libexec/identd/parse.c | 4 | ||||
| -rw-r--r-- | libexec/identd/proxy.c | 4 | ||||
| -rw-r--r-- | libexec/lfs_cleanerd/cleanerd.c | 10 | ||||
| -rw-r--r-- | libexec/lfs_cleanerd/library.c | 6 | ||||
| -rw-r--r-- | libexec/rpc.rquotad/rquotad.c | 6 | ||||
| -rw-r--r-- | libexec/rpc.rstatd/rstat_proc.c | 6 | ||||
| -rw-r--r-- | libexec/rpc.rstatd/rstatd.c | 60 | ||||
| -rw-r--r-- | libexec/rpc.yppasswdd/yppasswdd_proc.c | 4 | ||||
| -rw-r--r-- | libexec/rshd/rshd.c | 4 | ||||
| -rw-r--r-- | libexec/tcpd/README | 132 | ||||
| -rw-r--r-- | libexec/telnetd/sys_term.c | 22 | ||||
| -rw-r--r-- | libexec/telnetd/utility.c | 6 | ||||
| -rw-r--r-- | libexec/tftpd/tftpd.c | 16 |
23 files changed, 193 insertions, 193 deletions
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index dff77ec233c..64c2d0efbca 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$Id: fingerd.c,v 1.6 1997/01/15 23:40:56 millert Exp $"; +static char rcsid[] = "$Id: fingerd.c,v 1.7 1997/07/23 20:36:22 kstailey Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -205,7 +205,7 @@ err(const char *fmt, ...) #else err(fmt, va_alist) char *fmt; - va_dcl + va_dcl #endif { va_list ap; diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 547c60d15b0..d28d5879e46 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -319,7 +319,7 @@ cmd fromname = (char *) 0; } else { reply(503, - "Bad sequence of commands."); + "Bad sequence of commands."); } } free($4); @@ -360,8 +360,8 @@ cmd } else help(cmdtab, $3); - if ($3 != NULL) - free ($3); + if ($3 != NULL) + free ($3); } | NOOP CRLF { @@ -459,7 +459,7 @@ cmd timeout = $6; (void) alarm((unsigned) timeout); reply(200, - "Maximum IDLE time set to %d seconds", + "Maximum IDLE time set to %d seconds", timeout); } } @@ -554,7 +554,7 @@ rcmd free($4); } } else { - if ($4) + if ($4) free ($4); } } diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 9c57a4bb7c4..3d618d505ff 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.40 1997/06/29 07:39:02 deraadt Exp $ */ +/* $OpenBSD: ftpd.c,v 1.41 1997/07/23 20:36:24 kstailey Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -402,7 +402,7 @@ main(argc, argv, envp) } else { addrlen = sizeof(his_addr); if (getpeername(0, (struct sockaddr *)&his_addr, - &addrlen) < 0) { + &addrlen) < 0) { syslog(LOG_ERR, "getpeername (%s): %m", argv[0]); exit(1); } @@ -1542,7 +1542,7 @@ reply(int n, const char *fmt, ...) reply(n, fmt, va_alist) int n; char *fmt; - va_dcl + va_dcl #endif { va_list ap; @@ -1568,7 +1568,7 @@ lreply(int n, const char *fmt, ...) lreply(n, fmt, va_alist) int n; char *fmt; - va_dcl + va_dcl #endif { va_list ap; diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 58c2ea660d8..5a6f9b4d48a 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/ -static char rcsid[] = "$Id: main.c,v 1.8 1997/06/02 08:12:10 deraadt Exp $"; +static char rcsid[] = "$Id: main.c,v 1.9 1997/07/23 20:36:25 kstailey Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -75,13 +75,13 @@ static char rcsid[] = "$Id: main.c,v 1.8 1997/06/02 08:12:10 deraadt Exp $"; /* defines for auto detection of incoming PPP calls (->PAP/CHAP) */ -#define PPP_FRAME 0x7e /* PPP Framing character */ -#define PPP_STATION 0xff /* "All Station" character */ -#define PPP_ESCAPE 0x7d /* Escape Character */ -#define PPP_CONTROL 0x03 /* PPP Control Field */ +#define PPP_FRAME 0x7e /* PPP Framing character */ +#define PPP_STATION 0xff /* "All Station" character */ +#define PPP_ESCAPE 0x7d /* Escape Character */ +#define PPP_CONTROL 0x03 /* PPP Control Field */ #define PPP_CONTROL_ESCAPED 0x23 /* PPP Control Field, escaped */ -#define PPP_LCP_HI 0xc0 /* LCP protocol - high byte */ -#define PPP_LCP_LOW 0x21 /* LCP protocol - low byte */ +#define PPP_LCP_HI 0xc0 /* LCP protocol - high byte */ +#define PPP_LCP_LOW 0x21 /* LCP protocol - low byte */ struct termios tmode, omode; diff --git a/libexec/identd/README b/libexec/identd/README index f1e1d3b500c..efc25ec7745 100644 --- a/libexec/identd/README +++ b/libexec/identd/README @@ -1,4 +1,4 @@ - pidentd + pidentd ("Peter's Ident Daemon" or is it "Portable Ident Daemon"?) @@ -27,38 +27,38 @@ to me if you've tested a newer version, or if your machine/OS isn't among the ones below): Machine Operating System Pidentd version ----------------------- ---------------------- -------------------------- +---------------------- ---------------------- -------------------------- Sequent Balance Dynix 3.0.14 2.1beta.12 - Sequent Symmetry Dynix 3.1.2 2.1beta.3 - Sun 3/50 SunOS 3.5 2.1beta.8.1 (3) - Sun 386i SunOS 4.0.2 1.9beta - Sun 2/120 SunOS 4.0.3 2.1beta.10 + Sequent Symmetry Dynix 3.1.2 2.1beta.3 + Sun 3/50 SunOS 3.5 2.1beta.8.1 (3) + Sun 386i SunOS 4.0.2 1.9beta + Sun 2/120 SunOS 4.0.3 2.1beta.10 Sun 3/280 SunOS 4.1.1 2.1beta.12 Sun 4/380 SunOS 4.1.3 2.1beta.12 Sun SS1/41 SunOS 5.1 2.1beta.11 - HP 9000/375 HP-UX 7.0 2.1beta.10.1 (1) + HP 9000/375 HP-UX 7.0 2.1beta.10.1 (1) HP 9000/300 HP-UX 8.0 2.1beta.12 HP 9000/340 HP-UX 8.0 2.1beta.10.1 HP 9000/360 HP-UX 8.0 2.1beta.10.1 - HP 9000/710 HP-UX 8.07 2.1beta.10.1 - HP 9000/720 HP-UX 8.07 2.1beta.10.1 - HP 9000/715 HP-UX 9.0 2.1beta.9.1 - HP 9000/827 HP-UX 8.02 2.1beta.8.1 - HP 9000/834 HP-UX 7.0 2.0beta.4 - HP 9000/835 HP-UX 8.00 2.1beta.10.1 - MIPS RISC/OS 4.5x 2.1beta.8.1 - DECstation 2100 Ultrix 4.2-96 2.1beta.2 (2) - DECstation 5000/133 Ultrix 4.2 2.1beta.9.1 (2) [?] + HP 9000/710 HP-UX 8.07 2.1beta.10.1 + HP 9000/720 HP-UX 8.07 2.1beta.10.1 + HP 9000/715 HP-UX 9.0 2.1beta.9.1 + HP 9000/827 HP-UX 8.02 2.1beta.8.1 + HP 9000/834 HP-UX 7.0 2.0beta.4 + HP 9000/835 HP-UX 8.00 2.1beta.10.1 + MIPS RISC/OS 4.5x 2.1beta.8.1 + DECstation 2100 Ultrix 4.2-96 2.1beta.2 (2) + DECstation 5000/133 Ultrix 4.2 2.1beta.9.1 (2) [?] DEC VAXstation 2000 Ultrix-32 3.1 2.1beta.12 (2) [?] - DEC VAX vs3520 Ultrix 3.0 2.1beta.9.1 (2) [?] + DEC VAX vs3520 Ultrix 3.0 2.1beta.9.1 (2) [?] DEC VAX 11/780 4.3BSD Reno 2.1beta.12 (2) i486-PC UHC SVR4 2.0 2.0beta.4 (2) i486-PC Dell SVR4 2.2 2.0beta.4 (2) i486-PC ESIX SVR4 4.0.4 2.1beta.2 (2) i486-PC 386BSD 0.1 2.1beta.3 (2) - Cray UNICOS 6.0.12 2.1beta.7 - NeXT NeXTSTEP 2.1 2.1beta.9.1 (3) - NeXT NeXTSTEP 3.0 2.1beta.9.1 (3) + Cray UNICOS 6.0.12 2.1beta.7 + NeXT NeXTSTEP 2.1 2.1beta.9.1 (3) + NeXT NeXTSTEP 3.0 2.1beta.9.1 (3) Pyramid 90x dualPort OSx 4.1 2.1beta.12 Silicon Graphics IRIX 4 2.1beta.10 @@ -68,8 +68,8 @@ Notes: It also has problems with starting stuff as user "sys" from Inetd. (It doesn't correctly set the group id to "sys") so I suggest you - either starts it as user "root" and use the "-u" and "-g" flags - to setuid and setgid itself to user "sys", group "sys", or do a + either starts it as user "root" and use the "-u" and "-g" flags + to setuid and setgid itself to user "sys", group "sys", or do a 'chgrp sys in.identd' and then a 'chmod g+s in.identd' and start it as user "sys" from Inetd. diff --git a/libexec/identd/config.c b/libexec/identd/config.c index e4518e0ba58..df3cd1f8c5a 100644 --- a/libexec/identd/config.c +++ b/libexec/identd/config.c @@ -1,7 +1,7 @@ /* -** $Id: config.c,v 1.1 1995/10/18 08:43:17 deraadt Exp $ +** $Id: config.c,v 1.2 1997/07/23 20:36:26 kstailey Exp $ ** -** config.c This file handles the config file +** config.c This file handles the config file ** ** This program is in the public domain and may be used freely by anyone ** who wants to. diff --git a/libexec/identd/error.h b/libexec/identd/error.h index 2b9e2c9bad7..4810ac4ff59 100644 --- a/libexec/identd/error.h +++ b/libexec/identd/error.h @@ -1,7 +1,7 @@ /* -** $Id: error.h,v 1.1 1995/10/18 08:43:17 deraadt Exp $ +** $Id: error.h,v 1.2 1997/07/23 20:36:27 kstailey Exp $ ** -** error.h Error handling macros +** error.h Error handling macros ** ** This program is in the public domain and may be used freely by anyone ** who wants to. diff --git a/libexec/identd/identd.c b/libexec/identd/identd.c index fee2e467576..7e061734836 100644 --- a/libexec/identd/identd.c +++ b/libexec/identd/identd.c @@ -1,7 +1,7 @@ /* -** $Id: identd.c,v 1.3 1996/12/22 03:41:14 tholo Exp $ +** $Id: identd.c,v 1.4 1997/07/23 20:36:27 kstailey Exp $ ** -** identd.c A TCP/IP link identification protocol server +** identd.c A TCP/IP link identification protocol server ** ** This program is in the public domain and may be used freely by anyone ** who wants to. @@ -70,7 +70,7 @@ extern int errno; #endif #ifndef FD_ZERO -# define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) +# define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) #endif extern char *version; @@ -250,7 +250,7 @@ int main(argc,argv) switch (argv[i][1]) { case 'b': /* Start as standalone daemon */ - background_flag = 1; + background_flag = 1; break; case 'w': /* Start from Inetd, wait mode */ diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h index 26cc8d318b0..94c8edcde45 100644 --- a/libexec/identd/identd.h +++ b/libexec/identd/identd.h @@ -1,7 +1,7 @@ /* -** $Id: identd.h,v 1.1 1995/10/18 08:43:18 deraadt Exp $ +** $Id: identd.h,v 1.2 1997/07/23 20:36:28 kstailey Exp $ ** -** identd.h Common variables for the Pidentd daemon +** identd.h Common variables for the Pidentd daemon ** ** This program is in the public domain and may be used freely by anyone ** who wants to. diff --git a/libexec/identd/openbsd.c b/libexec/identd/openbsd.c index 61316f45010..d54b84e6135 100644 --- a/libexec/identd/openbsd.c +++ b/libexec/identd/openbsd.c @@ -1,5 +1,5 @@ /* -** $Id: openbsd.c,v 1.4 1996/07/27 12:34:47 deraadt Exp $ +** $Id: openbsd.c,v 1.5 1997/07/23 20:36:28 kstailey Exp $ ** ** openbsd.c Low level kernel access functions for OpenBSD ** @@ -156,8 +156,8 @@ getlist(tcbtablep, ktcbtablep, faddr, fport, laddr, lport) break; if (pcb.inp_faddr.s_addr == faddr->s_addr && pcb.inp_laddr.s_addr == laddr->s_addr && - pcb.inp_fport == fport && - pcb.inp_lport == lport ) + pcb.inp_fport == fport && + pcb.inp_lport == lport ) return pcb.inp_socket; } return NULL; diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index 57960806b42..663bcfe1ba4 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -1,7 +1,7 @@ /* -** $Id: parse.c,v 1.2 1995/12/18 22:15:08 deraadt Exp $ +** $Id: parse.c,v 1.3 1997/07/23 20:36:28 kstailey Exp $ ** -** parse.c This file contains the protocol parser +** parse.c This file contains the protocol parser ** ** This program is in the public domain and may be used freely by anyone ** who wants to. diff --git a/libexec/identd/proxy.c b/libexec/identd/proxy.c index 82aaa54e4cd..b0e8a388717 100644 --- a/libexec/identd/proxy.c +++ b/libexec/identd/proxy.c @@ -1,7 +1,7 @@ /* -** $Id: proxy.c,v 1.1 1995/10/18 08:43:18 deraadt Exp $ +** $Id: proxy.c,v 1.2 1997/07/23 20:36:29 kstailey Exp $ ** -** proxy.c This file implements the proxy() call. +** proxy.c This file implements the proxy() call. ** ** This program is in the public domain and may be used freely by anyone ** who wants to. diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c index d94ed8d899c..90d3e0bb916 100644 --- a/libexec/lfs_cleanerd/cleanerd.c +++ b/libexec/lfs_cleanerd/cleanerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cleanerd.c,v 1.3 1997/01/15 23:41:00 millert Exp $ */ +/* $OpenBSD: cleanerd.c,v 1.4 1997/07/23 20:36:30 kstailey Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";*/ -static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.3 1997/01/15 23:41:00 millert Exp $"; +static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.4 1997/07/23 20:36:30 kstailey Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -254,7 +254,7 @@ clean_loop(fsp, nsegs, options) u_long max_free_segs; u_long db_per_seg; - /* + /* * Compute the maximum possible number of free segments, given the * number of free blocks. */ @@ -282,7 +282,7 @@ clean_loop(fsp, nsegs, options) clean_fs(fsp, cost_benefit, nsegs, options); return (1); } else { - /* + /* * We will also clean if the system is reasonably idle and * the total clean space is less then IDLE_LIM % of possible * clean space. @@ -293,7 +293,7 @@ clean_loop(fsp, nsegs, options) } if (loadavg[ONE_MIN] == 0.0 && loadavg[FIVE_MIN] && fsp->fi_cip->clean < max_free_segs * IDLE_LIM) { - clean_fs(fsp, cost_benefit, nsegs, options); + clean_fs(fsp, cost_benefit, nsegs, options); printf("Cleaner Running at %s (system idle)\n", ctime(&now)); return (1); diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c index 0a1463540bc..5ea628761c1 100644 --- a/libexec/lfs_cleanerd/library.c +++ b/libexec/lfs_cleanerd/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.2 1996/07/01 11:04:57 downsj Exp $ */ +/* $OpenBSD: library.c,v 1.3 1997/07/23 20:36:30 kstailey Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "@(#)library.c 8.3 (Berkeley) 5/24/95";*/ -static char rcsid[] = "$OpenBSD: library.c,v 1.2 1996/07/01 11:04:57 downsj Exp $"; +static char rcsid[] = "$OpenBSD: library.c,v 1.3 1997/07/23 20:36:30 kstailey Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -152,7 +152,7 @@ get_superblock (fsp, sbp) struct lfs *sbp; { char mntfromname[MNAMELEN+1]; - int fid; + int fid; strcpy(mntfromname, "/dev/r"); strcat(mntfromname, fsp->fi_statfsp->f_mntfromname+5); diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index 315ed9a9fdb..6bc71f528bf 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -274,9 +274,9 @@ getfsquota(id, path, dqblk) switch (read(fd, dqblk, sizeof(struct dqblk))) { case 0: /* - * Convert implicit 0 quota (EOF) - * into an explicit one (zero'ed dqblk) - */ + * Convert implicit 0 quota (EOF) + * into an explicit one (zero'ed dqblk) + */ bzero((caddr_t) dqblk, sizeof(struct dqblk)); ret = 1; break; diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index 761d75435d1..6493f6c8f3d 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rstat_proc.c,v 1.7 1997/07/08 20:47:51 kstailey Exp $ */ +/* $OpenBSD: rstat_proc.c,v 1.8 1997/07/23 20:36:32 kstailey Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -31,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/ /*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.7 1997/07/08 20:47:51 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.8 1997/07/23 20:36:32 kstailey Exp $"; #endif /* @@ -374,7 +374,7 @@ havedisk() if (kvm_nlist(kfd, nl) != 0) { syslog(LOG_ERR, "can't get namelist"); exit (1); - } + } if (kvm_read(kfd, (long)nl[X_DKXFER].n_value, (char *)xfer, sizeof xfer) != sizeof xfer) { diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index a532ccd596d..0df791f334c 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rstatd.c,v 1.2 1997/04/03 19:03:09 kstailey Exp $"; +static char rcsid[] = "$Id: rstatd.c,v 1.3 1997/07/23 20:36:32 kstailey Exp $"; #endif /* not lint */ #include <stdio.h> @@ -49,50 +49,50 @@ int closedown = 20; /* how long to wait before going dormant */ void cleanup() { - (void) pmap_unset(RSTATPROG, RSTATVERS_TIME); - (void) pmap_unset(RSTATPROG, RSTATVERS_SWTCH); - (void) pmap_unset(RSTATPROG, RSTATVERS_ORIG); - exit(0); + (void) pmap_unset(RSTATPROG, RSTATVERS_TIME); + (void) pmap_unset(RSTATPROG, RSTATVERS_SWTCH); + (void) pmap_unset(RSTATPROG, RSTATVERS_ORIG); + exit(0); } main(argc, argv) - int argc; - char *argv[]; + int argc; + char *argv[]; { SVCXPRT *transp; - int sock = 0; - int proto = 0; + int sock = 0; + int proto = 0; struct sockaddr_in from; int fromlen; - - if (argc == 2) - closedown = atoi(argv[1]); - if (closedown <= 0) - closedown = 20; - /* - * See if inetd started us - */ + if (argc == 2) + closedown = atoi(argv[1]); + if (closedown <= 0) + closedown = 20; + + /* + * See if inetd started us + */ fromlen = sizeof(from); - if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { - from_inetd = 0; - sock = RPC_ANYSOCK; - proto = IPPROTO_UDP; - } + if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { + from_inetd = 0; + sock = RPC_ANYSOCK; + proto = IPPROTO_UDP; + } - if (!from_inetd) { - daemon(0, 0); + if (!from_inetd) { + daemon(0, 0); - (void)pmap_unset(RSTATPROG, RSTATVERS_TIME); - (void)pmap_unset(RSTATPROG, RSTATVERS_SWTCH); - (void)pmap_unset(RSTATPROG, RSTATVERS_ORIG); + (void)pmap_unset(RSTATPROG, RSTATVERS_TIME); + (void)pmap_unset(RSTATPROG, RSTATVERS_SWTCH); + (void)pmap_unset(RSTATPROG, RSTATVERS_ORIG); (void) signal(SIGINT, cleanup); (void) signal(SIGTERM, cleanup); (void) signal(SIGHUP, cleanup); - } - - openlog("rpc.rstatd", LOG_CONS|LOG_PID, LOG_DAEMON); + } + + openlog("rpc.rstatd", LOG_CONS|LOG_PID, LOG_DAEMON); transp = svcudp_create(sock); if (transp == NULL) { diff --git a/libexec/rpc.yppasswdd/yppasswdd_proc.c b/libexec/rpc.yppasswdd/yppasswdd_proc.c index e56b428cf5e..335c804b464 100644 --- a/libexec/rpc.yppasswdd/yppasswdd_proc.c +++ b/libexec/rpc.yppasswdd/yppasswdd_proc.c @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: yppasswdd_proc.c,v 1.3 1996/06/26 22:11:27 maja Exp $"; +static char rcsid[] = "$Id: yppasswdd_proc.c,v 1.4 1997/07/23 20:36:33 kstailey Exp $"; #endif #include <sys/types.h> @@ -45,7 +45,7 @@ int make_passwd __P((yppasswd *)); int * yppasswdproc_update_1_svc(argp, rqstp, transp) yppasswd *argp; - struct svc_req *rqstp; + struct svc_req *rqstp; SVCXPRT *transp; { static int res; diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index e374ce81d1f..b9dc74f6375 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */ -static char *rcsid = "$Id: rshd.c,v 1.18 1997/06/29 11:10:30 provos Exp $"; +static char *rcsid = "$Id: rshd.c,v 1.19 1997/07/23 20:36:34 kstailey Exp $"; #endif /* not lint */ /* @@ -711,7 +711,7 @@ error(const char *fmt, ...) #else error(fmt, va_alist) char *fmt; - va_dcl + va_dcl #endif { va_list ap; diff --git a/libexec/tcpd/README b/libexec/tcpd/README index 1e52463617d..1b1ca42e7a3 100644 --- a/libexec/tcpd/README +++ b/libexec/tcpd/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.2 1997/06/01 05:21:40 downsj Exp $ +$OpenBSD: README,v 1.3 1997/07/23 20:36:34 kstailey Exp $ @(#) README 1.30 97/03/21 19:27:21 This is the 7.6 version of the TCP/IP daemon wrapper package. @@ -14,7 +14,7 @@ Announcements of new releases of this software are posted to Usenet (comp.security.unix, comp.unix.admin), to the cert-tools mailing list, and to a dedicated mailing list. You can subscribe to the dedicated mailing list by sending an email message to majordomo@wzv.win.tue.nl -with in the body (not subject): subscribe tcp-wrappers-announce. +with in the body (not subject): subscribe tcp-wrappers-announce. Table of contents ----------------- @@ -22,29 +22,29 @@ Table of contents 1 - Introduction 2 - Disclaimer 3 - Tutorials - 3.1 - How it works - 3.2 - Where the logging information goes + 3.1 - How it works + 3.2 - Where the logging information goes 4 - Features - 4.1 - Access control - 4.2 - Host name spoofing - 4.3 - Host address spoofing - 4.4 - Client username lookups - 4.5 - Language extensions + 4.1 - Access control + 4.2 - Host name spoofing + 4.3 - Host address spoofing + 4.4 - Client username lookups + 4.5 - Language extensions 4.6 - Multiple ftp/gopher/www archives on one host 4.7 - Banner messages 4.8 - Sequence number guessing 5 - Other works - 5.1 - Related documents - 5.2 - Related software + 5.1 - Related documents + 5.2 - Related software 6 - Limitations - 6.1 - Known wrapper limitations - 6.2 - Known system software bugs + 6.1 - Known wrapper limitations + 6.2 - Known system software bugs 7 - Configuration and installation - 7.1 - Easy configuration and installation - 7.2 - Advanced configuration and installation - 7.3 - Daemons with arbitrary path names - 7.4 - Building and testing the access control rules - 7.5 - Other applications + 7.1 - Easy configuration and installation + 7.2 - Advanced configuration and installation + 7.3 - Daemons with arbitrary path names + 7.4 - Building and testing the access control rules + 7.5 - Other applications 8 - Acknowledgements 1 - Introduction @@ -59,7 +59,7 @@ yourself lucky if you don't know what that means. The package provides tiny daemon wrapper programs that can be installed without any changes to existing software or to existing configuration -files. The wrappers report the name of the client host and of the +files. The wrappers report the name of the client host and of the requested service; the wrappers do not exchange information with the client or server applications, and impose no overhead on the actual conversation between the client and server applications. @@ -123,18 +123,18 @@ the target host. The telnet server process connects the user to a login process. A few examples of client and server programs are shown in the table below: - client server application - -------------------------------- - telnet telnetd remote login - ftp ftpd file transfer - finger fingerd show users + client server application + -------------------------------- + telnet telnetd remote login + ftp ftpd file transfer + finger fingerd show users The usual approach is to run one single daemon process that waits for all kinds of incoming network connections. Whenever a connection is established, this daemon (usually called inetd) runs the appropriate server program and goes back to sleep, waiting for other connections. -The wrapper programs rely on a simple, but powerful mechanism. Instead +The wrapper programs rely on a simple, but powerful mechanism. Instead of directly running the desired server program, the inetd is tricked into running a small wrapper program. The wrapper logs the client host name or address and performs some additional checks. When all is well, @@ -195,8 +195,8 @@ syslogd versions can even forward messages down a |pipeline. Older syslog implementations (still found on Ultrix systems) only support priority levels ranging from 9 (debug-level messages) to 0 (alerts). All logging information of the specified priority level or -more urgent is written to the same destination. In the syslog.conf -file, priority levels are specified in numerical form. For example, +more urgent is written to the same destination. In the syslog.conf +file, priority levels are specified in numerical form. For example, 8/usr/spool/mqueue/syslog @@ -209,7 +209,7 @@ priority levels. Examples of message classes are: mail, daemon, auth and news. In the syslog.conf file, priority levels are specified with symbolic names: debug, info, notice, ..., emerg. For example, - mail.debug /var/log/syslog + mail.debug /var/log/syslog causes all messages of class mail with priority debug (or more urgent) to be appended to the /var/log/syslog file. @@ -234,7 +234,7 @@ run the program by hand (`syslogd -d') and see what really happens. -------------------- When compiled with -DHOSTS_ACCESS, the wrapper programs support a -simple form of access control. Access can be controlled per host, per +simple form of access control. Access can be controlled per host, per service, or combinations thereof. The software provides hooks for the execution of shell commands when an access control rule fires; this feature may be used to install "booby traps". For details, see the @@ -325,7 +325,7 @@ system is up and running. This additional protection is not an invention of my own; it has been present for at least five years in the BSD rsh and rlogin daemons. Unfortunately, that feature was added *after* 4.3 BSD came out, so that -very few, if any, UNIX vendors have adopted it. Our site, and many +very few, if any, UNIX vendors have adopted it. Our site, and many other ones, has been running these enhanced daemons for several years, and without any ill effects. @@ -353,7 +353,7 @@ all you can be certain of is the network packet's destination address. ----------------------------- The protocol proposed in RFC 931 provides a means to obtain the client -user name from the client host. The requirement is that the client +user name from the client host. The requirement is that the client host runs an RFC 931-compliant daemon. The information provided by such a daemon is not intended to be used for authentication purposes, but it can provide additional information about the owner of a TCP connection. @@ -400,7 +400,7 @@ server instead of the standard one; many others. The language extensions are not enabled by default because they introduce an incompatible change to the access control language -syntax. Instructions to enable the extensions are given in the +syntax. Instructions to enable the extensions are given in the Makefile. 4.6 - Multiple ftp/gopher/www archives on one host @@ -608,7 +608,7 @@ library that comes with the nntp sources reportedly works well, too. ------------------------------- Many UDP (and rpc/udp) daemons linger around for a while after they -have serviced a request, just in case another request comes in. In the +have serviced a request, just in case another request comes in. In the inetd configuration file these daemons are registered with the `wait' option. Only the request that started such a daemon will be seen by the wrappers. Such daemons are better protected with the securelib shared @@ -623,7 +623,7 @@ rexd is less secure than a wildcard in /etc/hosts.equiv. Some RPC requests (for example: rwall, rup, rusers) appear to come from the server host. What happens is that the client broadcasts its request to all portmap daemons on its network; each portmap daemon forwards the -request to a daemon on its own system. As far as the rwall etc. daemons +request to a daemon on its own system. As far as the rwall etc. daemons know, the request comes from the local host. Portmap and RPC (e.g. NIS and NFS) (in)security is a topic in itself. @@ -651,7 +651,7 @@ wrapper's logging severity. On some systems, the optional RFC 931 etc. client username lookups may trigger a kernel bug. When a client host connects to your system, and the RFC 931 connection from your system to that client is rejected by a -router, your kernel may drop all connections with that client. This is +router, your kernel may drop all connections with that client. This is not a bug in the wrapper programs: complain to your vendor, and don't enable client user name lookups until the bug has been fixed. @@ -664,14 +664,14 @@ Reportedly, a fix for Ultrix is available (CXO-8919). The following procedure can be used (from outside the tue.nl domain) to find out if your kernel has the bug. From the system under test, do: - % ftp 131.155.70.19 + % ftp 131.155.70.19 This command attempts to make an ftp connection to our anonymous ftp server (ftp.win.tue.nl). When the connection has been established, run the following command from the same system under test, while keeping the ftp connection open: - % telnet 131.155.70.19 111 + % telnet 131.155.70.19 111 Do not forget the `111' at the end of the command. This telnet command attempts to connect to our portmap process. The telnet command should @@ -710,16 +710,16 @@ When the `make' succeeds the result is five executables (six in case of Ultrix). You can use the `tcpdchk' program to identify the most common problems -in your wrapper and inetd configuration files. +in your wrapper and inetd configuration files. With the `tcpdmatch' program you can examine how the wrapper would -react to specific requests for service. +react to specific requests for service. The `safe_finger' command should be used when you implement booby -traps: it gives better protection against nasty stuff that remote +traps: it gives better protection against nasty stuff that remote hosts may do in response to your finger probes. -The `try-from' program tests the host and username lookup code. Run it +The `try-from' program tests the host and username lookup code. Run it from a remote shell command (`rsh host /some/where/try-from') and it should be able to figure out from what system it is being called. @@ -782,12 +782,12 @@ When the `make' succeeds the result is five executables (six in case of Ultrix). You can use the `tcpdchk' program to identify the most common problems -in your wrapper and inetd configuration files. +in your wrapper and inetd configuration files. With the `tcpdmatch' program you can examine how the wrapper would -react to specific requests for service. +react to specific requests for service. -The `try-from' program tests the host and username lookup code. Run it +The `try-from' program tests the host and username lookup code. Run it from a remote shell command (`rsh host /some/where/try-from') and it should be able to figure out from what system it is being called. @@ -822,12 +822,12 @@ install the wrapper set-uid. Then perform the following edits on the inetd configuration file (usually /etc/inetd.conf or /etc/inet/inetd.conf): - finger stream tcp nowait nobody /usr/etc/in.fingerd in.fingerd - ^^^^^^^^^^^^^^^^^^^ + finger stream tcp nowait nobody /usr/etc/in.fingerd in.fingerd + ^^^^^^^^^^^^^^^^^^^ becomes: - finger stream tcp nowait nobody /usr/etc/tcpd in.fingerd - ^^^^^^^^^^^^^ + finger stream tcp nowait nobody /usr/etc/tcpd in.fingerd + ^^^^^^^^^^^^^ Send a `kill -HUP' to the inetd process to make the change effective. Some IRIX inetd implementations require that you first disable the finger service (comment out the finger service and `kill -HUP' the @@ -851,13 +851,13 @@ the services is systat, which is a kind of limited finger service. If you want to monitor the systat service, install the miscd wrapper in a suitable place and update the inetd configuration file: - systat stream tcp nowait /suitable/place/miscd systatd + systat stream tcp nowait /suitable/place/miscd systatd Ultrix 4.3 allows you to specify a user id under which the daemon will be executed. This feature is not documented in the manual pages. Thus, the example would become: - systat stream tcp nowait nobody /suitable/place/miscd systatd + systat stream tcp nowait nobody /suitable/place/miscd systatd Older Ultrix systems still run all their network daemons as root. @@ -872,9 +872,9 @@ common directory, but sometimes that is not practical. Having soft links all over your file system is not a clean solution, either. Instead you can specify, in the inetd configuration file, an absolute -path name for the daemon process name. For example, +path name for the daemon process name. For example, - ntalk dgram udp wait root /usr/etc/tcpd /usr/local/lib/ntalkd + ntalk dgram udp wait root /usr/etc/tcpd /usr/local/lib/ntalkd When the daemon process name is an absolute path name, tcpd ignores the value of the REAL_DAEMON_DIR constant, and uses the last path component @@ -897,7 +897,7 @@ host names that you will have to build into your access control rules. The syntax of the access control rules is documented in the file hosts_access.5, which is in `nroff -man' format. This is a lengthy document, and no-one expects you to read it right away from beginning -to end. Instead, after reading the introductory section, skip to the +to end. Instead, after reading the introductory section, skip to the examples at the end so that you get a general idea of the language. Then you can appreciate the detailed reference sections near the beginning of the document. @@ -919,7 +919,7 @@ hosts.access and hosts.allow files in the current directory. This program is described in the tcpdchk.8 document (`nroff -man' format). The `tcpdmatch' command can be used to try out your local access -control files. The command syntax is: +control files. The command syntax is: tcpdmatch process_name hostname (e.g.: tcpdmatch in.tftpd localhost) @@ -941,7 +941,7 @@ watch the process name that shows up in the logfile. Alternatively, you can look up the name from the inetd configuration file. Coming back to the tftp example in the tutorial section above: - tftp dgram udp wait root /usr/etc/tcpd in.tftpd -s /tftpboot + tftp dgram udp wait root /usr/etc/tcpd in.tftpd -s /tftpboot This entry causes the inetd to run the wrapper program (tcpd) with a process name `in.tftpd'. This is the name that the wrapper will use @@ -977,7 +977,7 @@ In that case, sendmail should not be run as a stand-alone network listener, but it should be registered in the inetd configuration file. For example: - smtp stream tcp nowait root /usr/etc/tcpd /usr/lib/sendmail -bs + smtp stream tcp nowait root /usr/etc/tcpd /usr/lib/sendmail -bs You will still need to run one sendmail background process to handle queued-up outgoing mail. A command like: @@ -993,7 +993,7 @@ unprotected smtp daemons on the network. Many people contributed to the evolution of the programs, by asking inspiring questions, by suggesting features or bugfixes, or by -submitting source code. Nevertheless, all mistakes and bugs in the +submitting source code. Nevertheless, all mistakes and bugs in the wrappers are my own. Thanks to Brendan Kehoe (cs.widener.edu), Heimir Sverrisson (hafro.is) @@ -1007,7 +1007,7 @@ get the client IP address in case of datagram-oriented services, and suggested the optional shell command feature. Shabbir Safdar (mentor.cc.purdue.edu) provided a first version of a much-needed manual page. Granville Boman Goza, IV (sei.cmu.edu) suggested to use the -client IP address even when the host name is available. Casper H.S. +client IP address even when the host name is available. Casper H.S. Dik (fwi.uva.nl) provided additional insight into DNS spoofing techniques. The bogus daemon feature was inspired by code from Andrew Macpherson (BNR Europe Ltd). Steve Bellovin (research.att.com) @@ -1016,7 +1016,7 @@ insecurity. Risks of automated fingers were pointed out by Borja Marcos (we.lc.ehu.es). Brad Plecs (jhuspo.ca.jhu.edu) was kind enough to try my early TLI code and to work out how DG/UX differs from Solaris. -John P. Rouillard (cs.umb.edu) deserves special mention for his +John P. Rouillard (cs.umb.edu) deserves special mention for his persistent, but constructive, nagging about wrong or missing things, and for trying out and discussing embryonic code or ideas. @@ -1026,14 +1026,14 @@ Last but not least, Howard Chu (hanauma.jpl.nasa.gov), Darren Reed (engr.latech.edu), Chris Turbeville (cse.uta.edu), Paul Kranenburg (cs.few.eur.nl), Marc Boucher (cam.org), Dave Mitchell (dcs.shef.ac.uk), Andrew Maffei, Adrian van Bloois, Rop Gonggrijp, John -C. Wingenbach, Everett F. Batey and many, many others provided fixes, +C. Wingenbach, Everett F. Batey and many, many others provided fixes, code fragments, or ideas for improvements. - Wietse Venema (wietse@wzv.win.tue.nl) - Department of Mathematics and Computing Science - Eindhoven University of Technology - P.O. Box 513 - 5600 MB Eindhoven - The Netherlands + Wietse Venema (wietse@wzv.win.tue.nl) + Department of Mathematics and Computing Science + Eindhoven University of Technology + P.O. Box 513 + 5600 MB Eindhoven + The Netherlands Currently visiting IBM T.J. Watson Research, Hawthorne NY, USA. diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c index 8bf0ac93a8a..5e86141b09c 100644 --- a/libexec/telnetd/sys_term.c +++ b/libexec/telnetd/sys_term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_term.c,v 1.7 1997/07/14 01:40:38 millert Exp $ */ +/* $OpenBSD: sys_term.c,v 1.8 1997/07/23 20:36:35 kstailey Exp $ */ /* $NetBSD: sys_term.c,v 1.9 1996/03/20 04:25:53 tls Exp $ */ /* @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; static char rcsid[] = "$NetBSD: sys_term.c,v 1.8 1996/02/28 20:38:21 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: sys_term.c,v 1.7 1997/07/14 01:40:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: sys_term.c,v 1.8 1997/07/23 20:36:35 kstailey Exp $"; #endif #endif /* not lint */ @@ -1785,13 +1785,13 @@ start_login(host, autologin, name) if (pty > 2) close(pty); #endif - if (getent(defent, gettyname) == 1) { - char *cp = defstrs; + if (getent(defent, gettyname) == 1) { + char *cp = defstrs; - loginprog = getstr("lo", &cp); - } - if (loginprog == NULL) - loginprog = _PATH_LOGIN; + loginprog = getstr("lo", &cp); + } + if (loginprog == NULL) + loginprog = _PATH_LOGIN; closelog(); /* * This sleep(1) is in here so that telnetd can @@ -1799,10 +1799,10 @@ start_login(host, autologin, name) * the login banner message gets lost... */ sleep(1); - execv(loginprog, argv); + execv(loginprog, argv); - syslog(LOG_ERR, "%s: %m\n", loginprog); - fatalperror(net, loginprog); + syslog(LOG_ERR, "%s: %m\n", loginprog); + fatalperror(net, loginprog); /*NOTREACHED*/ } diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c index 4b1ff91e0bb..54db900805a 100644 --- a/libexec/telnetd/utility.c +++ b/libexec/telnetd/utility.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utility.c,v 1.7 1997/07/14 01:40:39 millert Exp $ */ +/* $OpenBSD: utility.c,v 1.8 1997/07/23 20:36:36 kstailey Exp $ */ /* $NetBSD: utility.c,v 1.9 1996/02/28 20:38:29 thorpej Exp $ */ /* @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; static char rcsid[] = "$NetBSD: utility.c,v 1.9 1996/02/28 20:38:29 thorpej Exp $"; #else -static char rcsid[] = "$OpenBSD: utility.c,v 1.7 1997/07/14 01:40:39 millert Exp $"; +static char rcsid[] = "$OpenBSD: utility.c,v 1.8 1997/07/23 20:36:36 kstailey Exp $"; #endif #endif /* not lint */ @@ -483,7 +483,7 @@ putf(cp, where) case 'v': puts(utsinfo.version); - break; + break; } cp++; } diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index b0fbb78f621..2efc700185e 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpd.c,v 1.7 1997/06/11 21:19:47 downsj Exp $ */ +/* $OpenBSD: tftpd.c,v 1.8 1997/07/23 20:36:37 kstailey Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)tftpd.c 5.13 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: tftpd.c,v 1.7 1997/06/11 21:19:47 downsj Exp $: tftpd.c,v 1.6 1997/02/16 23:49:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tftpd.c,v 1.8 1997/07/23 20:36:37 kstailey Exp $: tftpd.c,v 1.6 1997/02/16 23:49:21 deraadt Exp $"; #endif /* not lint */ /* @@ -432,7 +432,7 @@ send_data: } read_ahead(file, pf->f_convert); for ( ; ; ) { - alarm(rexmtval); /* read the ack */ + alarm(rexmtval); /* read the ack */ n = recv(peer, ackbuf, sizeof (ackbuf), 0); alarm(0); if (n < 0) { @@ -499,7 +499,7 @@ send_ack: alarm(rexmtval); n = recv(peer, dp, PKTSIZE, 0); alarm(0); - if (n < 0) { /* really? */ + if (n < 0) { /* really? */ syslog(LOG_ERR, "tftpd: read: %m\n"); goto abort; } @@ -514,19 +514,19 @@ send_ack: /* Re-synchronize with the other side */ (void) synchnet(peer); if (dp->th_block == (block-1)) - goto send_ack; /* rexmit */ + goto send_ack; /* rexmit */ } } /* size = write(file, dp->th_data, n - 4); */ size = writeit(file, &dp, n - 4, pf->f_convert); - if (size != (n-4)) { /* ahem */ + if (size != (n-4)) { /* ahem */ if (size < 0) nak(errno + 100); else nak(ENOSPACE); goto abort; } } while (size == SEGSIZE); write_behind(file, pf->f_convert); - (void) fclose(file); /* close data file */ + (void) fclose(file); /* close data file */ ap->th_opcode = htons((u_short)ACK); /* send the "final" ack */ ap->th_block = htons((u_short)(block)); @@ -536,7 +536,7 @@ send_ack: alarm(rexmtval); n = recv(peer, buf, sizeof (buf), 0); /* normally times out and quits */ alarm(0); - if (n >= 4 && /* if read some data */ + if (n >= 4 && /* if read some data */ dp->th_opcode == DATA && /* and got a data block */ block == dp->th_block) { /* then my last ack was lost */ (void) send(peer, ackbuf, 4, 0); /* resend final ack */ |