diff options
| author | Theodore Tso <tytso@mit.edu> | 1996-09-09 15:10:31 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1996-09-09 15:10:31 +0000 |
| commit | f0d5c47e9b853f08ea8451ee93bfeb2802ee7c3a (patch) | |
| tree | 29d43bdf6f2b8b16f5c8dd1abfcd6e9bfeb10def /src/kadmin | |
| parent | 4dfb60a64524bd8036bd4b3f7d801581017e32b7 (diff) | |
| download | krb5-f0d5c47e9b853f08ea8451ee93bfeb2802ee7c3a.tar.gz krb5-f0d5c47e9b853f08ea8451ee93bfeb2802ee7c3a.tar.xz krb5-f0d5c47e9b853f08ea8451ee93bfeb2802ee7c3a.zip | |
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
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/dbutil/loadv4.c | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index d7ab2534fc..90556295d5 100644 --- 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 2f52943432..d49429b6f4 100644 --- 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 |