From 11239f0759601a9db22dfe1e99d3de7f2348a1e5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 13 Dec 2016 11:38:13 +0100 Subject: credentials: Simplify cli_credentials_get_server_gss_creds() Signed-off-by: Andreas Schneider Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Jan 3 14:37:12 CET 2018 on sn-devel-144 --- auth/credentials/credentials_krb5.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'auth') diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c index b88497dcace..585203a640d 100644 --- a/auth/credentials/credentials_krb5.c +++ b/auth/credentials/credentials_krb5.c @@ -1151,16 +1151,17 @@ _PUBLIC_ int cli_credentials_get_server_gss_creds(struct cli_credentials *cred, } if (ktc->password_based || obtained < CRED_SPECIFIED) { - /* This creates a GSSAPI cred_id_t for match-by-key with only the keytab set */ - maj_stat = smb_gss_krb5_import_cred(&min_stat, smb_krb5_context->krb5_context, - NULL, NULL, ktc->keytab, - &gcc->creds); - } else { - /* This creates a GSSAPI cred_id_t with the principal and keytab set, matching by name */ - maj_stat = smb_gss_krb5_import_cred(&min_stat, smb_krb5_context->krb5_context, - NULL, princ, ktc->keytab, - &gcc->creds); + /* + * This creates a GSSAPI cred_id_t for match-by-key with only + * the keytab set + */ + princ = NULL; } + maj_stat = smb_gss_krb5_import_cred(&min_stat, + smb_krb5_context->krb5_context, + NULL, princ, + ktc->keytab, + &gcc->creds); if (maj_stat) { if (min_stat) { ret = min_stat; -- cgit v1.2.1