2000-12-10 Chip Salzenberg <chip@valinux.com>

	* utils/statd/monitor.c (sm_mon_1_svc): Fix buggy check for
	program and procedure numbers of kernel lockd's callback.  Also,
	besides the old (and broken) procedure #24, allow #16 per Trond.

diff --git a/ChangeLog b/ChangeLog
index 9f178630503cc28edf562a2cbf8877c5f922eac1..00a5ac08bdbf9fd65f8223cc9f680b8e4f2e0cfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-10  Chip Salzenberg  <chip@valinux.com>
+
+       * utils/statd/monitor.c (sm_mon_1_svc): Fix buggy check for
+       program and procedure numbers of kernel lockd's callback.  Also,
+       besides the old (and broken) procedure #24, allow #16 per Trond.
+
 2000-12-03  Chip Salzenberg  <chip@valinux.com>
 
        * support/nfs/xio.c (xfopen): Initialize x_line to one, not zero.

diff --git a/utils/statd/monitor.c b/utils/statd/monitor.c
index 879e583036ebe437bc7e058045586bc1e539238b..27c409f97abaf473a148107cf1fa49d89722e10d 100644 (file)
--- a/utils/statd/monitor.c
+++ b/utils/statd/monitor.c
@@ -71,12 +71,15 @@ sm_mon_1_svc(struct mon *argp, struct svc_req *rqstp)
         *      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
+        *      procedure number -- which, in fact, has now happened once.
+        *      There must be a better way....   XXX FIXME
         */
-       if (id->my_proc != 100021 && id->my_proc != 24) {
+       if (id->my_prog != 100021 ||
+           (id->my_proc != 16 && id->my_proc != 24))
+       {
                log(L_WARNING,
-                       "Attempt to register callback to service %d",
-                       id->my_proc);
+                       "Attempt to register callback to %d/%d",
+                       id->my_prog, id->my_proc);
                goto failure;
        }