krb5_wrap: Rename smb_krb5_open_keytab_relative()
authorAndreas Schneider <asn@samba.org>
Mon, 29 Aug 2016 08:42:57 +0000 (10:42 +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
source4/kdc/ktutil.c
source4/libnet/libnet_export_keytab.c

index a3fdee5..6eb1225 100644 (file)
@@ -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,
index c038e2d..34c44c5 100644 (file)
@@ -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,
index 2446808..a1d44e9 100644 (file)
@@ -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)));
index 0b7089d..bc263c5 100644 (file)
@@ -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");
        }
index 8bceecc..580281a 100644 (file)
@@ -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",