X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fgssd_proc.c;h=48880b6d26ac0032b2f0ef9c35d99c8a81c2b97b;hp=3b190f2995a97f54ebe3e76e6a93078d37c65374;hb=1bcf67703e5606837853666763c739db91f08fee;hpb=f5954afaeeee07ca6ded6c4cdcbf965f02f7a670

diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
index 3b190f2..48880b6 100644
--- a/utils/gssd/gssd_proc.c
+++ b/utils/gssd/gssd_proc.c
@@ -555,7 +555,7 @@ int create_auth_rpc_client(struct clnt_info *clp,
 		ai_hints.ai_protocol = IPPROTO_UDP;
 	} else {
 		printerr(0, "WARNING: unrecognized protocol, '%s', requested "
-			 "for connection to server %s for user with uid %d",
+			 "for connection to server %s for user with uid %d\n",
 			 clp->protocol, clp->servername, uid);
 		goto out_fail;
 	}
@@ -563,12 +563,12 @@ int create_auth_rpc_client(struct clnt_info *clp,
 	/* extract the service name from clp->servicename */
 	if ((at_sign = strchr(clp->servicename, '@')) == NULL) {
 		printerr(0, "WARNING: servicename (%s) not formatted as "
-			"expected with service@host", clp->servicename);
+			"expected with service@host\n", clp->servicename);
 		goto out_fail;
 	}
 	if ((at_sign - clp->servicename) >= sizeof(service)) {
 		printerr(0, "WARNING: service portion of servicename (%s) "
-			"is too long!", clp->servicename);
+			"is too long!\n", clp->servicename);
 		goto out_fail;
 	}
 	strncpy(service, clp->servicename, at_sign - clp->servicename);
@@ -577,13 +577,13 @@ int create_auth_rpc_client(struct clnt_info *clp,
 	errcode = getaddrinfo(clp->servername, service, &ai_hints, &a);
 	if (errcode) {
 		printerr(0, "WARNING: Error from getaddrinfo for server "
-			 "'%s': %s", clp->servername, gai_strerror(errcode));
+			 "'%s': %s\n", clp->servername, gai_strerror(errcode));
 		goto out_fail;
 	}
 
 	if (a == NULL) {
 		printerr(0, "WARNING: No address information found for "
-			 "connection to server %s for user with uid %d",
+			 "connection to server %s for user with uid %d\n",
 			 clp->servername, uid);
 		goto out_fail;
 	}
@@ -617,7 +617,7 @@ int create_auth_rpc_client(struct clnt_info *clp,
 	} else {
 		/* Shouldn't happen! */
 		printerr(0, "ERROR: requested protocol '%s', but "
-			 "got addrinfo with protocol %d",
+			 "got addrinfo with protocol %d\n",
 			 clp->protocol, a->ai_protocol);
 		goto out_fail;
 	}
@@ -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++) {