Remove db_ and similar prefixes from DAL function names, for

consistency.  Follow suit inside the DB2 and LDAP modules.  (No change
to the caller-facing libkdb5 APIs.)

ticket: 6749
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24165 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 24 insertions, 24 deletions

diff --git a/src/plugins/kdb/ldap/ldap_exp.c b/src/plugins/kdb/ldap/ldap_exp.c
index 2b0fc62ef..4d071dc49 100644
--- a/src/plugins/kdb/ldap/ldap_exp.c
+++ b/src/plugins/kdb/ldap/ldap_exp.c
@@ -53,24 +53,24 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* fini_library */                      krb5_ldap_lib_cleanup,
     /* init_module */                       krb5_ldap_open,
     /* fini_module */                       krb5_ldap_close,
-    /* db_create */                         krb5_ldap_create,
-    /* db_destroy */                        krb5_ldap_delete_realm_1,
-    /* db_get_age */                        krb5_ldap_db_get_age,
-    /* db_lock */                           krb5_ldap_lock,
-    /* db_unlock */                         krb5_ldap_unlock,
-    /* db_get_principal */                  krb5_ldap_get_principal,
-    /* db_free_principal */                 krb5_ldap_free_principal,
-    /* db_put_principal */                  krb5_ldap_put_principal,
-    /* db_delete_principal */               krb5_ldap_delete_principal,
-    /* db_iterate */                        krb5_ldap_iterate,
-    /* db_create_policy */                  krb5_ldap_create_password_policy,
-    /* db_get_policy */                     krb5_ldap_get_password_policy,
-    /* db_put_policy */                     krb5_ldap_put_password_policy,
-    /* db_iter_policy */                    krb5_ldap_iterate_password_policy,
-    /* db_delete_policy */                  krb5_ldap_delete_password_policy,
-    /* db_free_policy */                    krb5_ldap_free_password_policy,
-    /* db_alloc */                          krb5_ldap_alloc,
-    /* db_free */                           krb5_ldap_free,
+    /* create */                            krb5_ldap_create,
+    /* destroy */                           krb5_ldap_delete_realm_1,
+    /* get_age */                           krb5_ldap_get_age,
+    /* lock */                              krb5_ldap_lock,
+    /* unlock */                            krb5_ldap_unlock,
+    /* get_principal */                     krb5_ldap_get_principal,
+    /* free_principal */                    krb5_ldap_free_principal,
+    /* put_principal */                     krb5_ldap_put_principal,
+    /* delete_principal */                  krb5_ldap_delete_principal,
+    /* iterate */                           krb5_ldap_iterate,
+    /* create_policy */                     krb5_ldap_create_password_policy,
+    /* get_policy */                        krb5_ldap_get_password_policy,
+    /* put_policy */                        krb5_ldap_put_password_policy,
+    /* iter_policy */                       krb5_ldap_iterate_password_policy,
+    /* delete_policy */                     krb5_ldap_delete_password_policy,
+    /* free_policy */                       krb5_ldap_free_password_policy,
+    /* alloc */                             krb5_ldap_alloc,
+    /* free */                              krb5_ldap_free,
     /* optional functions */
     /* set_master_key_list */               krb5_ldap_set_mkey_list,
     /* get_master_key_list */               krb5_ldap_get_mkey_list,
@@ -82,8 +82,8 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* Search enc type */                   NULL,
     /* Change pwd   */                      NULL,
     /* promote_db */                        NULL,
-    /* dbekd_decrypt_key_data */            NULL,
-    /* dbekd_encrypt_key_data */            NULL,
-    /* db_invoke */                         krb5_ldap_invoke,
+    /* decrypt_key_data */                  NULL,
+    /* encrypt_key_data */                  NULL,
+    /* invoke */                            krb5_ldap_invoke,
 
 };
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
index 1966aa970..633de85d2 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.c
@@ -87,7 +87,7 @@ krb5_ldap_get_db_opt(char *input, char **opt, char **val)
  * ldap get age
  */
 krb5_error_code
-krb5_ldap_db_get_age(context, db_name, age)
+krb5_ldap_get_age(context, db_name, age)
     krb5_context context;
     char *db_name;
     time_t *age;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index 72e254587..35dd12e02 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -251,7 +251,7 @@ krb5_error_code
 krb5_ldap_rebind(krb5_ldap_context *, krb5_ldap_server_handle **);
 
 krb5_error_code
-krb5_ldap_db_get_age(krb5_context, char *, time_t *);
+krb5_ldap_get_age(krb5_context, char *, time_t *);
 
 krb5_error_code
 krb5_ldap_lib_init(int dal_version);
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports b/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
index 0e8c08150..7f285ce94 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
+++ b/src/plugins/kdb/ldap/libkdb_ldap/libkdb_ldap.exports
@@ -4,7 +4,7 @@ krb5_ldap_close
 krb5_ldap_db_init
 krb5_ldap_lib_init
 krb5_ldap_lib_cleanup
-krb5_ldap_db_get_age
+krb5_ldap_get_age
 krb5_ldap_read_server_params
 krb5_ldap_put_principal
 krb5_ldap_get_principal