Refresh 11-532048-reduce-verbosity.
[nfs-utils.git] / debian / patches / 11-532048-reduce-verbosity.patch
1 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532048
2
3 The nfs-utils package in Ubuntu has been patched to reduce the default log
4 verbosity in the case of expired Kerberos credentials, for the reasons
5 described here:
6
7 https://bugs.launchpad.net/ubuntu/+source/nfs-utils/+bug/293705
8
9 Please consider applying the attached patch to Debian as well.
10
11 Andrew Pollock said he was submitting this patch upstream, but there doesn't
12 seem to be any evidence that it's been included yet in 1.2.0.
13
14 Steve Langasek <steve.langasek@canonical.com>
15
16 Index: nfs-utils/utils/gssd/gssd_proc.c
17 ===================================================================
18 --- nfs-utils.orig/utils/gssd/gssd_proc.c       2013-05-10 08:50:57.000000000 +0000
19 +++ nfs-utils/utils/gssd/gssd_proc.c    2013-05-10 08:50:57.000000000 +0000
20 @@ -714,7 +714,7 @@
21         unsigned int timeout = 0;
22         int     zero = 0;
23  
24 -       printerr(1, "doing error downcall\n");
25 +       printerr(2, "doing error downcall\n");
26  
27         if (WRITE_BYTES(&p, end, uid)) goto out_err;
28         if (WRITE_BYTES(&p, end, timeout)) goto out_err;
29 @@ -978,7 +978,7 @@
30         gss_cred_id_t           gss_cred;
31         OM_uint32               maj_stat, min_stat, lifetime_rec;
32  
33 -       printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
34 +       printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
35  
36         token.length = 0;
37         token.value = NULL;
38 @@ -1082,7 +1082,7 @@
39         }
40  
41         if (!authgss_get_private_data(auth, &pd)) {
42 -               printerr(1, "WARNING: Failed to obtain authentication "
43 +               printerr(2, "WARNING: Failed to obtain authentication "
44                             "data for user with uid %d for server %s\n",
45                          uid, clp->servername);
46                 goto out_return_error;
47 Index: nfs-utils/utils/gssd/gss_util.c
48 ===================================================================
49 --- nfs-utils.orig/utils/gssd/gss_util.c        2013-05-10 08:50:57.000000000 +0000
50 +++ nfs-utils/utils/gssd/gss_util.c     2013-05-10 08:50:57.000000000 +0000
51 @@ -126,7 +126,7 @@
52                                 "gss_display_status called from %s\n", m);
53                         break;
54                 } else {
55 -                       printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
56 +                       printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
57                             typestr, m, (char *)msg.value);
58                 }
59