krb5_wrap: Rename smb_krb5_keytab_name()
authorAndreas Schneider <asn@samba.org>
Mon, 29 Aug 2016 09:07:48 +0000 (11:07 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 31 Aug 2016 18:59:15 +0000 (20:59 +0200)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
lib/krb5_wrap/krb5_samba.c
lib/krb5_wrap/krb5_samba.h
source3/libnet/libnet_keytab.c
source3/librpc/crypto/gse.c

index 7c40bc4f2bf8634f170422a8688e443a28b2fa60..4416e3b6dad7d40ba3c4bfca0980719f74d819c6 100644 (file)
@@ -1151,7 +1151,7 @@ krb5_error_code smb_krb5_kt_open(krb5_context context,
                                         keytab);
 }
 
-krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
+krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
                                     krb5_context context,
                                     krb5_keytab keytab,
                                     const char **keytab_name)
index af19b98646095995fee349b5614ead117730b764..e10155d088a30d5c0efb407a20f5f6706c1ce109 100644 (file)
@@ -210,7 +210,7 @@ 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_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
                                     krb5_context context,
                                     krb5_keytab keytab,
                                     const char **keytab_name);
index a1d44e9b6bdf2b548d2a3f37c22814134f8cdb89..9aefac1f00f4ee39fecbfdf89944aea4edb899f9 100644 (file)
@@ -92,7 +92,7 @@ krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
                return ret;
        }
 
-       ret = smb_krb5_keytab_name(mem_ctx, context, keytab, &keytab_string);
+       ret = smb_krb5_kt_get_name(mem_ctx, context, keytab, &keytab_string);
        if (ret) {
                krb5_kt_close(context, keytab);
                krb5_free_context(context);
index 963c98a9e9d25d675865aa8ff4920a6d1222ab4b..1d44fbe3ea963b057a1b0ec75b09356b0865c439 100644 (file)
@@ -410,7 +410,7 @@ static NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx,
                const char *ktname;
                gss_OID_set_desc mech_set;
 
-               ret = smb_krb5_keytab_name(gse_ctx, gse_ctx->k5ctx,
+               ret = smb_krb5_kt_get_name(gse_ctx, gse_ctx->k5ctx,
                                   gse_ctx->keytab, &ktname);
                if (ret) {
                        status = NT_STATUS_INTERNAL_ERROR;