X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fgss_util.c;h=8fe1e9be316929f8a29072d576c678eb03352089;hp=d316b4d11bb60c6bbd20e6a6cc2e88d6386028af;hb=706bfd7c94d48659a1411fdef2a3a61d4719f1aa;hpb=3829bb90e764cd72c0009cb32a8b39d0fab89d81

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index d316b4d..8fe1e9b 100644
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -57,7 +57,11 @@
  * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif	/* HAVE_CONFIG_H */
+
 #include <errno.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -145,6 +149,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;
+	int msg_verbosity = 0;
 
 	/* Get major status message */
 	maj_stat1 = gss_display_status(&min_stat1, major,
@@ -168,7 +173,9 @@ display_status_2(char *m, u_int32_t major, u_int32_t minor, const gss_OID mech)
 		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)
@@ -184,7 +191,7 @@ pgsserr(char *msg, u_int32_t maj_stat, u_int32_t min_stat, const gss_OID mech)
 }
 
 int
-gssd_acquire_cred(char *server_name)
+gssd_acquire_cred(char *server_name, const gss_OID oid)
 {
 	gss_buffer_desc name;
 	gss_name_t target_name;
@@ -196,7 +203,7 @@ gssd_acquire_cred(char *server_name)
 	name.length = strlen(server_name);
 
 	maj_stat = gss_import_name(&min_stat, &name,
-			(const gss_OID) GSS_C_NT_HOSTBASED_SERVICE,
+			oid,
 			&target_name);
 
 	if (maj_stat != GSS_S_COMPLETE) {
@@ -213,7 +220,7 @@ gssd_acquire_cred(char *server_name)
 		ignore_maj_stat = gss_display_name(&ignore_min_stat,
 				target_name, &pbuf, NULL);
 		if (ignore_maj_stat == GSS_S_COMPLETE) {
-			printerr(0, "Unable to obtain credentials for '%.*s'\n",
+			printerr(1, "Unable to obtain credentials for '%.*s'\n",
 				 pbuf.length, pbuf.value);
 			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
 							     &pbuf);