[src/netbsd-7]: src/usr.sbin/mountd Pull up following revision(s) (requested ...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d6e165d235e
branches:  netbsd-7
changeset: 799546:9d6e165d235e
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Aug 06 21:59:04 2015 +0000

description:
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.

diffstat:

 usr.sbin/mountd/mountd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r d9b6727a588e -r 9d6e165d235e usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c  Thu Aug 06 21:57:28 2015 +0000
+++ b/usr.sbin/mountd/mountd.c  Thu Aug 06 21:59:04 2015 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -42,7 +42,7 @@
 #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 */
 
@@ -336,7 +336,6 @@
                (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);
@@ -463,6 +462,7 @@
                (void)signal(SIGINT, SIG_IGN);
                (void)signal(SIGQUIT, SIG_IGN);
        }
+       pidfile(NULL);
        svc_run();
        syslog(LOG_ERR, "Mountd died");
        exit(1);