diff options
| author | Andreas Schneider <asn@samba.org> | 2016-08-29 11:03:51 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-08-31 20:59:15 +0200 |
| commit | aa1cca9f2713f210065a6a6c2f5a300a2d741082 (patch) | |
| tree | fa0754633469247ef90c31556eec298f4c0211dc /source3 | |
| parent | 5e934aad486f6c09cd78b67785016f505215a9c3 (diff) | |
| download | samba-aa1cca9f2713f210065a6a6c2f5a300a2d741082.tar.gz | |
krb5_wrap: Rename smb_krb5_open_keytab()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 16 | ||||
| -rw-r--r-- | source3/librpc/crypto/gse_krb5.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index 85691381501..8c7c1c36d14 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -75,9 +75,9 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc) return -1; } - ret = smb_krb5_open_keytab(context, NULL, True, &keytab); + ret = smb_krb5_kt_open(context, NULL, True, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); goto out; } @@ -262,9 +262,9 @@ int ads_keytab_flush(ADS_STRUCT *ads) return ret; } - ret = smb_krb5_open_keytab(context, NULL, True, &keytab); + ret = smb_krb5_kt_open(context, NULL, True, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); goto out; } @@ -447,9 +447,9 @@ int ads_keytab_create_default(ADS_STRUCT *ads) DEBUG(3, (__location__ ": Searching for keytab entries to preserve " "and update.\n")); - ret = smb_krb5_open_keytab(context, NULL, True, &keytab); + ret = smb_krb5_kt_open(context, NULL, True, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); goto done; } @@ -600,9 +600,9 @@ int ads_keytab_list(const char *keytab_name) return ret; } - ret = smb_krb5_open_keytab(context, keytab_name, False, &keytab); + ret = smb_krb5_kt_open(context, keytab_name, False, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); goto out; } diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c index 999a1d18c47..2ee075da15e 100644 --- a/source3/librpc/crypto/gse_krb5.c +++ b/source3/librpc/crypto/gse_krb5.c @@ -431,9 +431,9 @@ static krb5_error_code fill_mem_keytab_from_system_keytab(krb5_context krbctx, ZERO_STRUCT(kt_entry); ZERO_STRUCT(kt_cursor); - ret = smb_krb5_open_keytab(krbctx, NULL, false, &keytab); + ret = smb_krb5_kt_open(krbctx, NULL, false, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); goto out; } @@ -528,10 +528,10 @@ static krb5_error_code fill_mem_keytab_from_dedicated_keytab(krb5_context krbctx krb5_kt_cursor kt_cursor; krb5_keytab_entry kt_entry; - ret = smb_krb5_open_keytab(krbctx, lp_dedicated_keytab_file(), + ret = smb_krb5_kt_open(krbctx, lp_dedicated_keytab_file(), false, &keytab); if (ret) { - DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + DEBUG(1, ("smb_krb5_kt_open failed (%s)\n", error_message(ret))); return ret; } |