Merge lp:~ubuntu-branches/ubuntu/quantal/nfs-utils/quantal-201209281842 into lp:ubuntu/quantal/nfs-utils

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/quantal/nfs-utils reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/quantal/nfs-utils/quantal-201209281842. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

70. By Stéphane Graber on 2012-09-28

releasing version 1:1.2.6-3ubuntu2

69. By Stéphane Graber on 2012-09-28

Apply patch for bug #794112

=== added file 'debian/nfs-common.gssd-mounting.upstart'
--- debian/nfs-common.gssd-mounting.upstart	1970-01-01 00:00:00 +0000
+++ debian/nfs-common.gssd-mounting.upstart	2012-09-28 18:51:21 +0000
@@ -0,0 +1,57 @@
+# gssd-mounting
+
+description "Block the mounting event for NFS4 filesytems until gssd is running"
+author "Steve Langasek <[e-mail]>"
+
+instance $MOUNTPOINT
+
+start on mounting TYPE=nfs* OPTIONS=*sec*krb5*
+stop on started gssd or stopped gssd
+task
+
+# This is required so that the task is still considered
+# successful when it gets killed
+normal exit TERM
+
+script
+
+  DEFAULTFILE=/etc/default/nfs-common
+
+  if [ -f "$DEFAULTFILE" ]; then
+    . "$DEFAULTFILE"
+  fi
+
+  if [ -f /etc/fstab ]; then
+    exec 9<&0 </etc/fstab
+
+    while read DEV MTPT FSTYPE OPTS REST
+    do
+      case "$OPTS" in
+        sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+          AUTO_NEED_GSSD=yes
+          ;;
+      esac
+    done
+
+    exec 0<&9 9<&-
+  fi
+
+  case "$NEED_GSSD" in
+    yes|no)
+      ;;
+    *)
+      NEED_GSSD=$AUTO_NEED_GSSD
+      ;;
+  esac
+  [ "x$NEED_GSSD" = xyes ] || { stop; exit 0; }
+
+  status gssd | grep -q "start/running" && exit 0
+
+  # If it's already starting we'll get killed by the impending 'stop on
+  # started gssd' 
+  # If it wasn't already starting, we'll either get killed by the stop
+  # on started or stopped.
+  # So, its safe to sleep forever here and rely on upstart to kill us,
+
+  while sleep 3600; do :; done
+end script
 
=== renamed file 'debian/nfs-common.gssd-mounting.upstart' => 'debian/nfs-common.gssd-mounting.upstart.moved'
=== added file 'debian/nfs-common.idmapd-mounting.upstart'
--- debian/nfs-common.idmapd-mounting.upstart	1970-01-01 00:00:00 +0000
+++ debian/nfs-common.idmapd-mounting.upstart	2012-09-28 18:51:21 +0000
@@ -0,0 +1,27 @@
+# idmapd-mounting
+
+description "Block the mounting event for NFS4 filesytems until idmapd is running"
+author "Steve Langasek <[e-mail]>"
+
+instance $MOUNTPOINT
+
+start on mounting TYPE=nfs*
+stop on started idmapd or stopped idmapd
+task
+
+# This is required so that the task is still considered
+# successful when it gets killed
+normal exit TERM
+
+script
+
+  status idmapd | grep -q "start/running" && exit 0
+
+  # If it's already starting we'll get killed by the impending 'stop on
+  # started idmapd' 
+  # If it wasn't already starting, we'll either get killed by the stop
+  # on started or stopped.
+  # So, its safe to sleep forever here and rely on upstart to kill us,
+
+  while sleep 3600; do :; done
+end script
 
=== renamed file 'debian/nfs-common.idmapd-mounting.upstart' => 'debian/nfs-common.idmapd-mounting.upstart.moved'
=== added file 'debian/patches/20-ticket-expired-error.patch'
--- debian/patches/20-ticket-expired-error.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/20-ticket-expired-error.patch	2012-09-28 18:51:21 +0000
@@ -0,0 +1,71 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+--- a/utils/gssd/gssd.c
++++ b/utils/gssd/gssd.c
+@@ -63,6 +63,7 @@
+ int  root_uses_machine_creds = 1;
+ unsigned int  context_timeout = 0;
+ char *preferred_realm = NULL;
++int ticket_expiry_is_error = 0;
+ 
+ void
+ sig_die(int signal)
+@@ -85,7 +86,7 @@
+ static void
+ usage(char *progname)
+ {
+-	fprintf(stderr, "usage: %s [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n",
++	fprintf(stderr, "usage: %s [-e] [-f] [-l] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir] [-t timeout] [-R preferred realm]\n",
+ 		progname);
+ 	exit(1);
+ }
+@@ -102,8 +103,11 @@
+ 	char *progname;
+ 
+ 	memset(ccachesearch, 0, sizeof(ccachesearch));
+-	while ((opt = getopt(argc, argv, "fvrlmnMp:k:d:t:R")) != -1) {
++	while ((opt = getopt(argc, argv, "efvrlmnMp:k:d:t:R")) != -1) {
+ 		switch (opt) {
++			case 'e':
++				ticket_expiry_is_error = 1;
++				break;
+ 			case 'f':
+ 				fg = 1;
+ 				break;
+--- a/utils/gssd/gssd.h
++++ b/utils/gssd/gssd.h
+@@ -67,6 +67,7 @@
+ extern int			root_uses_machine_creds;
+ extern unsigned int 		context_timeout;
+ extern char			*preferred_realm;
++extern int			ticket_expiry_is_error;
+ 
+ TAILQ_HEAD(clnt_list_head, clnt_info) clnt_list;
+ 
+--- a/utils/gssd/gssd.man
++++ b/utils/gssd/gssd.man
+@@ -130,6 +130,12 @@
+ seconds, which allows changing Kerberos tickets and identities frequently.
+ The default is no explicit timeout, which means the kernel context will live
+ the lifetime of the Kerberos service ticket used in its creation.
++.TP
++.B -e
++Return EACCESS instead of EKEYEXPIRED when a user's credentials expire.
++Returning EKEYEXPIRED was introduced around kernel 2.6.34 and causes all nfs4
++I/O to block when a user's credentials expire. This option reverts to old
++bevavior.
+ .SH SEE ALSO
+ .BR rpc.svcgssd(8)
+ .SH AUTHORS
+--- a/utils/gssd/gssd_proc.c
++++ b/utils/gssd/gssd_proc.c
+@@ -1008,7 +1008,7 @@
+ 				free(userdir);
+ 				userdir = NULL;
+ 			}
+-			if (err == -EKEYEXPIRED)
++			if (err == -EKEYEXPIRED && !ticket_expiry_is_error)
+ 				downcall_err = -EKEYEXPIRED;
+ 			else if (!err)
+ 				create_resp = create_auth_rpc_client(clp, &rpc_clnt, &auth, uid,
 
=== renamed file 'debian/patches/20-ticket-expired-error.patch' => 'debian/patches/20-ticket-expired-error.patch.moved'