krb5_wrap: Rename smb_krb5_open_keytab_relative()

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 a3fdee529460c0a06d07b57905bfc041561aa6a8..6eb12255e3116c55b295a4bb9b9c901b457c4caa 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -988,10 +988,10 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
 #define MAX_KEYTAB_NAME_LEN 1100
 #endif
 
-krb5_error_code smb_krb5_open_keytab_relative(krb5_context context,
-                                             const char *keytab_name_req,
-                                             bool write_access,
-                                             krb5_keytab *keytab)
+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 ret = 0;
        TALLOC_CTX *mem_ctx;
@@ -1119,10 +1119,10 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context,
                }
        }
 
-       return smb_krb5_open_keytab_relative(context,
-                                            keytab_name_req,
-                                            write_access,
-                                            keytab);
+       return smb_krb5_kt_open_relative(context,
+                                        keytab_name_req,
+                                        write_access,
+                                        keytab);
 }
 
 krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index c038e2da1bdda8f9eae5a66c6d587b1ae516b168..34c44c5a474917982d06ac3289f5dd5fc24ecfa1 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -202,10 +202,10 @@ 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);
-krb5_error_code smb_krb5_open_keytab_relative(krb5_context context,
-                                             const char *keytab_name_req,
-                                             bool write_access,
-                                             krb5_keytab *keytab);
+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,

diff --git a/source3/libnet/libnet_keytab.c b/source3/libnet/libnet_keytab.c
index 2446808f021fc76eb6d453aaa71ae2ecefb6090b..a1d44e9b6bdf2b548d2a3f37c22814134f8cdb89 100644 (file)
--- a/source3/libnet/libnet_keytab.c
+++ b/source3/libnet/libnet_keytab.c
@@ -81,10 +81,10 @@ krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
                return ret;
        }
 
-       ret = smb_krb5_open_keytab_relative(context,
-                                           keytab_name,
-                                           true, /* write_access */
-                                           &keytab);
+       ret = smb_krb5_kt_open_relative(context,
+                                       keytab_name,
+                                       true, /* write_access */
+                                       &keytab);
        if (ret) {
                DEBUG(1,("keytab_init: smb_krb5_open_keytab failed (%s)\n",
                        error_message(ret)));

diff --git a/source4/kdc/ktutil.c b/source4/kdc/ktutil.c
index 0b7089d453262a9468885f0b4d07d8c35f8c3bad..bc263c5b29bb40d7b4d2dd0f0cfa6b93090d2d09 100644 (file)
--- a/source4/kdc/ktutil.c
+++ b/source4/kdc/ktutil.c
@@ -66,7 +66,7 @@ int main (int argc, char **argv)
                smb_krb5_err(mem_ctx, context, 1, ret, "krb5_context");
        }
 
-       ret = smb_krb5_open_keytab_relative(context, keytab_name, false, &keytab);
+       ret = smb_krb5_kt_open_relative(context, keytab_name, false, &keytab);
        if (ret) {
                smb_krb5_err(mem_ctx, context, 1, ret, "open keytab");
        }

diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index 8bceecc46362e2e8e68502dafa7f65d191a2b3fb..580281a2062405ce2047da1dd7ea6770e1d5b294 100644 (file)
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -44,10 +44,10 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx,
        bool copy_one_principal = (principal != NULL);
        krb5_data password;
 
-       code = smb_krb5_open_keytab_relative(context,
-                                            keytab_name,
-                                            true, /* write_access */
-                                            &keytab);
+       code = smb_krb5_kt_open_relative(context,
+                                        keytab_name,
+                                        true, /* write_access */
+                                        &keytab);
        if (code != 0) {
                *error_string = talloc_asprintf(mem_ctx,
                                                "Failed to open keytab: %s",