Restore krb5_free_key_data_contents() as it was in

src/lib/kadm5/misc_free.c and rename the version of that function in
kdb5.c to krb5_dbe_free_key_data_contents.  Eventually this needs to be
consolidated somewhere.

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

diff --git a/src/include/kdb.h b/src/include/kdb.h
index ea6a5409715b7f701cbc7cbebfb60eb8d3dffb76..ae56568b3e40e8cedc9ea4821c9b6e3c87be7131 100644 (file)
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -53,6 +53,11 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 #ifndef KRB5_KDB5__
 #define KRB5_KDB5__
 
@@ -655,7 +660,7 @@ krb5_db_get_context
        (krb5_context, void **db_context);
 
 void
-krb5_free_key_data_contents(krb5_context, krb5_key_data *);
+krb5_dbe_free_key_data_contents(krb5_context, krb5_key_data *);
 
 #define KRB5_KDB_DEF_FLAGS     0
 

diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 658dcbfc92da37988f20efda640ee040ee6eedcf..57d469b1dcf09bdd3e7e7f48ae8103ef3f826da1 100644 (file)
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -312,7 +312,7 @@ kdb5_add_mkey(int argc, char *argv[])
     for (cur_mkey_aux_data = mkey_aux_data_head; cur_mkey_aux_data != NULL;
          cur_mkey_aux_data = next_mkey_aux_data) {
         next_mkey_aux_data = cur_mkey_aux_data->next;
-        krb5_free_key_data_contents(util_context, &(cur_mkey_aux_data->latest_mkey));
+        krb5_dbe_free_key_data_contents(util_context, &(cur_mkey_aux_data->latest_mkey));
         free(cur_mkey_aux_data);
     }
     return;

diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 74353b0ab12049fdd88e9e78b70044e23c24dfbb..086217e8e8fc8f398d8439218d5c95e3b75d8214 100644 (file)
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -53,6 +53,11 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 #include <stdio.h>
 #include <k5-int.h>
 #include <kadm5/admin.h>

diff --git a/src/lib/kadm5/clnt/libkadm5clnt.exports b/src/lib/kadm5/clnt/libkadm5clnt.exports
index b62ad55383072b7f907421094be6213e241720d6..7f11f320acfc7df24ff0d5161992e6ddfc8f76e4 100644 (file)
--- a/src/lib/kadm5/clnt/libkadm5clnt.exports
+++ b/src/lib/kadm5/clnt/libkadm5clnt.exports
@@ -46,6 +46,7 @@ krb5_aprof_get_string
 krb5_aprof_getvals
 krb5_aprof_init
 krb5_flags_to_string
+krb5_free_key_data_contents
 krb5_free_realm_params
 krb5_input_flag_to_string
 krb5_keysalt_is_present

diff --git a/src/lib/kadm5/misc_free.c b/src/lib/kadm5/misc_free.c
index e0d954245e6cc82be8eb47ade28d0fce3c2b80c0..b8fe2a05e1c4241dfe48ed237eb52549115cca00 100644 (file)
--- a/src/lib/kadm5/misc_free.c
+++ b/src/lib/kadm5/misc_free.c
@@ -39,6 +39,23 @@ kadm5_ret_t
     return KADM5_OK;
 }
 
+/* XXX this ought to be in libkrb5.a, but isn't */
+kadm5_ret_t krb5_free_key_data_contents(context, key)
+   krb5_context context;
+   krb5_key_data *key;
+{
+     int i, idx;
+     
+     idx = (key->key_data_ver == 1 ? 1 : 2);
+     for (i = 0; i < idx; i++) {
+         if (key->key_data_contents[i]) {
+              memset(key->key_data_contents[i], 0, key->key_data_length[i]);
+              free(key->key_data_contents[i]);
+         }
+     }
+     return KADM5_OK;
+}
+
 kadm5_ret_t kadm5_free_key_data(void *server_handle,
                                krb5_int16 *n_key_data,
                                krb5_key_data *key_data)

diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h
index 838d4fecf536ed328241b29fc9452a595730ac3e..4e890e8aa93fb759bbf22e28db124771ce640c05 100644 (file)
--- a/src/lib/kadm5/server_internal.h
+++ b/src/lib/kadm5/server_internal.h
@@ -85,11 +85,8 @@ void             destroy_dict(void);
 kadm5_ret_t krb5_copy_key_data_contents(krb5_context context,
                                        krb5_key_data *from, 
                                        krb5_key_data *to);
-/* XXX WAF: maybe delete this if all compiles */
-#if 0 /************** Begin IFDEF'ed OUT *******************************/
 kadm5_ret_t krb5_free_key_data_contents(krb5_context context, 
                                        krb5_key_data *key);
-#endif /**************** END IFDEF'ed OUT *******************************/
 
 /*
  * *Warning* 

diff --git a/src/lib/kadm5/srv/libkadm5srv.exports b/src/lib/kadm5/srv/libkadm5srv.exports
index 3aae9cc02fb0bb18b952565267f5f4f5a7b017bb..3296d3bb0fc3f89986557267dba30cf2f873b792 100644 (file)
--- a/src/lib/kadm5/srv/libkadm5srv.exports
+++ b/src/lib/kadm5/srv/libkadm5srv.exports
@@ -71,6 +71,7 @@ krb5_aprof_getvals
 krb5_aprof_init
 krb5_copy_key_data_contents
 krb5_flags_to_string
+krb5_free_key_data_contents
 krb5_free_realm_params
 krb5_input_flag_to_string
 krb5_keysalt_is_present

diff --git a/src/lib/kadm5/srv/server_kdb.c b/src/lib/kadm5/srv/server_kdb.c
index 43a9890ccf5d9e382f2d84222a1fb0ee5854f3f9..31f793ade46d1da2918780e80ec9f2f60520c217 100644 (file)
--- a/src/lib/kadm5/srv/server_kdb.c
+++ b/src/lib/kadm5/srv/server_kdb.c
@@ -4,6 +4,11 @@
  * $Header$
  */
 
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
 #if !defined(lint) && !defined(__CODECENTER__)
 static char *rcsid = "$Header$";
 #endif

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index eedf1fce3881b2c88aa5b376814ace088a1a9ac3..40de4589ac77ee125f25b4e96c81fca166286eed 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -106,6 +106,26 @@ kdb_unlock_list()
     return k5_mutex_unlock(&db_lock);
 }
 
+/*
+ * XXX eventually this should be consolidated with krb5_free_key_data_contents
+ * so there is only a single version.
+ */
+void
+krb5_dbe_free_key_data_contents(krb5_context context,
+                                krb5_key_data *key)
+{
+    int i, idx;
+
+    idx = (key->key_data_ver == 1 ? 1 : 2);
+    for (i = 0; i < idx; i++) {
+        if (key->key_data_contents[i]) {
+            zap(key->key_data_contents[i], key->key_data_length[i]);
+            free(key->key_data_contents[i]);
+        }
+    }
+    return;
+}
+
 static void
 krb5_free_actkvno_list(krb5_context context, krb5_actkvno_node *val)
 {
@@ -126,27 +146,11 @@ krb5_free_mkey_aux_list(krb5_context context, krb5_mkey_aux_node *val)
     for (temp = val; temp != NULL;) {
         prev = temp;
         temp = temp->next;
-        krb5_free_key_data_contents(context, &prev->latest_mkey);
+        krb5_dbe_free_key_data_contents(context, &prev->latest_mkey);
         krb5_xfree(prev);
     }
 }
 
-void
-krb5_free_key_data_contents(krb5_context context,
-                            krb5_key_data *key)
-{
-    int i, idx;
-
-    idx = (key->key_data_ver == 1 ? 1 : 2);
-    for (i = 0; i < idx; i++) {
-        if (key->key_data_contents[i]) {
-            zap(key->key_data_contents[i], key->key_data_length[i]);
-            free(key->key_data_contents[i]);
-        }
-    }
-    return;
-}
-
 #define kdb_init_lib_lock(a) 0
 #define kdb_destroy_lib_lock(a) (void)0
 #define kdb_lock_lib_lock(a, b) 0

diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports
index e542576007105df142d1cd6f3446bc5fb4a2a1d5..c202f988f19ac73682ff433705def3360fa46f9c 100644 (file)
--- a/src/lib/kdb/libkdb5.exports
+++ b/src/lib/kdb/libkdb5.exports
@@ -37,6 +37,7 @@ krb5_dbe_find_act_mkey
 krb5_dbe_fetch_act_key_list
 krb5_dbe_find_enctype
 krb5_dbe_find_mkey
+krb5_dbe_free_key_data_contents
 krb5_dbe_lookup_last_pwd_change
 krb5_dbe_lookup_actkvno
 krb5_dbe_lookup_mkvno
@@ -66,7 +67,6 @@ krb5_db_delete_policy
 krb5_db_free_policy
 krb5_def_store_mkey
 krb5_db_promote
-krb5_free_key_data_contents
 ulog_map
 ulog_set_role
 ulog_free_entries