Bug#389557: remove rpc.idmapd and rpc.gssd pid file checks from nfs4mount.c

[Steinar H. Gunderson]

Version: 1:1.1.0-10

On Tue, Jan 30, 2007 at 10:14:51PM -0500, Robert Edmonds wrote:
 The attached patch removes them.

This seems to have been already fixed in the new mount.nfs, so I'm marking it
as closed.

/* Steinar */
-- 
Homepage: http://www.sesse.net/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]

Bug#389557: remove rpc.idmapd and rpc.gssd pid file checks from nfs4mount.c

[Robert Edmonds]

The attached patch removes them.

-- 
Robert Edmonds
[EMAIL PROTECTED]
diff -Nru util-linux-2.12r.orig/debian/patches/00list 
util-linux-2.12r/debian/patches/00list
--- util-linux-2.12r.orig/debian/patches/00list 2007-01-30 21:59:21.0 
-0500
+++ util-linux-2.12r/debian/patches/00list  2007-01-30 22:01:02.0 
-0500
@@ -15,6 +15,7 @@
 30nfs4-fix
 30nfs4-intr-default
 30nfs4-setclientid
+30nfs4-no-pid-checks
 30swsusp-resume
 #20xgethostname
 #50hurd
diff -Nru util-linux-2.12r.orig/debian/patches/30nfs4-no-pid-checks.dpatch 
util-linux-2.12r/debian/patches/30nfs4-no-pid-checks.dpatch
--- util-linux-2.12r.orig/debian/patches/30nfs4-no-pid-checks.dpatch
1969-12-31 19:00:00.0 -0500
+++ util-linux-2.12r/debian/patches/30nfs4-no-pid-checks.dpatch 2007-01-30 
22:04:33.0 -0500
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30nfs4-no-pid-checks by Robert S. Edmonds [EMAIL PROTECTED]
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Completely purge code used solely for checking pids for
+## DP: rpc.idmapd and rpc.gssd. See bug#389557.
+
[EMAIL PROTECTED]@
+--- util-linux-2.12r.orig/mount/nfs4mount.c2007-01-30 21:56:27.0 
-0500
 util-linux-2.12r/mount/nfs4mount.c 2007-01-30 21:57:01.0 -0500
+@@ -51,27 +51,6 @@
+ 
+ #include nls.h
+ 
+-#if defined(VAR_LOCK_DIR)
+-#define DEFAULT_DIR VAR_LOCK_DIR
+-#else
+-#define DEFAULT_DIR /var/run
+-#endif
+-
+-char *IDMAPLCK = DEFAULT_DIR /rpc.idmapd.pid;
+-#define idmapd_check() do { \
+-  if (access(IDMAPLCK, F_OK)) { \
+-  printf(_(Warning: rpc.idmapd appears not to be running.\n \
+-   All uids will be mapped to the nobody 
uid.\n)); \
+-  } \
+-} while(0);
+-
+-char *GSSDLCK = DEFAULT_DIR /rpc.gssd.pid;
+-#define gssd_check() do { \
+-  if (access(GSSDLCK, F_OK)) { \
+-  printf(_(Warning: rpc.gssd appears not to be 
running.\n)); \
+-  } \
+-} while(0); 
+-
+ #ifndef NFS_PORT
+ #define NFS_PORT 2049
+ #endif
+@@ -358,22 +337,9 @@
+   | (nocto ? NFS4_MOUNT_NOCTO : 0)
+   | (noac ? NFS4_MOUNT_NOAC : 0);
+ 
+-  /*
+-   * Give a warning if the rpc.idmapd daemon is not running
+-   */
+-  idmapd_check();
+-
+   if (num_flavour == 0)
+   pseudoflavour[num_flavour++] = AUTH_UNIX;
+-  else {
+-  /*
+-   * ditto with rpc.gssd daemon
+-   */
+-  /*
+-   * The latest nfs-common doesn't create pid files at all.
+-   */
+-  /* gssd_check(); */
+-  }
++
+   data.auth_flavourlen = num_flavour;
+   data.auth_flavours = pseudoflavour;
+ 


signature.asc
Description: Digital signature