summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2012-04-25 10:19:07 -0400
committerSimo Sorce <idra@samba.org>2012-05-04 16:51:28 +0200
commit9a585a314142637a0c15f04289fea2bc16d3295d (patch)
tree82fc780e51de0ebd8f445a9ddfb76f375be0e173
parentafa6c31e6e35c8105ae5b96de1e6f0ac998d10a6 (diff)
downloadsamba-9a585a314142637a0c15f04289fea2bc16d3295d.tar.gz
samba-9a585a314142637a0c15f04289fea2bc16d3295d.tar.bz2
samba-9a585a314142637a0c15f04289fea2bc16d3295d.zip
s4-auth-krb: avoid useless condition
Code bails out with ENOMEM 2 lines a bove if config_file is NULL anyways
-rw-r--r--source4/auth/kerberos/krb5_init_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index e90f8a6e19..948f6870a4 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -441,7 +441,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
}
/* Use our local krb5.conf file by default */
- ret = krb5_prepend_config_files_default(config_file == NULL?"":config_file, &config_files);
+ ret = krb5_prepend_config_files_default(config_file, &config_files);
if (ret) {
DEBUG(1,("krb5_prepend_config_files_default failed (%s)\n",
smb_get_krb5_error_message(krb5_ctx, ret, tmp_ctx)));