summaryrefslogtreecommitdiffstats
path: root/src/admin
diff options
context:
space:
mode:
authorMark Eichin <eichin@mit.edu>1996-02-23 23:44:44 +0000
committerMark Eichin <eichin@mit.edu>1996-02-23 23:44:44 +0000
commitcc989d3541404487c0bf146926ffac8f616dacda (patch)
tree24b1829eef790d1a5134cfd2e2a4a8dba84e11a5 /src/admin
parente43b29f2750df68d24c234528210537453698be9 (diff)
downloadkrb5-cc989d3541404487c0bf146926ffac8f616dacda.tar.gz
krb5-cc989d3541404487c0bf146926ffac8f616dacda.tar.xz
krb5-cc989d3541404487c0bf146926ffac8f616dacda.zip
* kdb5_edit.c (kdb5_edit_Init): set manual_mkey for testing with -P
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7504 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/admin')
-rw-r--r--src/admin/edit/ChangeLog4
-rw-r--r--src/admin/edit/kdb5_edit.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog
index bd2682297..db8424b59 100644
--- a/src/admin/edit/ChangeLog
+++ b/src/admin/edit/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 23 18:44:10 1996 Mark Eichin <eichin@cygnus.com>
+
+ * kdb5_edit.c (kdb5_edit_Init): set manual_mkey for testing with -P
+
Wed Feb 14 09:52:18 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
* kdb5_edit.c (enter_master_key, set_dbname_help): If master key
diff --git a/src/admin/edit/kdb5_edit.c b/src/admin/edit/kdb5_edit.c
index ea3d0c852..c145f8634 100644
--- a/src/admin/edit/kdb5_edit.c
+++ b/src/admin/edit/kdb5_edit.c
@@ -133,6 +133,7 @@ char *kdb5_edit_Init(argc, argv)
switch(optchar) {
case 'P': /* Only used for testing!!! */
mkey_password = optarg;
+ manual_mkey = TRUE;
break;
case 'd': /* set db name */
dbname = optarg;