Namespace-protect get_key_data_kvno

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21800 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/kdb.h b/src/include/kdb.h
index b8ba31f5adddcdc49f92519652b7a354aeecdaa9..ea6a5409715b7f701cbc7cbebfb60eb8d3dffb76 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -513,9 +513,9 @@ krb5_dbe_apw( krb5_context    context,
              krb5_db_entry     * db_entry);
 
 int
-get_key_data_kvno( krb5_context           context,
-                  int             count,
-                  krb5_key_data * data);
+krb5_db_get_key_data_kvno( krb5_context           context,
+                          int             count,
+                          krb5_key_data * data);
 
 
 /* default functions. Should not be directly called */

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index e72f4e8388de4b126610a7a4592f5bd7d952ffb1..658dcbfc92da37988f20efda640ee040ee6eedcf 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -145,8 +145,8 @@ kdb5_add_mkey(int argc, char *argv[])
     }
 
     /* First save the old keydata */
-    old_kvno = get_key_data_kvno(util_context, master_entry.n_key_data,
-                                 master_entry.key_data);
+    old_kvno = krb5_db_get_key_data_kvno(util_context, master_entry.n_key_data,
+                                        master_entry.key_data);
     old_key_data_count = master_entry.n_key_data;
     old_key_data = master_entry.key_data;
 

diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index e3e01aefa240548e0b50737703fe7e138c864a72..de6a34d37747c40e9e8694c2dcb9c9fdc8aaf486 100644 (file)
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -57,7 +57,7 @@
 #include <errno.h>
 
 int
-get_key_data_kvno(context, count, data)
+krb5_db_get_key_data_kvno(context, count, data)
     krb5_context         context;
     int                          count;
     krb5_key_data      * data;
@@ -260,7 +260,8 @@ krb5_dbe_crk(context, master_key, ks_tuple, ks_tuple_count, keepold, db_entry)
     int                          i;
 
     /* First save the old keydata */
-    kvno = get_key_data_kvno(context, db_entry->n_key_data, db_entry->key_data);
+    kvno = krb5_db_get_key_data_kvno(context, db_entry->n_key_data,
+                                    db_entry->key_data);
     key_data_count = db_entry->n_key_data;
     key_data = db_entry->key_data;
     db_entry->key_data = NULL;
@@ -315,7 +316,8 @@ krb5_dbe_ark(context, master_key, ks_tuple, ks_tuple_count, db_entry)
     int                          i;
 
     /* First save the old keydata */
-    kvno = get_key_data_kvno(context, db_entry->n_key_data, db_entry->key_data);
+    kvno = krb5_db_get_key_data_kvno(context, db_entry->n_key_data,
+                                    db_entry->key_data);
     key_data_count = db_entry->n_key_data;
     key_data = db_entry->key_data;
     db_entry->key_data = NULL;
@@ -553,8 +555,8 @@ krb5_dbe_def_cpw(context, master_key, ks_tuple, ks_tuple_count, passwd,
     int                          i;
 
     /* First save the old keydata */
-    old_kvno = get_key_data_kvno(context, db_entry->n_key_data,
-                                db_entry->key_data);
+    old_kvno = krb5_db_get_key_data_kvno(context, db_entry->n_key_data,
+                                        db_entry->key_data);
     key_data_count = db_entry->n_key_data;
     key_data = db_entry->key_data;
     db_entry->key_data = NULL;
@@ -612,8 +614,8 @@ krb5_dbe_apw(context, master_key, ks_tuple, ks_tuple_count, passwd, db_entry)
     int                          i;
 
     /* First save the old keydata */
-    old_kvno = get_key_data_kvno(context, db_entry->n_key_data,
-                                db_entry->key_data);
+    old_kvno = krb5_db_get_key_data_kvno(context, db_entry->n_key_data,
+                                        db_entry->key_data);
     key_data_count = db_entry->n_key_data;
     key_data = db_entry->key_data;
     db_entry->key_data = NULL;

diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports
index 37e384c8b590963d84ef6a71c3c0c0b5ad1c0aec..e542576007105df142d1cd6f3446bc5fb4a2a1d5 100644 (file)
--- a/src/lib/kdb/libkdb5.exports
+++ b/src/lib/kdb/libkdb5.exports
@@ -1,4 +1,3 @@
-get_key_data_kvno
 krb5_db_open
 krb5_db_inited
 krb5_db_alloc
@@ -12,6 +11,7 @@ krb5_db_free_mkey_list
 krb5_db_fini
 krb5_db_free_principal
 krb5_db_get_age
+krb5_db_get_key_data_kvno
 krb5_db_get_mkey
 krb5_db_get_mkey_list
 krb5_db_get_context