proper merge

[nfs-utils.git] / utils / gssd / gssd_proc.c

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index a46b3bd01bf6b6bf107182bc5d70abf1c9cb4d93..aa394359e27398fd3dfe25462ca2be177b7088d4 100644 (file)
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -676,7 +676,7 @@ do_error_downcall(int k5_fd, uid_t uid, int err)
        unsigned int timeout = 0;
        int     zero = 0;
 
        unsigned int timeout = 0;
        int     zero = 0;
 

-       printerr(2, "doing error downcall\n");
+       printerr(1, "doing error downcall\n");

 
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;
 
        if (WRITE_BYTES(&p, end, uid)) goto out_err;
        if (WRITE_BYTES(&p, end, timeout)) goto out_err;


@@ -953,7 +953,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        int                     create_resp = -1;
        int                     err, downcall_err = -EACCES;
 
        int                     create_resp = -1;
        int                     err, downcall_err = -EACCES;
 

-       printerr(2, "handling krb5 upcall (%s)\n", clp->dirname);
+       printerr(1, "handling krb5 upcall (%s)\n", clp->dirname);

 
        if (tgtname) {
                if (clp->servicename) {
 
        if (tgtname) {
                if (clp->servicename) {


@@ -1071,7 +1071,7 @@ process_krb5_upcall(struct clnt_info *clp, uid_t uid, int fd, char *tgtname,
        }
 
        if (!authgss_get_private_data(auth, &pd)) {
        }
 
        if (!authgss_get_private_data(auth, &pd)) {

-               printerr(2, "WARNING: Failed to obtain authentication "
+               printerr(1, "WARNING: Failed to obtain authentication "

                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;
                            "data for user with uid %d for server %s\n",
                         uid, clp->servername);
                goto out_return_error;