summaryrefslogtreecommitdiff
path: root/source4/auth/credentials
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-04-14 15:42:42 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-04-14 16:38:27 +1000
commitbbeba18b1ce2cae4a7fcdf040c168f89ce118861 (patch)
tree67a8f8acd032ea9207c5b0a39438c1afcdf068d8 /source4/auth/credentials
parent4ba1375526e6582d6c095592f0e82d1ba501ee3e (diff)
downloadsamba-bbeba18b1ce2cae4a7fcdf040c168f89ce118861.tar.gz
samba-bbeba18b1ce2cae4a7fcdf040c168f89ce118861.tar.bz2
samba-bbeba18b1ce2cae4a7fcdf040c168f89ce118861.zip
s3-auth Rename smb_krb5_open_keytab to avoid a conflict with s3
The s3 function doesn't use the keytab_container concept. Andrew Bartlett
Diffstat (limited to 'source4/auth/credentials')
-rw-r--r--source4/auth/credentials/credentials_krb5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c
index ce0ae7e323..d3925a01f6 100644
--- a/source4/auth/credentials/credentials_krb5.c
+++ b/source4/auth/credentials/credentials_krb5.c
@@ -663,8 +663,8 @@ _PUBLIC_ int cli_credentials_set_keytab_name(struct cli_credentials *cred,
return ENOMEM;
}
- ret = smb_krb5_open_keytab(mem_ctx, smb_krb5_context,
- keytab_name, &ktc);
+ ret = smb_krb5_get_keytab_container(mem_ctx, smb_krb5_context,
+ keytab_name, &ktc);
if (ret) {
return ret;
}