Don't call get_config_params again, since it's not necessary, and

breaks the policy database name if it is manually set.

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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index d7ab2534fc6f4b76e7231708b556d58b116a8935..90556295d5d5309020ad829c39aa3e98de4aaa59 100644 (file)
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep  9 11:06:29 1996  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * loadv4.c: Don't call get_config_params again, since it's not
+               necessary, and breaks the policy database name if it is
+               manually set.
+
 Wed Sep  4 17:34:58 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * loadv4.c (load_v4db): Fix argument parsing so that it actually works!

diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index 2f5294343278a6f6a4f59145076331b44cf17d15..d49429b6f4d4007d3c9812b9be6d7bc4e45ad5a7 100644 (file)
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -1,7 +1,7 @@
 /*
- * admin/edit/loadv4.c
+ * kadmin/dbutil/loadv4.c
  *
- * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * Copyright 1996 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -351,18 +351,10 @@ master key name '%s'\n",
     memset((char *)master_keyblock.contents, 0, master_keyblock.length);
 
     /*
-     * Cons up config params for new database.
+     * Cons up config params for new database; using the global_params
+     * is just fine.
      */
     newparams = global_params;
-    newparams.mask &= ~(KADM5_CONFIG_ADBNAME | KADM5_CONFIG_ADB_LOCKFILE);
-    newparams.dbname = dbname;
-    newparams.mask |= KADM5_CONFIG_DBNAME;
-    if (retval = kadm5_get_config_params(context, NULL, NULL, &newparams,
-                                      &newparams)) {
-        com_err(PROGNAME, retval, "while retrieiving configuration "
-                "parameters");
-        return;
-    }
 
     /*
      * Always create the policy db, even if we are not loading a dump