svn rev #21800: branches/mkey_migrate/src/ include/ kadmin/dbutil/ lib/kdb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21800
Commit By: ghudson
Log Message:
Namespace-protect get_key_data_kvno.



Changed Files:
U   branches/mkey_migrate/src/include/kdb.h
U   branches/mkey_migrate/src/kadmin/dbutil/kdb5_mkey.c
U   branches/mkey_migrate/src/lib/kdb/kdb_cpw.c
U   branches/mkey_migrate/src/lib/kdb/libkdb5.exports
Modified: branches/mkey_migrate/src/include/kdb.h
===================================================================
--- branches/mkey_migrate/src/include/kdb.h	2009-01-26 20:02:54 UTC (rev 21799)
+++ branches/mkey_migrate/src/include/kdb.h	2009-01-26 21:26:15 UTC (rev 21800)
@@ -513,9 +513,9 @@
 	      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 */

Modified: branches/mkey_migrate/src/kadmin/dbutil/kdb5_mkey.c
===================================================================
--- branches/mkey_migrate/src/kadmin/dbutil/kdb5_mkey.c	2009-01-26 20:02:54 UTC (rev 21799)
+++ branches/mkey_migrate/src/kadmin/dbutil/kdb5_mkey.c	2009-01-26 21:26:15 UTC (rev 21800)
@@ -145,8 +145,8 @@
     }
 
     /* 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;
 

Modified: branches/mkey_migrate/src/lib/kdb/kdb_cpw.c
===================================================================
--- branches/mkey_migrate/src/lib/kdb/kdb_cpw.c	2009-01-26 20:02:54 UTC (rev 21799)
+++ branches/mkey_migrate/src/lib/kdb/kdb_cpw.c	2009-01-26 21:26:15 UTC (rev 21800)
@@ -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 @@
     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 @@
     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 @@
     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 @@
     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;

Modified: branches/mkey_migrate/src/lib/kdb/libkdb5.exports
===================================================================
--- branches/mkey_migrate/src/lib/kdb/libkdb5.exports	2009-01-26 20:02:54 UTC (rev 21799)
+++ branches/mkey_migrate/src/lib/kdb/libkdb5.exports	2009-01-26 21:26:15 UTC (rev 21800)
@@ -1,4 +1,3 @@
-get_key_data_kvno
 krb5_db_open
 krb5_db_inited
 krb5_db_alloc
@@ -12,6 +11,7 @@
 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