Refresh 11-532048-reduce-verbosity.

[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..9b593c9be22ec8d549716a27bf1cef8e35d55b5d 100644 (file)
--- a/debian/patches/11-532048-reduce-verbosity.patch
+++ b/debian/patches/11-532048-reduce-verbosity.patch
@@ -13,9 +13,11 @@ 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, 
+Index: nfs-utils/utils/gssd/gssd_proc.c
+===================================================================
+--- nfs-utils.orig/utils/gssd/gssd_proc.c      2013-05-10 08:50:57.000000000 +0000
++++ nfs-utils/utils/gssd/gssd_proc.c   2013-05-10 08:50:57.000000000 +0000
+@@ -714,7 +714,7 @@
        unsigned int timeout = 0;
        int     zero = 0;
  
@@ -24,27 +26,29 @@ 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;
-       int                     create_resp = -1;
+@@ -978,7 +978,7 @@
+       gss_cred_id_t           gss_cred;
+       OM_uint32               maj_stat, min_stat, lifetime_rec;
  
--      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
+@@ -1082,7 +1082,7 @@
        }
  
        if (!authgss_get_private_data(auth, &pd)) {
--              printerr(0, "WARNING: Failed to obtain authentication "
+-              printerr(1, "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
+Index: nfs-utils/utils/gssd/gss_util.c
+===================================================================
+--- nfs-utils.orig/utils/gssd/gss_util.c       2013-05-10 08:50:57.000000000 +0000
++++ nfs-utils/utils/gssd/gss_util.c    2013-05-10 08:50:57.000000000 +0000
+@@ -126,7 +126,7 @@
                                "gss_display_status called from %s\n", m);
                        break;
                } else {