Imported Debian patch 1.2.2-1

[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
index 997c3aff5edb16474dccd33dd5916e61af47aa6e..ecb2bb1e959eb0a8062450384b506b6d91a41108 100644 (file)
--- a/debian/patches/11-532048-reduce-verbosity.patch
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -13,9 +13,9 @@ 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, 
+--- a/utils/gssd/gssd_proc.c   2010-02-18 23:35:00.000000000 +1100
++++ b/utils/gssd/gssd_proc.c   2010-04-06 16:43:55.000000000 +1000
+@@ -638,7 +638,7 @@ do_error_downcall(int k5_fd, uid_t uid, 
        unsigned int timeout = 0;
        int     zero = 0;
  
@@ -24,16 +24,16 @@ Steve Langasek <steve.langasek@canonical.com>
  
        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;
+@@ -906,7 +906,7 @@ process_krb5_upcall(struct clnt_info *cl
        int                     create_resp = -1;
+       int                     err, downcall_err = -EACCES;
  
--      printerr(1, "handling krb5 upcall\n");
-+      printerr(2, "handling krb5 upcall\n");
+-      printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);
++      printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
  
-       token.length = 0;
-       token.value = NULL;
-@@ -949,7 +949,7 @@ handle_spkm3_upcall(struct clnt_info *cl
+       if (tgtname) {
+               if (clp->servicename) {
+@@ -1066,7 +1066,7 @@ process_spkm3_upcall(struct clnt_info *c
        }
  
        if (!authgss_get_private_data(auth, &pd)) {
@@ -42,8 +42,8 @@ Steve Langasek <steve.langasek@canonical.com>
                            "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
+--- a/utils/gssd/gss_util.c    2010-02-18 23:35:00.000000000 +1100
++++ b/utils/gssd/gss_util.c    2010-04-06 16:43:55.000000000 +1000
 @@ -126,7 +126,7 @@ display_status_1(char *m, u_int32_t code
                                "gss_display_status called from %s\n", m);
                        break;