pull up r18292 from trunk

 r18292@cathode-dark-space:  raeburn | 2006-06-30 16:18:39 -0400
 ticket: 3964
 status: open

 * kdb_default.c (krb5_def_promote_db): New function.
 * kdb5.c (kdb_setup_opt_functions): Use it if promote_db is null.

 * libkdb5.exports: Export krb5_db_promote.

ticket: 3964
version_fixed: 1.5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18304 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index 46f0eeb8f85c2dc9869aed89f90cd998d8c8c108..d59a7cf769f668225ef629ed1fd0c3bce2dad478 100644 (file)
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -217,6 +217,10 @@ kdb_setup_opt_functions(db_library lib)
     if (lib->vftabl.store_master_key == NULL) {
        lib->vftabl.store_master_key = krb5_def_store_mkey;
     }
+
+    if (lib->vftabl.promote_db == NULL) {
+       lib->vftabl.promote_db = krb5_def_promote_db;
+    }
 }
 
 static int kdb_db2_pol_err_loaded = 0;

diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
index 4eb0f51f383b4ab87f198cbc0e888ae03d99588c..7153330560b0e926d62ee217bf3928173fa89574 100644 (file)
--- a/src/lib/kdb/kdb_default.c
+++ b/src/lib/kdb/kdb_default.c
@@ -329,3 +329,9 @@ krb5_error_code kdb_def_get_mkey ( krb5_context kcontext,
     return 0;
 }
 
+krb5_error_code krb5_def_promote_db (krb5_context kcontext,
+                                    char *s, char **args)
+{
+    printf("default promote_db\n");
+    return EINVAL;
+}

diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports
index fe2fae6492657dc03853f14bb54291d4e3c50cc8..dd9f95288b76fc3520e9acfa55cef5b36ea84d71 100644 (file)
--- a/src/lib/kdb/libkdb5.exports
+++ b/src/lib/kdb/libkdb5.exports
@@ -48,3 +48,4 @@ krb5_db_iter_policy
 krb5_db_delete_policy
 krb5_db_free_policy
 krb5_def_store_mkey
+krb5_db_promote