summaryrefslogtreecommitdiffstats
path: root/src/kadmin/dbutil
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2002-11-06 00:42:57 +0000
committerTom Yu <tlyu@mit.edu>2002-11-06 00:42:57 +0000
commitc1599f83f727ef71249e2fbfd3cc0f0cd430df26 (patch)
tree30802757ae833537861283ee6bf65da3d21f901c /src/kadmin/dbutil
parent8d702bfe4bccba2b07d599ae2ecdd4225fa8a895 (diff)
This commit fixes up the in-tree callers of krb5_read_password() and
des_read_password(). We should perhaps tighten up the test suite now. ticket: 1217 status: open target_version: 1.3 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14972 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/dbutil')
-rw-r--r--src/kadmin/dbutil/ChangeLog6
-rw-r--r--src/kadmin/dbutil/dumpv4.c2
-rw-r--r--src/kadmin/dbutil/loadv4.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 73b191dbe..cf6619156 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-05 Tom Yu <tlyu@mit.edu>
+
+ * dumpv4.c (v4init):
+ * loadv4.c (dumpfile;): Remove trailing colon, as new implementation
+ of des_read_password() appends it.
+
2002-08-29 Ken Raeburn <raeburn@mit.edu>
* Makefile.in: Revert $(S)=>/ change, for Windows support.
diff --git a/src/kadmin/dbutil/dumpv4.c b/src/kadmin/dbutil/dumpv4.c
index 461da833d..e6bd1f407 100644
--- a/src/kadmin/dbutil/dumpv4.c
+++ b/src/kadmin/dbutil/dumpv4.c
@@ -112,7 +112,7 @@ v4init(arg, manual)
}
}
if (!ok) {
- des_read_password(&arg->v4_master_key, "V4 Kerberos master key: ", 1);
+ des_read_password(&arg->v4_master_key, "V4 Kerberos master key", 1);
printf("\n");
}
arg->master_key_version = 1;
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index 7ddba43c0..07bc27645 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -464,7 +464,7 @@ char *dumpfile;
}
}
if (!ok) {
- des_read_password(&master_key, "V4 Kerberos master key: ", 0);
+ des_read_password(&master_key, "V4 Kerberos master key", 0);
printf("\n");
}
key_sched(master_key, master_key_schedule);