Turn down gssd's syslog verbosity

Modified-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index d316b4d11bb60c6bbd20e6a6cc2e88d6386028af..8a7bcaa4aadfeba4972d7530d48ddf7b4554a8d1 100644 (file)
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -145,6 +145,7 @@ display_status_2(char *m, u_int32_t major, u_int32_t minor, const gss_OID mech)
        char maj_buf[30], min_buf[30];
        char *maj, *min;
        u_int32_t msg_ctx = 0;
        char maj_buf[30], min_buf[30];
        char *maj, *min;
        u_int32_t msg_ctx = 0;

+       int msg_verbosity = 0;

 
        /* Get major status message */
        maj_stat1 = gss_display_status(&min_stat1, major,
 
        /* Get major status message */
        maj_stat1 = gss_display_status(&min_stat1, major,


@@ -168,7 +169,9 @@ display_status_2(char *m, u_int32_t major, u_int32_t minor, const gss_OID mech)
                min = min_gss_buf.value;
        }
 
                min = min_gss_buf.value;
        }
 

-       printerr(0, "ERROR: GSS-API: error in %s(): %s - %s\n",
+       if (major == GSS_S_CREDENTIALS_EXPIRED)
+               msg_verbosity = 1;
+       printerr(msg_verbosity, "ERROR: GSS-API: error in %s(): %s - %s\n",

                 m, maj, min);
 
        if (maj_gss_buf.length != 0)
                 m, maj, min);
 
        if (maj_gss_buf.length != 0)

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 48880b6d26ac0032b2f0ef9c35d99c8a81c2b97b..6860cc852e844f87dbaf6d53d6106578f093d942 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -464,7 +464,7 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
        if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
        return 0;
 out_err:
        if (write(k5_fd, buf, p - buf) < p - buf) goto out_err;
        return 0;
 out_err:

-       printerr(0, "Failed to write error downcall!\n");
+       printerr(1, "Failed to write error downcall!\n");

        return -1;
 }
 
        return -1;
 }