Imported Debian patch 1.1.2-6

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

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index eff740cdcdfce96cd58d78c0bdb0f777a5d37c5c..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:
-       printerr(0, "Failed to write error downcall!\n");
+       printerr(1, "Failed to write error downcall!\n");
        return -1;
 }
 
@@ -700,14 +700,16 @@ handle_krb5_upcall(struct clnt_info *clp)
                if (uid == 0 && root_uses_machine_creds == 1) {
                        int success = 0;
 
+                       gssd_refresh_krb5_machine_credential(clp->servername,
+                                                            NULL);
                        /*
                         * Get a list of credential cache names and try each
                         * of them until one works or we've tried them all
                         */
                        if (gssd_get_krb5_machine_cred_list(&credlist)) {
-                               printerr(0, "WARNING: Failed to obtain machine "
-                                        "credentials for connection to "
-                                        "server %s\n", clp->servername);
+                               printerr(0, "ERROR: No credentials found "
+                                        "for connection to server %s\n",
+                                        clp->servername);
                                        goto out_return_error;
                        }
                        for (ccname = credlist; ccname && *ccname; ccname++) {