use more socklen_t; pvalchev

7 files changed, 31 insertions, 24 deletions

diff --git a/usr.sbin/amd/amd/rpc_fwd.c b/usr.sbin/amd/amd/rpc_fwd.c
index 383917f250a..fc067b0c026 100644
--- a/usr.sbin/amd/amd/rpc_fwd.c
+++ b/usr.sbin/amd/amd/rpc_fwd.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rpc_fwd.c	8.1 (Berkeley) 6/6/93
- *	$Id: rpc_fwd.c,v 1.5 2002/08/05 07:24:26 pvalchev Exp $
+ *	$Id: rpc_fwd.c,v 1.6 2002/09/06 19:46:52 deraadt Exp $
  */
 
 /*
@@ -328,7 +328,7 @@ fwd_reply()
 	int rc;
 	rpc_forward *p;
 	struct sockaddr_in src_addr;
-	int src_addr_len;
+	socklen_t src_addr_len;
 
 	/*
 	 * Determine the length of the packet
@@ -357,7 +357,7 @@ fwd_reply()
 again:
 	src_addr_len = sizeof(src_addr);
 	rc = recvfrom(fwd_sock, (char *) pkt, len, 0,
-			(struct sockaddr *) &src_addr, &src_addr_len);
+	    (struct sockaddr *) &src_addr, &src_addr_len);
 	if (rc < 0 || src_addr_len != sizeof(src_addr) ||
 			src_addr.sin_family != AF_INET) {
 		if (rc < 0 && errno == EINTR)
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index d5a4c056327..a0f6b55bbda 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmd.c,v 1.26 2002/07/04 07:31:16 deraadt Exp $	*/
+/*	$OpenBSD: apmd.c,v 1.27 2002/09/06 19:46:52 deraadt Exp $	*/
 
 /*
  *  Copyright (c) 1995, 1996 John T. Kohl
@@ -211,7 +211,7 @@ handle_client(int sock_fd, int ctl_fd)
 	/* accept a handle from the client, process it, then clean up */
 	int cli_fd;
 	struct sockaddr_un from;
-	int fromlen;
+	socklen_t fromlen;
 	struct apm_command cmd;
 	struct apm_reply reply;
 
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 5a0bcc5517f..45d56d4dfed 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.106 2002/07/20 18:01:18 deraadt Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.107 2002/09/06 19:46:52 deraadt Exp $	*/
 /*	$NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $	*/
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)inetd.c	5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.106 2002/07/20 18:01:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.107 2002/09/06 19:46:52 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -1660,7 +1660,8 @@ void
 echo_dg(int s, struct servtab *sep)
 {
 	char buffer[BUFSIZE];
-	int i, size;
+	int i;
+	socklen_t size;
 	struct sockaddr_storage ss;
 
 	size = sizeof(ss);
@@ -1749,7 +1750,8 @@ chargen_dg(int s, struct servtab *sep)
 {
 	struct sockaddr_storage ss;
 	static char *rs;
-	int len, size;
+	int len;
+	socklen_t size;
 	char text[LINESIZ+2];
 
 	if (endring == 0) {
@@ -1813,7 +1815,7 @@ machtime_dg(int s, struct servtab *sep)
 {
 	u_int32_t result;
 	struct sockaddr_storage ss;
-	int size;
+	socklen_t size;
 
 	size = sizeof(ss);
 	if (recvfrom(s, (char *)&result, sizeof(result), 0,
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index bc66f6dc2e3..7a4da2e2b46 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.37 2002/06/23 03:07:19 deraadt Exp $ */
+/*	$OpenBSD: lpd.c,v 1.38 2002/09/06 19:46:52 deraadt Exp $ */
 /*	$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)lpd.c	8.7 (Berkeley) 5/10/95";
 #else
-static const char rcsid[] = "$OpenBSD: lpd.c,v 1.37 2002/06/23 03:07:19 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: lpd.c,v 1.38 2002/09/06 19:46:52 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -344,7 +344,8 @@ main(int argc, char **argv)
 	memset(&frominet, 0, sizeof(frominet));
 	memset(&fromunix, 0, sizeof(fromunix));
 	for (;;) {
-		int domain, nfds, s, fromlen;
+		int domain, nfds, s;
+		socklen_t fromlen;
 		fd_set readfds;
 		short sleeptime = 10;	/* overflows in about 2 hours */
 
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 04a7c1e8b7f..e61cb0d5af5 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "@(#)rwhod.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: rwhod.c,v 1.24 2002/07/14 03:52:35 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwhod.c,v 1.25 2002/09/06 19:46:52 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -237,7 +237,8 @@ handleread(int s)
 	struct stat st;
 	char path[64];
 	struct whod wd;
-	int cc, whod, len = sizeof(from);
+	int cc, whod;
+	socklen_t len = sizeof(from);
 
 	cc = recvfrom(s, (char *)&wd, sizeof(struct whod), 0,
 	    (struct sockaddr *)&from, &len);
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index b96122d88fb..622f91cddf5 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.56 2002/08/08 23:07:12 aaron Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.57 2002/09/06 19:46:52 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-static char rcsid[] = "$OpenBSD: syslogd.c,v 1.56 2002/08/08 23:07:12 aaron Exp $";
+static char rcsid[] = "$OpenBSD: syslogd.c,v 1.57 2002/09/06 19:46:52 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -229,10 +229,10 @@ int funix[MAXFUNIX];
 int
 main(int argc, char *argv[])
 {
-	int ch, i, fklog, len, linesize, fdsrmax = 0;
+	int ch, i, fklog, linesize, fdsrmax = 0;
 	struct sockaddr_un sunx, fromunix;
 	struct sockaddr_in sin, frominet;
-	socklen_t slen;
+	socklen_t slen, len;
 	fd_set *fdsr = NULL;
 	char *p, *line;
 	FILE *fp;
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 05ec34f0d15..5a77fe99323 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.46 2002/07/20 12:14:51 deraadt Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.47 2002/09/06 19:46:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997,1998 Theo de Raadt <deraadt@OpenBSD.org>
@@ -35,7 +35,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.46 2002/07/20 12:14:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypbind.c,v 1.47 2002/09/06 19:46:53 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -344,7 +344,8 @@ main(int argc, char *argv[])
 	struct sockaddr_in sin;
 	struct timeval tv;
 	fd_set fdsr;
-	int width, lockfd, len, lsock;
+	int width, lockfd, lsock;
+	socklen_t len;
 	int evil = 0, one = 1;
 	DIR *dirp;
 	struct dirent *dent;
@@ -849,7 +850,8 @@ enum clnt_stat
 handle_replies(void)
 {
 	char buf[1400];
-	int fromlen, inlen;
+	int inlen;
+	socklen_t fromlen;
 	struct _dom_binding *ypdb;
 	struct sockaddr_in raddr;
 	struct rpc_msg msg;
@@ -899,7 +901,8 @@ enum clnt_stat
 handle_ping(void)
 {
 	char buf[1400];
-	int fromlen, inlen;
+	int inlen;
+	socklen_t fromlen;
 	struct _dom_binding *ypdb;
 	struct sockaddr_in raddr;
 	struct rpc_msg msg;