14 files changed, 58 insertions, 42 deletions

diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index 32742c296efb..e9e0fc81025b 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: bootpd.c,v 1.4 1996/09/22 21:51:56 wosch Exp $
+	$Id: bootpd.c,v 1.4.2.1 1998/02/18 05:55:29 jkh Exp $
 
 ************************************************************************/
 
@@ -162,8 +162,7 @@ char *progname;
 char *chdir_path;
 struct in_addr my_ip_addr;
 
-struct utsname my_uname;
-char *hostname;
+char *hostname, default_hostname[MAXHOSTNAMELEN + 1];
 
 /* Flags set by signal catcher. */
 PRIVATE int do_readtab = 0;
@@ -256,11 +255,11 @@ main(argc, argv)
 	stmp = NULL;
 	timeout = &actualtimeout;
 
-	if (uname(&my_uname) < 0) {
+	if (gethostname(default_hostname, MAXHOSTNAMELEN) < 0) {
 		report(LOG_ERR, "bootpd: can't get hostname\n");
 		exit(1);
 	}
-	hostname = my_uname.nodename;
+	hostname = default_hostname;
 
 	/*
 	 * Read switches.
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 3827fd99b00e..023d7b8645ef 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- *	$Id$
+ *	$Id: dumptab.c,v 1.2 1996/09/22 21:52:07 wosch Exp $
  */
 
 #include <sys/types.h>
@@ -61,7 +61,7 @@ dumptab(filename)
 	int n;
 	struct host *hp;
 	FILE *fp;
-	long t;
+	time_t t;
 	/* Print symbols in alphabetical order for reader's convenience. */
 	static char legend[] = "#\n# Legend:\t(see bootptab.5)\n\
 #\tfirst field -- hostname (not indented)\n\
@@ -152,7 +152,7 @@ dump_host(fp, hp)
 			if (hp->flags.bootsize_auto) {
 				fprintf(fp, "auto:");
 			} else {
-				fprintf(fp, "%d:", hp->bootsize);
+				fprintf(fp, "%lu:", (u_long)hp->bootsize);
 			}
 		}
 		if (hp->flags.cookie_server) {
@@ -220,10 +220,10 @@ dump_host(fp, hp)
 			fprintf(fp, ":");
 		}
 		if (hp->flags.msg_size) {
-			fprintf(fp, "\\\n\t:ms=%d:", hp->msg_size);
+			fprintf(fp, "\\\n\t:ms=%lu:", (u_long)hp->msg_size);
 		}
 		if (hp->flags.min_wait) {
-			fprintf(fp, "\\\n\t:mw=%d:", hp->min_wait);
+			fprintf(fp, "\\\n\t:mw=%lu:", (u_long)hp->min_wait);
 		}
 		if (hp->flags.name_server) {
 			fprintf(fp, "\\\n\t:ns=");
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 2f9c7eb1463d..b9c913767c5a 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)comsat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: comsat.c,v 1.6.2.1 1997/12/12 07:16:56 charnier Exp $";
+	"$Id: comsat.c,v 1.6.2.2 1998/02/18 12:25:43 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -186,9 +186,11 @@ mailfor(name)
 		file = name;
 	else
 		file = cp + 1;
-	sprintf(buf, "%s/%.*s", _PATH_MAILDIR, sizeof(utmp[0].ut_name), name);
+	sprintf(buf, "%s/%.*s", _PATH_MAILDIR, (int)sizeof(utmp[0].ut_name),
+	    name);
 	if (*file != '/') {
-		sprintf(buf2, "%s/%.*s", _PATH_MAILDIR, sizeof(utmp[0].ut_name), file);
+		sprintf(buf2, "%s/%.*s", _PATH_MAILDIR,
+		    (int)sizeof(utmp[0].ut_name), file);
 		file = buf2;
 	}
 	folder = strcmp(buf, file);
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 091ca370d7d7..129ea440dc6d 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftpd.c,v 1.25.2.16 1998/05/16 21:29:20 ache Exp $";
+	"$Id: ftpd.c,v 1.25.2.17 1998/06/04 22:28:14 steve Exp $";
 #endif /* not lint */
 
 /*
@@ -460,7 +460,7 @@ main(argc, argv, envp)
 
 	(void) signal(SIGCHLD, SIG_IGN);
 	(void) signal(SIGPIPE, lostconn);
-	if ((int)signal(SIGURG, myoob) < 0)
+	if (signal(SIGURG, myoob) == SIG_ERR)
 		syslog(LOG_ERR, "signal: %m");
 
 #ifdef SKEY
@@ -480,6 +480,13 @@ main(argc, argv, envp)
 	if (setsockopt(0, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0)
 		syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
 #endif
+	/*
+	 * Disable Nagle on the control channel so that we don't have to wait
+	 * for peer's ACK before issuing our next reply.
+	 */
+	if (setsockopt(0, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) < 0)
+		syslog(LOG_WARNING, "control setsockopt TCP_NODELAY: %m");
+
 	data_source.sin_port = htons(ntohs(ctrl_addr.sin_port) - 1);
 
 	/* set this here so klogin can use it... */
@@ -1133,7 +1140,7 @@ retrieve(cmd, name)
 	FILE *fin, *dout;
 	struct stat st;
 	int (*closefunc) __P((FILE *));
-	long start;
+	time_t start;
 
 	if (cmd == 0) {
 		fin = fopen(name, "r"), closefunc = fclose;
@@ -1921,7 +1928,8 @@ dolog(sin)
 			       remotehost, hostname);
 		else
 #endif
-			syslog(LOG_INFO, "connection from %s", remotehost);
+			syslog(LOG_INFO, "connection from %s (%s)", remotehost,
+				inet_ntoa(sin->sin_addr));
 	}
 }
 
@@ -2289,7 +2297,7 @@ logxfer(name, size, start)
 {
 	char buf[1024];
 	char path[MAXPATHLEN + 1];
-	long now;
+	time_t now;
 
 	if (statfd >= 0 && getwd(path) != NULL) {
 		time(&now);
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 53ea15e6f558..2649bef6f60f 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	$Id: gettytab.5,v 1.7.2.6 1998/02/20 17:32:24 jkh Exp $
+.\"	$Id: gettytab.5,v 1.7.2.7 1998/05/04 02:41:31 steve Exp $
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
@@ -372,7 +372,7 @@ mode.
 .Pp
 If
 .Em \&pp
-string is specified and a PPP link bringup sequence is recognized,
+string is specified and a PPP link bring up sequence is recognized,
 getty will invoke the program referenced by the pp option.  This
 can be used to handle incoming PPP calls.
 .Pp
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index e260614bbea5..c9147339d9a8 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: mknetid.8,v 1.1.1.1 1996/06/25 20:26:38 wpaul Exp $
+.\"	$Id: mknetid.8,v 1.1.1.1.2.1 1997/12/15 07:16:14 charnier Exp $
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
@@ -91,7 +91,7 @@ file. The compiled-in default is
 Specify the location of the passwd information
 file. The compiled-in default is
 .Pa /etc/passwd .
-.It Fl h Ar group_file
+.It Fl h Ar hosts_file
 Specify the location of the hosts database
 file. The compiled-in default is
 .Pa /etc/hosts .
@@ -138,5 +138,5 @@ the default netid database file
 .Sh SEE ALSO
 .Xr yp 4 ,
 .Xr yp_mkdb 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 14c7b10f1c81..a5747c64228c 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -38,6 +38,11 @@
 
 #ifndef lint
 static const char rcsid[] =
+	"$Id: mknetid.c,v 1.4.2.2 1997/12/15 07:16:15 charnier Exp $";
+#endif /* not lint */
+
+#ifndef lint
+static const char rcsid[] =
 	"$Id$";
 #endif /* not lint */
 
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index f807626eddec..61e4aa0d00d8 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rshd.c,v 1.9.2.5 1998/02/18 11:52:20 markm Exp $";
+	"$Id: rshd.c,v 1.9.2.6 1998/03/06 01:46:10 jkh Exp $";
 #endif /* not lint */
 
 /*
@@ -171,7 +171,7 @@ main(argc, argv)
 	fromlen = sizeof (from);
 	if (getpeername(0, (struct sockaddr *)&from, &fromlen) < 0) {
 		syslog(LOG_ERR, "getpeername: %m");
-		_exit(1);
+		exit(1);
 	}
 	if (keepalive &&
 	    setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index f6211665b708..917f5f8fc804 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: announce.c,v 1.5.2.2 1997/12/18 07:30:09 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -104,6 +104,7 @@ print_mesg(tty, tf, request, remote_machine)
 	char *remote_machine;
 {
 	struct timeval clock;
+	time_t clock_sec;
 	struct timezone zone;
 	struct tm *localtime();
 	struct tm *localclock;
@@ -117,7 +118,8 @@ print_mesg(tty, tf, request, remote_machine)
 	i = 0;
 	max_size = 0;
 	gettimeofday(&clock, &zone);
-	localclock = localtime( &clock.tv_sec );
+	clock_sec = clock.tv_sec;
+	localclock = localtime(&clock_sec);
 	(void)snprintf(line_buf[i], N_CHARS, " ");
 	sizes[i] = strlen(line_buf[i]);
 	max_size = max(max_size, sizes[i]);
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index 2160bcc33a65..9c2227f8bbd1 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -106,8 +106,8 @@ The options are:
 .It Fl l
 Log all requests using
 .Xr syslog 3 
-with the facility of LOG_FTP.  Note: Logging of LOG_FTP messages 
-will also need to be enabled in the syslog configuration file
+with the facility of LOG_FTP.  Note: Logging of LOG_FTP messages
+will also need to be enabled in the syslog configuration file 
 .Xr syslog.conf 5 .
 .It Fl n
 Suppress negative acknowledgement of requests for nonexistent
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index ee251d4de4ac..342ddf7ecd94 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: tftpd.c,v 1.4.2.4 1997/12/18 07:31:37 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -122,8 +122,8 @@ main(argc, argv)
 	char *chroot_dir = NULL;
 	struct passwd *nobody;
 
-	openlog("tftpd", LOG_PID, LOG_FTP);
-	while ((ch = getopt(argc, argv, "lns:")) !=  -1) {
+	openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
+	while ((ch = getopt(argc, argv, "lns:")) != -1) {
 		switch (ch) {
 		case 'l':
 			logging = 1;
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 138973884bc3..03cae804f581 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uucpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: uucpd.c,v 1.7.2.3 1997/12/18 07:32:42 charnier Exp $";
+	"$Id: uucpd.c,v 1.7.2.4 1998/03/06 01:49:10 jkh Exp $";
 #endif /* not lint */
 
 /*
@@ -236,7 +236,7 @@ void dologout(void)
 	char line[32];
 
 	while ((pid=wait((int *)&status)) > 0) {
-		sprintf(line, "uucp%ld", pid);
+		sprintf(line, "uucp%ld", (long)pid);
 		logwtmp(line, "", "");
 	}
 }
@@ -261,7 +261,7 @@ void dologin(struct passwd *pw, struct sockaddr_in *sin)
 		    sizeof (remotehost));
 	remotehost[sizeof remotehost - 1] = '\0';
 	/* hack, but must be unique and no tty line */
-	sprintf(line, "uucp%ld", getpid());
+	sprintf(line, "uucp%ld", (long)getpid());
 	time(&cur_time);
 	if ((f = open(_PATH_LASTLOG, O_RDWR)) >= 0) {
 		struct lastlog ll;
diff --git a/libexec/xtend/xtend.8 b/libexec/xtend/xtend.8
index 8005791e9e8c..2c617be5de2b 100644
--- a/libexec/xtend/xtend.8
+++ b/libexec/xtend/xtend.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: xtend.8,v 1.4.2.1 1997/12/18 07:37:46 charnier Exp $
+.\"	$Id: xtend.8,v 1.4.2.2 1998/03/06 01:49:59 jkh Exp $
 .\"
 .Th XTEND 8 "30 Oct 1993"
 .Dd Oct 30, 1993
@@ -179,5 +179,5 @@ does the best it can at trying to track device status, but there is
 usually no way it can tell when a device has been operated manually.
 This is due to the fact that most X-10 devices are not able to
 respond to queries about their status.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Eugene W. Stark Aq stark@cs.sunysb.edu
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 11989f96ce14..94e1a528443c 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ypxfr.8,v 1.3 1996/06/05 05:42:47 wpaul Exp $
+.\"	$Id: ypxfr.8,v 1.3.2.1 1997/12/19 07:35:33 charnier Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
@@ -285,7 +285,7 @@ domain.
 .El
 .Sh SEE ALSO
 .Xr yp 4 ,
-.Xr ypserv 8 ,
-.Xr yppush 8
-.Sh AUTHOR
-.An Bill Paul  Aq wpaul@ctr.columbia.edu
+.Xr yppush 8 ,
+.Xr ypserv 8
+.Sh AUTHORS
+.An Bill Paul Aq wpaul@ctr.columbia.edu