krb5_wrap: Rename smb_krb5_open_keytab()

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 01a6f05e3bfcd87a6df863eae5b3f7fd2a2ffb51..29c5d914524b8644380f361b40d58c8ef791a30b 100644 (file)
--- 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 34c44c5a474917982d06ac3289f5dd5fc24ecfa1..af19b98646095995fee349b5614ead117730b764 100644 (file)
--- 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 85691381501ca1fdc732593590ae69bd68f2451e..8c7c1c36d14bbadd0b064322bb4e3aca9dfecc35 100644 (file)
--- 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 999a1d18c47e520669134470385b19f916e8d573..2ee075da15e03dc6bab580a57288e38e28ffdaa9 100644 (file)
--- 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;
        }