Imported Debian patch 1.2.0-2

[nfs-utils.git] / debian / patches / 11-532048-reduce-verbosity.patch

diff --git a/debian/patches/11-532048-reduce-verbosity.patch b/debian/patches/11-532048-reduce-verbosity.patch
new file mode 100644 (file)
index 0000000..997c3af
--- /dev/null
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -0,0 +1,55 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532048
+
+The nfs-utils package in Ubuntu has been patched to reduce the default log
+verbosity in the case of expired Kerberos credentials, for the reasons
+described here:
+
+https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/293705
+
+Please consider applying the attached patch to Debian as well.
+
+Andrew Pollock said he was submitting this patch upstream, but there doesn't
+seem to be any evidence that it's been included yet in 1.2.0.
+
+Steve Langasek <steve.langasek@canonical.com>
+
+--- a/utils/gssd/gssd_proc.c   2009-06-03 00:43:05.000000000 +1000
++++ b/utils/gssd/gssd_proc.c   2009-06-09 11:04:24.000000000 +1000
+@@ -548,7 +548,7 @@ do_error_downcall(int k5_fd, uid_t uid, 
+       unsigned int timeout = 0;
+       int     zero = 0;
+ 
+-      printerr(1, "doing error downcall\n");
++      printerr(2, "doing error downcall\n");
+ 
+       if (WRITE_BYTES(&p, end, uid)) goto out_err;
+       if (WRITE_BYTES(&p, end, timeout)) goto out_err;
+@@ -816,7 +816,7 @@ handle_krb5_upcall(struct clnt_info *clp
+       char                    **dirname;
+       int                     create_resp = -1;
+ 
+-      printerr(1, "handling krb5 upcall\n");
++      printerr(2, "handling krb5 upcall\n");
+ 
+       token.length = 0;
+       token.value = NULL;
+@@ -949,7 +949,7 @@ handle_spkm3_upcall(struct clnt_info *cl
+       }
+ 
+       if (!authgss_get_private_data(auth, &pd)) {
+-              printerr(0, "WARNING: Failed to obtain authentication "
++              printerr(2, "WARNING: Failed to obtain authentication "
+                           "data for user with uid %d for server %s\n",
+                        uid, clp->servername);
+               goto out_return_error;
+--- a/utils/gssd/gss_util.c    2009-06-03 00:43:05.000000000 +1000
++++ b/utils/gssd/gss_util.c    2009-06-09 11:04:24.000000000 +1000
+@@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code
+                               "gss_display_status called from %s\n", m);
+                       break;
+               } else {
+-                      printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
++                      printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
+                           typestr, m, (char *)msg.value);
+               }
+