X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fgss_util.c;h=99aceb37714b48bab6a41c03d4e0d57c58532bb5;hp=f62a87b3ad6974a1c107e0d7a698aa71bd434b90;hb=e4719f90f77de2ea2c083cbc304b5cc7a7b516bd;hpb=a980156c122e975cc185a6c41ef705f166a5765f

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index f62a87b..99aceb3 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)
@@ -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);
@@ -224,3 +231,28 @@ gssd_acquire_cred(char *server_name)
 
 	return (maj_stat == GSS_S_COMPLETE);
 }
+
+int gssd_check_mechs(void)
+{
+	u_int32_t maj_stat, min_stat;
+	gss_OID_set supported_mechs = GSS_C_NO_OID_SET;
+	int retval = -1;
+
+	maj_stat = gss_indicate_mechs(&min_stat, &supported_mechs);
+	if (maj_stat != GSS_S_COMPLETE) {
+		printerr(0, "Unable to obtain list of supported mechanisms. "
+			 "Check that gss library is properly configured.\n");
+		goto out;
+	}
+	if (supported_mechs == GSS_C_NO_OID_SET ||
+	    supported_mechs->count == 0) {
+		printerr(0, "Unable to obtain list of supported mechanisms. "
+			 "Check that gss library is properly configured.\n");
+		goto out;
+	}
+	maj_stat = gss_release_oid_set(&min_stat, &supported_mechs);
+	retval = 0;
+out:
+	return retval;
+}
+