From: neilbrown <neilbrown>
Date: Fri, 11 Oct 2002 06:17:20 +0000 (+0000)
Subject: See ChangeLog
X-Git-Tag: nfs-utils-1-0-2-pre4~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=955d48dbcf0c75f263f2573c998acc65f95ededa;hp=cf9569df886a4eda5ae55e5be3bce92c8f143373

See ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 46b4899..3f957ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-11  Juan Gomez  <gomez@cs.sjsu.edu>
+	NeilBrown <neilb@cse.unsw.edu.au>
+
+	utils/statd/statd.c(killer): don't pmap_unset if in notify_only mode
+	utils/statd/statd.c(main): don't pmap_unset if in notify_only mode
+	
 2002-09-16  Chip Salzenberg  <chip@pobox.com>
 
 	* utils/rquotad/rquota_svc.c (main): Use int for value of getopt.
diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index b1e7304..127e258 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -93,7 +93,9 @@ static void
 killer (int sig)
 {
 	log (L_FATAL, "Caught signal %d, un-registering and exiting.", sig);
-	pmap_unset (SM_PROG, SM_VERS);
+	if (!(run_mode & MODE_NOTIFY_ONLY))
+		pmap_unset (SM_PROG, SM_VERS);
+
 	exit (0);
 }
 
@@ -307,7 +309,14 @@ int main (int argc, char **argv)
 	statd_get_socket(out_port);
 
 	for (;;) {
-		pmap_unset (SM_PROG, SM_VERS);
+		if (!(run_mode & MODE_NOTIFY_ONLY)) {
+			/* Do not do pmap_unset() when running in notify mode.
+			 * We may clear the portmapper record for a statd not
+			 * running in notify mode disabling it.
+			 * Juan C. Gomez j_carlos_gomez@yahoo.com
+			 */
+			pmap_unset (SM_PROG, SM_VERS);
+		}
 		change_state ();
 		shuffle_dirs ();	/* Move directory names around */
 		notify_hosts ();	/* Send out notify requests */