c303c8bd6f65ba49cabec16b041cec72da31756b
[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 --- a/utils/gssd/gssd_proc.c    2010-02-18 23:35:00.000000000 +1100
17 +++ b/utils/gssd/gssd_proc.c    2010-04-06 16:43:55.000000000 +1000
18 @@ -638,7 +638,7 @@ do_error_downcall(int k5_fd, uid_t uid, 
19         unsigned int timeout = 0;
20         int     zero = 0;
21  
22 -       printerr(1, "doing error downcall\n");
23 +       printerr(2, "doing error downcall\n");
24  
25         if (WRITE_BYTES(&p, end, uid)) goto out_err;
26         if (WRITE_BYTES(&p, end, timeout)) goto out_err;
27 @@ -906,7 +906,7 @@ process_krb5_upcall(struct clnt_info *cl
28         int                     create_resp = -1;
29         int                     err, downcall_err = -EACCES;
30  
31 -       printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
32 +       printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
33  
34         if (tgtname) {
35                 if (clp->servicename) {
36 @@ -1066,7 +1066,7 @@ process_spkm3_upcall(struct clnt_info *c
37         }
38  
39         if (!authgss_get_private_data(auth, &pd)) {
40 -               printerr(1, "WARNING: Failed to obtain authentication "
41 +               printerr(2, "WARNING: Failed to obtain authentication "
42                             "data for user with uid %d for server %s\n",
43                          uid, clp->servername);
44                 goto out_return_error;
45 --- a/utils/gssd/gss_util.c     2010-02-18 23:35:00.000000000 +1100
46 +++ b/utils/gssd/gss_util.c     2010-04-06 16:43:55.000000000 +1000
47 @@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code
48                                 "gss_display_status called from %s\n", m);
49                         break;
50                 } else {
51 -                       printerr(0, "ERROR: GSS-API: (%s) error in %s(): %s\n",
52 +                       printerr(2, "ERROR: GSS-API: (%s) error in %s(): %s\n",
53                             typestr, m, (char *)msg.value);
54                 }
55