From c1599f83f727ef71249e2fbfd3cc0f0cd430df26 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 6 Nov 2002 00:42:57 +0000 Subject: 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 --- src/kadmin/cli/ChangeLog | 5 +++++ src/kadmin/cli/kadmin.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/kadmin/cli') diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 3b468f163..a77e0509c 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +2002-11-05 Tom Yu + + * kadmin.c (kadmin_addprinc, kadmin_cpw): Remove trailing colon, + as new implementation of krb5_read_password() appends it. + 2002-10-08 Tom Yu * kadmin.c (quit): Release exclusive lock, if acquired. diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 72dc594b8..189938e65 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -681,10 +681,10 @@ void kadmin_cpw(argc, argv) } else if (argc == 1) { unsigned int i = sizeof (newpw) - 1; - sprintf(prompt1, "Enter password for principal \"%.900s\": ", + sprintf(prompt1, "Enter password for principal \"%.900s\"", *argv); sprintf(prompt2, - "Re-enter password for principal \"%.900s\": ", + "Re-enter password for principal \"%.900s\"", *argv); retval = krb5_read_password(context, prompt1, prompt2, newpw, &i); @@ -1009,10 +1009,10 @@ void kadmin_addprinc(argc, argv) } else if (pass == NULL) { unsigned int sz = sizeof (newpw) - 1; - sprintf(prompt1, "Enter password for principal \"%.900s\": ", + sprintf(prompt1, "Enter password for principal \"%.900s\"", canon); sprintf(prompt2, - "Re-enter password for principal \"%.900s\": ", + "Re-enter password for principal \"%.900s\"", canon); retval = krb5_read_password(context, prompt1, prompt2, newpw, &sz); -- cgit