X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fkrb5_util.c;h=bf8690e3fbd325ca12ac6e7c608d82f91f197a62;hp=50773b1cdd1c215d5ec32c9b58d9267e578c9741;hb=4cfb608c949d3f38d9d5bc2c3c8aef268b88a697;hpb=68f4b69f3b8c627d37f6d40c209702fb4f266a2e

diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
index 50773b1..bf8690e 100644
--- a/utils/gssd/krb5_util.c
+++ b/utils/gssd/krb5_util.c
@@ -323,7 +323,12 @@ gssd_get_single_krb5_cred(krb5_context context,
 			  krb5_keytab kt,
 			  struct gssd_k5_kt_princ *ple)
 {
+#if HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
+	krb5_get_init_creds_opt *init_opts = NULL;
+#else
 	krb5_get_init_creds_opt options;
+#endif
+	krb5_get_init_creds_opt *opts;
 	krb5_creds my_creds;
 	krb5_ccache ccache = NULL;
 	char kt_name[BUFSIZ];
@@ -351,19 +356,40 @@ gssd_get_single_krb5_cred(krb5_context context,
 	if ((krb5_unparse_name(context, ple->princ, &pname)))
 		pname = NULL;
 
+#if HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
+	code = krb5_get_init_creds_opt_alloc(context, &init_opts);
+	if (code) {
+		printerr(0, "ERROR: %s allocating gic options\n",
+			 gssd_k5_err_msg(context, code));
+		goto out;
+	}
+	if (krb5_get_init_creds_opt_set_addressless(context, init_opts, 1))
+		printerr(0, "WARNING: Unable to set option for addressless "
+			 "tickets.  May have problems behind a NAT.\n");
+#ifdef TEST_SHORT_LIFETIME
+	/* set a short lifetime (for debugging only!) */
+	printerr(0, "WARNING: Using (debug) short machine cred lifetime!\n");
+	krb5_get_init_creds_opt_set_tkt_life(init_opts, 5*60);
+#endif
+	opts = init_opts;
+
+#else	/* HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS */
+
 	krb5_get_init_creds_opt_init(&options);
 	krb5_get_init_creds_opt_set_address_list(&options, NULL);
-
 #ifdef TEST_SHORT_LIFETIME
 	/* set a short lifetime (for debugging only!) */
 	printerr(0, "WARNING: Using (debug) short machine cred lifetime!\n");
 	krb5_get_init_creds_opt_set_tkt_life(&options, 5*60);
 #endif
+	opts = &options;
+#endif
+
 	if ((code = krb5_get_init_creds_keytab(context, &my_creds, ple->princ,
-					       kt, 0, NULL, &options))) {
+					       kt, 0, NULL, opts))) {
 		printerr(0, "WARNING: %s while getting initial ticket for "
 			 "principal '%s' using keytab '%s'\n",
-			 error_message(code),
+			 gssd_k5_err_msg(context, code),
 			 pname ? pname : "<unparsable>", kt_name);
 		goto out;
 	}
@@ -392,17 +418,18 @@ gssd_get_single_krb5_cred(krb5_context context,
 	}
 	if ((code = krb5_cc_resolve(context, cc_name, &ccache))) {
 		printerr(0, "ERROR: %s while opening credential cache '%s'\n",
-			 error_message(code), cc_name);
+			 gssd_k5_err_msg(context, code), cc_name);
 		goto out;
 	}
 	if ((code = krb5_cc_initialize(context, ccache, ple->princ))) {
 		printerr(0, "ERROR: %s while initializing credential "
-			 "cache '%s'\n", error_message(code), cc_name);
+			 "cache '%s'\n", gssd_k5_err_msg(context, code),
+			 cc_name);
 		goto out;
 	}
 	if ((code = krb5_cc_store_cred(context, ccache, &my_creds))) {
 		printerr(0, "ERROR: %s while storing credentials in '%s'\n",
-			 error_message(code), cc_name);
+			 gssd_k5_err_msg(context, code), cc_name);
 		goto out;
 	}
 
@@ -410,6 +437,10 @@ gssd_get_single_krb5_cred(krb5_context context,
 	printerr(2, "Successfully obtained machine credentials for "
 		 "principal '%s' stored in ccache '%s'\n", pname, cc_name);
   out:
+#if HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS
+	if (init_opts)
+		krb5_get_init_creds_opt_free(context, init_opts);
+#endif
 	if (pname)
 		k5_free_unparsed_name(context, pname);
 	if (ccache)
@@ -652,14 +683,14 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
 	 */
 	if ((code = krb5_kt_get_name(context, kt, kt_name, BUFSIZ))) {
 		printerr(0, "ERROR: %s attempting to get keytab name\n",
-			 error_message(code));
+			 gssd_k5_err_msg(context, code));
 		retval = code;
 		goto out;
 	}
 	if ((code = krb5_kt_start_seq_get(context, kt, &cursor))) {
 		printerr(0, "ERROR: %s while beginning keytab scan "
 			    "for keytab '%s'\n",
-			error_message(code), kt_name);
+			gssd_k5_err_msg(context, code), kt_name);
 		retval = code;
 		goto out;
 	}
@@ -669,7 +700,7 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
 					      &pname))) {
 			printerr(0, "WARNING: Skipping keytab entry because "
 				 "we failed to unparse principal name: %s\n",
-				 error_message(code));
+				 gssd_k5_err_msg(context, code));
 			k5_free_kt_entry(context, kte);
 			continue;
 		}
@@ -705,7 +736,7 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
 	if ((code = krb5_kt_end_seq_get(context, kt, &cursor))) {
 		printerr(0, "WARNING: %s while ending keytab scan for "
 			    "keytab '%s'\n",
-			 error_message(code), kt_name);
+			 gssd_k5_err_msg(context, code), kt_name);
 	}
 
 	retval = 0;
@@ -743,7 +774,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *hostname,
 	retval = gethostname(myhostname, sizeof(myhostname));
 	if (retval) {
 		printerr(1, "%s while getting local hostname\n",
-			 error_message(retval));
+			 gssd_k5_err_msg(context, retval));
 		goto out;
 	}
 	retval = get_full_hostname(myhostname, myhostname, sizeof(myhostname));
@@ -754,7 +785,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *hostname,
 	if (code) {
 		retval = code;
 		printerr(1, "%s while getting default realm name\n",
-			 error_message(code));
+			 gssd_k5_err_msg(context, code));
 		goto out;
 	}
 
@@ -767,7 +798,7 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *hostname,
 	code = krb5_get_host_realm(context, targethostname, &realmnames);
 	if (code) {
 		printerr(0, "ERROR: %s while getting realm(s) for host '%s'\n",
-			 error_message(code), targethostname);
+			 gssd_k5_err_msg(context, code), targethostname);
 		retval = code;
 		goto out;
 	}
@@ -799,7 +830,8 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *hostname,
 							NULL);
 			if (code) {
 				printerr(1, "%s while building principal for "
-					 "'%s/%s@%s'\n", error_message(code),
+					 "'%s/%s@%s'\n",
+					 gssd_k5_err_msg(context, code),
 					 svcnames[j], myhostname, realm);
 				continue;
 			}
@@ -807,7 +839,8 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *hostname,
 			krb5_free_principal(context, princ);
 			if (code) {
 				printerr(3, "%s while getting keytab entry for "
-					 "'%s/%s@%s'\n", error_message(code),
+					 "'%s/%s@%s'\n",
+					 gssd_k5_err_msg(context, code),
 					 svcnames[j], myhostname, realm);
 			} else {
 				printerr(3, "Success getting keytab entry for "
@@ -984,7 +1017,7 @@ gssd_destroy_krb5_machine_creds(void)
 	code = krb5_init_context(&context);
 	if (code) {
 		printerr(0, "ERROR: %s while initializing krb5\n",
-			 error_message(code));
+			 gssd_k5_err_msg(NULL, code));
 		goto out;
 	}
 
@@ -994,14 +1027,14 @@ gssd_destroy_krb5_machine_creds(void)
 		if ((code = krb5_cc_resolve(context, ple->ccname, &ccache))) {
 			printerr(0, "WARNING: %s while resolving credential "
 				    "cache '%s' for destruction\n",
-				 error_message(code), ple->ccname);
+				 gssd_k5_err_msg(context, code), ple->ccname);
 			continue;
 		}
 
 		if ((code = krb5_cc_destroy(context, ccache))) {
 			printerr(0, "WARNING: %s while destroying credential "
 				    "cache '%s'\n",
-				 error_message(code), ple->ccname);
+				 gssd_k5_err_msg(context, code), ple->ccname);
 		}
 	}
   out:
@@ -1026,14 +1059,15 @@ gssd_refresh_krb5_machine_credential(char *hostname,
 	code = krb5_init_context(&context);
 	if (code) {
 		printerr(0, "ERROR: %s: %s while initializing krb5 context\n",
-			 __FUNCTION__, error_message(code));
+			 __FUNCTION__, gssd_k5_err_msg(NULL, code));
 		retval = code;
 		goto out;
 	}
 
 	if ((code = krb5_kt_resolve(context, keytabfile, &kt))) {
 		printerr(0, "ERROR: %s: %s while resolving keytab '%s'\n",
-			 __FUNCTION__, error_message(code), keytabfile);
+			 __FUNCTION__, gssd_k5_err_msg(context, code),
+			 keytabfile);
 		goto out;
 	}
 
@@ -1073,3 +1107,25 @@ out:
 	return retval;
 }
 
+/*
+ * A common routine for getting the Kerberos error message
+ */
+const char *
+gssd_k5_err_msg(krb5_context context, krb5_error_code code)
+{
+	const char *msg = NULL;
+#if HAVE_KRB5_GET_ERROR_MESSAGE
+	if (context != NULL)
+		msg = krb5_get_error_message(context, code);
+#endif
+	if (msg != NULL)
+		return msg;
+#if HAVE_KRB5
+	return error_message(code);
+#else
+	if (context != NULL)
+		return krb5_get_err_text(context, code);
+	else
+		return error_message(code);
+#endif
+}