From aa1cca9f2713f210065a6a6c2f5a300a2d741082 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 29 Aug 2016 11:03:51 +0200 Subject: [PATCH] krb5_wrap: Rename smb_krb5_open_keytab() Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- lib/krb5_wrap/krb5_samba.c | 10 +++++----- lib/krb5_wrap/krb5_samba.h | 8 ++++---- source3/libads/kerberos_keytab.c | 16 ++++++++-------- source3/librpc/crypto/gse_krb5.c | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 01a6f05e3bf..29c5d914524 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1116,10 +1116,10 @@ out: return ret; } -krb5_error_code smb_krb5_open_keytab(krb5_context context, - const char *keytab_name_req, - bool write_access, - krb5_keytab *keytab) +krb5_error_code smb_krb5_kt_open(krb5_context context, + const char *keytab_name_req, + bool write_access, + krb5_keytab *keytab) { if (keytab_name_req != NULL) { if (keytab_name_req[0] != '/') { @@ -1372,7 +1372,7 @@ out: * * @return A corresponding KRB5 error code. * - * @see smb_krb5_open_keytab() + * @see smb_krb5_kt_open() */ krb5_error_code smb_krb5_kt_add_entry(krb5_context context, krb5_keytab keytab, diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 34c44c5a474..af19b986460 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -206,10 +206,10 @@ krb5_error_code smb_krb5_kt_open_relative(krb5_context context, const char *keytab_name_req, bool write_access, krb5_keytab *keytab); -krb5_error_code smb_krb5_open_keytab(krb5_context context, - const char *keytab_name, - bool write_access, - krb5_keytab *keytab); +krb5_error_code smb_krb5_kt_open(krb5_context context, + const char *keytab_name, + bool write_access, + krb5_keytab *keytab); krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx, krb5_context context, krb5_keytab keytab, 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; }