From a6ab6f63de618180127daadc070d696f6268000f Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 24 Sep 2013 15:01:57 -0400 Subject: gssd: don't use tgtname to find our keytab From: "J. Bruce Fields" The tgtname is of the form service@hostname. It's not a hostname, and attempting to look it up here just causes failure of any upcall with a "target=" field (currently, any upcall on behalf of an nfsv4.0 callback). I think the theory was that knowning that target= name might help pick the right keytab, but I don't really know if that's helpful. For now, just stop trying to do this. Signed-off-by: J. Bruce Fields Signed-off-by: Steve Dickson --- utils/gssd/krb5_util.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'utils/gssd/krb5_util.c') diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index 83b9651..c6e52fd 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -1149,7 +1149,7 @@ gssd_get_krb5_machine_cred_list(char ***list) if (ple->ccname) { /* Make sure cred is up-to-date before returning it */ retval = gssd_refresh_krb5_machine_credential(NULL, ple, - NULL, NULL); + NULL); if (retval) continue; if (i + 1 > listsize) { @@ -1240,8 +1240,7 @@ gssd_destroy_krb5_machine_creds(void) int gssd_refresh_krb5_machine_credential(char *hostname, struct gssd_k5_kt_princ *ple, - char *service, - char *tgtname) + char *service) { krb5_error_code code = 0; krb5_context context; @@ -1280,10 +1279,7 @@ gssd_refresh_krb5_machine_credential(char *hostname, if (ple == NULL) { krb5_keytab_entry kte; - if (tgtname == NULL) - tgtname = hostname; - - code = find_keytab_entry(context, kt, tgtname, &kte, svcnames); + code = find_keytab_entry(context, kt, hostname, &kte, svcnames); if (code) { printerr(0, "ERROR: %s: no usable keytab entry found " "in keytab %s for connection with host %s\n", -- cgit