Thu Aug 6 21:59:04 2015 UTC ()

Pull up following revision(s) (requested by jnemeth in ticket #936):
	usr.sbin/mountd/mountd.c: revision 1.127
PR/50125 - Jarle Greipsland -- Incorrect PID in /var/run/mountd.pid
Move call to pidfile() after daemon() so that correct (child) pid is
written to pidfile.


(snj)

diff -r1.126 -r1.126.4.1 src/usr.sbin/mountd/mountd.c

--- src/usr.sbin/mountd/mountd.c 2014/04/04 12:45:59	1.126
+++ src/usr.sbin/mountd/mountd.c 2015/08/06 21:59:04	1.126.4.1

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: mountd.c,v 1.126 2014/04/04 12:45:59 gson Exp $	 */
+/* 	$NetBSD: mountd.c,v 1.126.4.1 2015/08/06 21:59:04 snj Exp $	 */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Herb Hasler and Rick Macklem at The University of Guelph.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif				/* not lint */
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mountd.c,v 1.126 2014/04/04 12:45:59 gson Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.126.4.1 2015/08/06 21:59:04 snj Exp $");
 #endif
 #endif				/* not lint */
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <syslog.h>
 #include <sys/ucred.h>
 #include <rpc/rpc.h>
 @@ -326,27 +326,26 @@ main(int argc, char **argv)
 	else
 		close(s);
 	if (debug)
 		(void)fprintf(stderr, "Getting export list.\n");
 	get_exportlist(0);
 	if (debug)
 		(void)fprintf(stderr, "Getting mount list.\n");
 	get_mountlist();
 	if (debug)
 		(void)fprintf(stderr, "Here we go.\n");
 	(void)signal(SIGHUP, get_exportlist);
 	(void)signal(SIGTERM, send_umntall);
 	pidfile(NULL);
 	rpcb_unset(RPCPROG_MNT, RPCMNT_VER1, NULL);
 	rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL);
 	udpsock  = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	tcpsock  = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	udp6sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	tcp6sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
 	/*
 	 * We're doing host-based access checks here, so don't allow
 	 * v4-in-v6 to confuse things. The kernel will disable it
 	 * by default on NFS sockets too.
 @@ -453,26 +452,27 @@ main(int argc, char **argv)
+	}
 	if (xcreated == 0) {
 		syslog(LOG_ERR, "could not create any services");
 		exit(1);
+	}
 	if (debug == 0) {
 		daemon(0, 0);
 		(void)signal(SIGINT, SIG_IGN);
 		(void)signal(SIGQUIT, SIG_IGN);
+	}
 	pidfile(NULL);
 	svc_run();
 	syslog(LOG_ERR, "Mountd died");
 	exit(1);
+}
 /*
  * The mount rpc service
  */
 void
 mntsrv(struct svc_req *rqstp, SVCXPRT *transp)
+{
 	struct exportlist *ep;
 	struct dirlist *dp;