From: chip <chip>
Date: Thu, 25 Nov 1999 04:08:35 +0000 (+0000)
Subject: Accept lockd callbacks to the new port 24 as well as the historical
X-Git-Tag: nfs-utils-0-1-3~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=60c666b82d5b193ead1eae2d16d6d07e94b4adb8;p=nfs-utils.git

Accept lockd callbacks to the new port 24 as well as the historical
port 100021.
---

diff --git a/ChangeLog b/ChangeLog
index 823ea42..6a86cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
+1999-11-24  Chip Salzenberg  <chip@valinux.com>
+
+	* utils/statd/monitor.c (sm_mon_1_svc): Accept lockd callbacks to
+	the new port 24 as well as the historical port 100021.
+
 Tue Nov 23 10:21:34 EST 1999 Neil Brown <neilb@cse.unsw.edu.au>
+
 	* etc/redhat/nfsd.init (stop) : moved exportfs -ua after stopping
 	       nfsd to stop spurious ESTALE on server shutdown.
 	
diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index 5a782dc..879e583 100644
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -67,10 +67,13 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
 	my_name = "127.0.0.1";
 
 	/* 2.	Reject any registrations for non-lockd services.
+	 *
 	 *	This is specific to the linux kernel lockd, which
 	 *	makes the callback procedure part of the lockd interface.
+	 *	It is also prone to break when lockd changes its callback
+	 *	procedure number.  XXX FIXME
 	 */
-	if (id->my_proc != 100021) {
+	if (id->my_proc != 100021 && id->my_proc != 24) {
 		log(L_WARNING,
 			"Attempt to register callback to service %d",
 			id->my_proc);