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

diff --git a/utils/gssd/gss_util.c b/utils/gssd/gss_util.c
index 3493280..d316b4d 100644
--- a/utils/gssd/gss_util.c
+++ b/utils/gssd/gss_util.c
@@ -73,6 +73,10 @@
 #include <netdb.h>
 #include <fcntl.h>
 #include <gssapi/gssapi.h>
+#if defined(HAVE_KRB5) && !defined(GSS_C_NT_HOSTBASED_SERVICE)
+#include <gssapi/gssapi_generic.h>
+#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
+#endif
 #include "gss_util.h"
 #include "err_util.h"
 #include "gssd.h"
@@ -186,6 +190,7 @@ gssd_acquire_cred(char *server_name)
 	gss_name_t target_name;
 	u_int32_t maj_stat, min_stat;
 	u_int32_t ignore_maj_stat, ignore_min_stat;
+	gss_buffer_desc pbuf;
 
 	name.value = (void *)server_name;
 	name.length = strlen(server_name);
@@ -203,10 +208,44 @@ gssd_acquire_cred(char *server_name)
 			GSS_C_NULL_OID_SET, GSS_C_ACCEPT,
 			&gssd_creds, NULL, NULL);
 
-	ignore_maj_stat = gss_release_name(&ignore_min_stat, &target_name);
-
-	if (maj_stat != GSS_S_COMPLETE)
+	if (maj_stat != GSS_S_COMPLETE) {
 		pgsserr("gss_acquire_cred", maj_stat, min_stat, g_mechOid);
+		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",
+				 pbuf.length, pbuf.value);
+			ignore_maj_stat = gss_release_buffer(&ignore_min_stat,
+							     &pbuf);
+		}
+	}
+
+	ignore_maj_stat = gss_release_name(&ignore_min_stat, &target_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;
+}
+