From: Sascha Wildner <saw@online.de>
Date: Sun, 12 Apr 2009 18:22:23 +0000 (+0200)
Subject: rpc.lockd(8): Raise WARNS to 3 and fix warnings.
X-Git-Tag: v2.3.1~105
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/21eb4b7ebf4dd20025a62ca4cf52530d8cfaa5b1

rpc.lockd(8): Raise WARNS to 3 and fix warnings.
---

diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile
index 479cbe2399..75a2edea81 100644
--- a/usr.sbin/rpc.lockd/Makefile
+++ b/usr.sbin/rpc.lockd/Makefile
@@ -8,7 +8,7 @@ MLINKS=	rpc.lockd.8 lockd.8
 SRCS=	nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c
 
 CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc
-#WARNS?= 2
+WARNS?= 3
 
 DPADD=	${LIBRPCSVC} ${LIBUTIL}
 LDADD=	-lrpcsvc -lutil
diff --git a/usr.sbin/rpc.lockd/lock_proc.c b/usr.sbin/rpc.lockd/lock_proc.c
index f3e95446b2..ede52f6dd1 100644
--- a/usr.sbin/rpc.lockd/lock_proc.c
+++ b/usr.sbin/rpc.lockd/lock_proc.c
@@ -60,7 +60,6 @@
 #define	getrpcaddr(rqstp)	(struct sockaddr *)(svc_getrpccaller((rqstp)->rq_xprt)->buf)
 
 static void	log_from_addr(const char *, struct svc_req *);
-static void	log_netobj(netobj *obj);
 static int	addrcmp(struct sockaddr *, struct sockaddr *);
 
 /* log_from_addr ----------------------------------------------------------- */
diff --git a/usr.sbin/rpc.lockd/lockd_lock.c b/usr.sbin/rpc.lockd/lockd_lock.c
index 1c7ba582cf..dcf89a12df 100644
--- a/usr.sbin/rpc.lockd/lockd_lock.c
+++ b/usr.sbin/rpc.lockd/lockd_lock.c
@@ -80,6 +80,7 @@ struct file_lock {
 #define LKST_DYING	4 /* must dies when we get news from the child */
 
 void		lfree(struct file_lock *);
+void		sigchild_handler(int);
 enum nlm_stats	do_lock(struct file_lock *, int);
 enum nlm_stats	do_unlock(struct file_lock *);
 void		send_granted(struct file_lock *, int);
@@ -433,11 +434,11 @@ do_lock(struct file_lock *fl, int block)
 		syslog(LOG_NOTICE, "fstat failed (from %s): %s",
 		    fl->client_name, strerror(errno));
 	}
-	syslog(LOG_DEBUG, "lock from %s for file%s%s: dev %d ino %d (uid %d), "
+	syslog(LOG_DEBUG, "lock from %s for file%s%s: dev %d ino %ju (uid %d), "
 	    "flags %d",
 	    fl->client_name, fl->client.exclusive ? " (exclusive)":"",
 	    block ? " (block)":"",
-	    st.st_dev, st.st_ino, st.st_uid, fl->flags);
+	    st.st_dev, (uintmax_t)st.st_ino, st.st_uid, fl->flags);
 	lflags = LOCK_NB;
 	if (fl->client.exclusive == 0)
 		lflags |= LOCK_SH;