krb5_wrap: Rename smb_get_enctype_from_kt_entry()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 868eefc000e7dde7c09610173f5dc7222c9b6fea..61b7186ac5e5a0aacb5ecd51822041b64abea64a 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -896,7 +896,7 @@ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr
        return ret;
 }
 
-krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry)
+krb5_enctype smb_krb5_kt_get_enctype_from_entry(krb5_keytab_entry *kt_entry)
 {
        return KRB5_KEY_TYPE(KRB5_KT_KEY(kt_entry));
 }
@@ -1176,7 +1176,7 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
        while (!krb5_kt_next_entry(context, keytab, &kt_entry, &cursor)) {
                bool name_ok = false;
                krb5_enctype kt_entry_enctype =
-                       smb_get_enctype_from_kt_entry(&kt_entry);
+                       smb_krb5_kt_get_enctype_from_entry(&kt_entry);
 
                if (!flush && (princ_s != NULL)) {
                        ret = smb_krb5_unparse_name(tmp_ctx, context,

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index ac7c22183fd5ef43ef565c07dbdd9bafb9ea5b32..c038e2da1bdda8f9eae5a66c6d587b1ae516b168 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -197,7 +197,8 @@ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses
 NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
 krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
 
-krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
+krb5_enctype smb_krb5_kt_get_enctype_from_entry(krb5_keytab_entry *kt_entry);
+
 krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
                                            krb5_enctype enctype,
                                            char **etype_s);

diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
index 160b58396a4caf7aa4286550a0c396ffb480c492..85691381501ca1fdc732593590ae69bd68f2451e 100644 (file)
--- a/source3/libads/kerberos_keytab.c
+++ b/source3/libads/kerberos_keytab.c
@@ -627,7 +627,7 @@ int ads_keytab_list(const char *keytab_name)
                        goto out;
                }
 
-               enctype = smb_get_enctype_from_kt_entry(&kt_entry);
+               enctype = smb_krb5_kt_get_enctype_from_entry(&kt_entry);
 
                ret = smb_krb5_enctype_to_string(context, enctype, &etype_s);
                if (ret &&

diff --git a/source3/librpc/crypto/gse_krb5.c b/source3/librpc/crypto/gse_krb5.c
index 85652b77d76449d80652d22cbafe0980334119b3..999a1d18c47e520669134470385b19f916e8d573 100644 (file)
--- a/source3/librpc/crypto/gse_krb5.c
+++ b/source3/librpc/crypto/gse_krb5.c
@@ -242,7 +242,8 @@ static krb5_error_code fill_mem_keytab_from_secrets(krb5_context krbctx,
                 * we can verify if the keytab needs to be upgraded */
                while ((ret = krb5_kt_next_entry(krbctx, *keytab,
                                           &kt_entry, &kt_cursor)) == 0) {
-                       if (smb_get_enctype_from_kt_entry(&kt_entry) == CLEARTEXT_PRIV_ENCTYPE) {
+                       if (smb_krb5_kt_get_enctype_from_entry(&kt_entry) ==
+                           CLEARTEXT_PRIV_ENCTYPE) {
                                break;
                        }
                        smb_krb5_kt_free_entry(krbctx, &kt_entry);

diff --git a/source4/kdc/ktutil.c b/source4/kdc/ktutil.c
index 2fcd79ae94d16d9334c6dff8c6e65259f213a676..0b7089d453262a9468885f0b4d07d8c35f8c3bad 100644 (file)
--- a/source4/kdc/ktutil.c
+++ b/source4/kdc/ktutil.c
@@ -82,7 +82,7 @@ int main (int argc, char **argv)
        {
                char *principal = NULL;
                char *enctype_str = NULL;
-               krb5_enctype enctype = smb_get_enctype_from_kt_entry(&entry);
+               krb5_enctype enctype = smb_krb5_kt_get_enctype_from_entry(&entry);
 
                ret = smb_krb5_unparse_name(mem_ctx,
                                            context,