#ifdef lint not LINT

4 files changed, 24 insertions, 19 deletions

diff --git a/libexec/rpc.yppasswdd/rpc.yppasswdd.c b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
index 389963beddf..f1aad579fda 100644
--- a/libexec/rpc.yppasswdd/rpc.yppasswdd.c
+++ b/libexec/rpc.yppasswdd/rpc.yppasswdd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.yppasswdd.c,v 1.18 2004/09/14 23:50:25 deraadt Exp $	*/
+/*	$OpenBSD: rpc.yppasswdd.c,v 1.19 2006/04/02 01:29:29 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.18 2004/09/14 23:50:25 deraadt Exp $";
+#ifndef lint
+static char rcsid[] = "$OpenBSD: rpc.yppasswdd.c,v 1.19 2006/04/02 01:29:29 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
index 20083ac0069..1706810b77e 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_mkpw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppasswdd_mkpw.c,v 1.27 2004/04/20 23:21:23 millert Exp $	*/
+/*	$OpenBSD: yppasswdd_mkpw.c,v 1.28 2006/04/02 01:29:29 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: yppasswdd_mkpw.c,v 1.27 2004/04/20 23:21:23 millert Exp $";
+#ifndef lint
+static char rcsid[] = "$OpenBSD: yppasswdd_mkpw.c,v 1.28 2006/04/02 01:29:29 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
diff --git a/libexec/rpc.yppasswdd/yppasswdd_proc.c b/libexec/rpc.yppasswdd/yppasswdd_proc.c
index d7552ffe36e..07dede8d04e 100644
--- a/libexec/rpc.yppasswdd/yppasswdd_proc.c
+++ b/libexec/rpc.yppasswdd/yppasswdd_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppasswdd_proc.c,v 1.11 2004/09/14 23:50:25 deraadt Exp $	*/
+/*	$OpenBSD: yppasswdd_proc.c,v 1.12 2006/04/02 01:29:29 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.11 2004/09/14 23:50:25 deraadt Exp $";
+#ifndef lint
+static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.12 2006/04/02 01:29:29 deraadt Exp $";
 #endif
 
 #include <sys/types.h>
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index f843dc2691e..0987f2417f6 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.52 2004/02/20 11:57:17 henning Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.53 2006/04/02 01:29:51 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef LINT
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.52 2004/02/20 11:57:17 henning Exp $";
+#ifndef lint
+static char rcsid[] = "$OpenBSD: ypbind.c,v 1.53 2006/04/02 01:29:51 deraadt Exp $";
 #endif
 
 #include <sys/param.h>
@@ -123,6 +123,7 @@ u_int32_t unique_xid(struct _dom_binding *ypdb);
  * declare sun's interface insufficient and roll our own.
  */
 
+/*ARGSUSED*/
 static void *
 ypbindproc_null_2x(SVCXPRT *transp, void *argp, CLIENT *clnt)
 {
@@ -132,6 +133,7 @@ ypbindproc_null_2x(SVCXPRT *transp, void *argp, CLIENT *clnt)
 	return (void *)&res;
 }
 
+/*ARGSUSED*/
 static struct ypbind_resp *
 ypbindproc_domain_2x(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 {
@@ -214,6 +216,7 @@ ypbindproc_domain_2x(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 	return &res;
 }
 
+/*ARGSUSED*/
 static bool_t *
 ypbindproc_setdom_2x(SVCXPRT *transp, struct ypbind_setdom *argp, CLIENT *clnt)
 {
@@ -429,7 +432,7 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 		(void)setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, &one,
-		    sizeof one);
+		    (socklen_t)sizeof one);
 		len = sizeof(sin);
 		if (getsockname(udptransp->xp_sock, (struct sockaddr *)&sin,
 		    &len) == -1) {
@@ -453,7 +456,7 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 		(void)setsockopt(lsock, SOL_SOCKET, SO_REUSEADDR, &one,
-		    sizeof one);
+		    (socklen_t)sizeof one);
 		len = sizeof(sin);
 		if (getsockname(tcptransp->xp_sock, (struct sockaddr *)&sin,
 		    &len) == -1) {
@@ -494,7 +497,8 @@ main(int argc, char *argv[])
 
 	fcntl(rpcsock, F_SETFL, fcntl(rpcsock, F_GETFL, 0) | FNDELAY);
 	fcntl(pingsock, F_SETFL, fcntl(pingsock, F_GETFL, 0) | FNDELAY);
-	setsockopt(rpcsock, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one));
+	setsockopt(rpcsock, SOL_SOCKET, SO_BROADCAST, &one,
+	    (socklen_t)sizeof(one));
 	rmtca.prog = YPPROG;
 	rmtca.vers = YPVERS;
 	rmtca.proc = YPPROC_DOMAIN_NONACK;
@@ -663,7 +667,7 @@ ping(struct _dom_binding *ypdb)
 	ypdb->dom_alive = 2;
 	if (sendto(pingsock, buf, outlen, 0,
 	    (struct sockaddr *)&ypdb->dom_server_addr,
-	    sizeof ypdb->dom_server_addr) < 0)
+	    (socklen_t)sizeof ypdb->dom_server_addr) < 0)
 		perror("sendto");
 	return 0;
 
@@ -742,7 +746,7 @@ pings(struct _dom_binding *ypdb)
 		bindsin.sin_port = htons(PMAPPORT);
 		bindsin.sin_addr = ypdb->dom_server_addr.sin_addr;
 		if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bindsin,
-		    sizeof bindsin) < 0)
+		    (socklen_t)sizeof bindsin) < 0)
 			perror("sendto");
 	}
 	if (ypdb->dom_servlistfp)
@@ -789,7 +793,7 @@ broadcast(struct _dom_binding *ypdb, char *buf, int outlen)
 
 		bindsin.sin_addr = in;
 		if (sendto(rpcsock, buf, outlen, 0, (struct sockaddr *)&bindsin,
-		    bindsin.sin_len) < 0)
+		    (socklen_t)bindsin.sin_len) < 0)
 			perror("sendto");
 	}
 	freeifaddrs(ifap);
@@ -845,7 +849,8 @@ direct(struct _dom_binding *ypdb, char *buf, int outlen)
 			memmove(&bindsin.sin_addr, hp->h_addr_list[0],
 			    hp->h_length);
 			if (sendto(rpcsock, buf, outlen, 0,
-			    (struct sockaddr *)&bindsin, sizeof bindsin) < 0) {
+			    (struct sockaddr *)&bindsin,
+			    (socklen_t)sizeof bindsin) < 0) {
 				perror("sendto");
 				continue;
 			}