2001-01-25 H.J. Lu <hjl@lucon.org>

	* utils/lockd/lockd.c (main): Ignore errno == EINVAL.

diff --git a/ChangeLog b/ChangeLog
index 87074ea14149015a6fa10a0f476bd6d6f4d44967..6c280ba7f437eacfa76e315cb28f41b1176c812c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-25  H.J. Lu <hjl@lucon.org>
+
+       * utils/lockd/lockd.c (main): Ignore errno == EINVAL.
+
 2001-01-20  Chip Salzenberg  <chip@valinux.com>
 
        * support/include/xio.h (xgetc): Declare to return int.

diff --git a/utils/lockd/lockd.c b/utils/lockd/lockd.c
index 05bc99938986879cfdd76b8cfeeb212ca02c1c16..900510b606e2321019503c0b12d810e346111e25 100644 (file)
--- a/utils/lockd/lockd.c
+++ b/utils/lockd/lockd.c
@@ -9,6 +9,7 @@
 #include "config.h"
 
 #include <stdio.h>
+#include <errno.h>
 #include "nfslib.h"
 
 static void    usage(const char *);
@@ -21,8 +22,14 @@ main(int argc, char **argv)
        if (argc > 1)
                usage (argv [0]);
 
-       if ((error = lockdsvc()) < 0)
-               perror("lockdsvc");
+       if ((error = lockdsvc()) < 0) {
+               if (errno == EINVAL)
+                       /* Ignore EINVAL since kernel may start
+                          lockd automatically. */
+                       error = 0;
+               else
+                       perror("lockdsvc");
+       }
 
        return (error != 0);
 }