Accept lockd callbacks to the new port 24 as well as the historical

port 100021.

diff --git a/ChangeLog b/ChangeLog
index 823ea42db45654ebbbf5d44206f267bed0fc7320..6a86cf8732f43cb0de3d1b6772b5d990bb7a947c 100644 (file)
--- 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>
 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.
        
        * 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 5a782dcccc18a7046b39ba0bac7f4959964ed5ed..879e583036ebe437bc7e058045586bc1e539238b 100644 (file)
--- 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.
        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.
         *      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);
                log(L_WARNING,
                        "Attempt to register callback to service %d",
                        id->my_proc);