X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fstatd%2Fstatd.c;h=091ced9316e9220408fb7799004c297b8c0fd9ec;hb=4f7fc41f6324daad94c37e9327567d27a0d50afe;hp=157de853bf5aa4fbab1d6cc655f40beb6b806bca;hpb=3482b1145c2c9a39f1dcaabc32e36eb234b91447;p=nfs-utils.git

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index 157de85..091ced9 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -230,12 +230,10 @@ static void run_sm_notify(int outport)
 		av[ac++] = op;
 	}
 	if (run_mode & STATIC_HOSTNAME) {
-		av[ac++] = "-N";
+		av[ac++] = "-v";
 		av[ac++] = MY_NAME;
 	}
 	av[ac] = NULL;
-	fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n",
-		name_p);
 	execv(av[0], av);
 	fprintf(stderr, "%s: failed to run %s\n", name_p, av[0]);
 	exit(2);
@@ -251,7 +249,6 @@ int main (int argc, char **argv)
 	int arg;
 	int port = 0, out_port = 0;
 	struct rlimit rlim;
-	int once = 1;
 
 	int pipefds[2] = { -1, -1};
 	char status;
@@ -369,8 +366,11 @@ int main (int argc, char **argv)
 		exit(-1);
 	}
 
-	if (run_mode & MODE_NOTIFY_ONLY)
+	if (run_mode & MODE_NOTIFY_ONLY) {
+		fprintf(stderr, "%s: -N deprecated, consider using /usr/sbin/sm-notify directly\n",
+			name_p);
 		run_sm_notify(out_port);
+	}
 
 
 	if (!(run_mode & MODE_NODAEMON)) {
@@ -475,25 +475,31 @@ int main (int argc, char **argv)
 			waitpid(pid, NULL, 0);
 		}
 
+	/* Make sure we have a privilege port for calling into the kernel */
+	statd_get_socket();
 
-	for (;;) {
-		pmap_unset (SM_PROG, SM_VERS);
+	/* If sm-notify didn't take all the state files, load
+	 * state information into our notify-list so we can
+	 * pass on any SM_NOTIFY that arrives
+	 */
+	load_state();
 
-		/* If we got this far, we have successfully started, so notify parent */
-		if (pipefds[1] > 0) {
-			status = 0;
-			write(pipefds[1], &status, 1);
-			close(pipefds[1]);
-			pipefds[1] = -1;
-		}
+	pmap_unset (SM_PROG, SM_VERS);
 
-		/* this registers both UDP and TCP services */
-		rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port);
+	/* this registers both UDP and TCP services */
+	rpc_init("statd", SM_PROG, SM_VERS, sm_prog_1, port);
 
-		if (once) {
-			once = 0;
-			drop_privs();
-		}
+	/* If we got this far, we have successfully started, so notify parent */
+	if (pipefds[1] > 0) {
+		status = 0;
+		write(pipefds[1], &status, 1);
+		close(pipefds[1]);
+		pipefds[1] = -1;
+	}
+
+	drop_privs();
+
+	for (;;) {
 		/*
 		 * Handle incoming requests:  SM_NOTIFY socket requests, as
 		 * well as callbacks from lockd.