diff -u nfs-utils-1.1.2/debian/changelog nfs-utils-1.1.2/debian/changelog --- nfs-utils-1.1.2/debian/changelog +++ nfs-utils-1.1.2/debian/changelog @@ -1,3 +1,9 @@ +nfs-utils (1:1.1.2-4ubuntu2) jaunty; urgency=low + + * Add patch to reduce verbosity (LP: #293705) + + -- Andrew Pollock Tue, 04 Nov 2008 09:38:48 -0800 + nfs-utils (1:1.1.2-4ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: diff -u nfs-utils-1.1.2/debian/patches/series nfs-utils-1.1.2/debian/patches/series --- nfs-utils-1.1.2/debian/patches/series +++ nfs-utils-1.1.2/debian/patches/series @@ -5,0 +6 @@ +101-reduce-verbosity.diff only in patch2: unchanged: --- nfs-utils-1.1.2.orig/debian/patches/101-reduce-verbosity.diff +++ nfs-utils-1.1.2/debian/patches/101-reduce-verbosity.diff @@ -0,0 +1,57 @@ +--- nfs-utils-1.1.2.orig/utils/gssd/gssd_proc.c ++++ nfs-utils-1.1.2/utils/gssd/gssd_proc.c +@@ -453,7 +453,7 @@ + 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; +@@ -677,7 +677,7 @@ + char **ccname; + int create_resp = -1; + +- printerr(1, "handling krb5 upcall\n"); ++ printerr(2, "handling krb5 upcall\n"); + + token.length = 0; + token.value = NULL; +@@ -743,7 +743,7 @@ + } + + 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; +only in patch2: +unchanged: +--- nfs-utils-1.1.2.orig/utils/gssd/err_util.c ++++ nfs-utils-1.1.2/utils/gssd/err_util.c +@@ -49,6 +49,10 @@ + { + va_list args; + ++ /* Decrease verbosity so we don't log so much */ ++ if ((priority - verbosity) > 1) ++ return; ++ + /* Don't bother formatting a message we're never going to print! */ + if (priority > verbosity) + return; +only in patch2: +unchanged: +--- nfs-utils-1.1.2.orig/utils/gssd/gss_util.c ++++ nfs-utils-1.1.2/utils/gssd/gss_util.c +@@ -122,7 +122,7 @@ + "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); + } +