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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 920c40964748ebc1843fb746481f4c751d94b396..9dc2d1e89e557ea4673783c041a9f4fa4938e45c 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * login.c (k5_get_password): Remove trailing colon, as new
+       implementation of krb5_read_password() appends it.
+
 2002-09-14  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (rcp): Fix typo in 06-25 change.

diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c
index d3a158cb5b3466084cf4a434ca3338152e8b67a4..f1ebff4f7902646d088aebc2c0e19e38862f7e54 100644 (file)
--- a/src/appl/bsd/login.c
+++ b/src/appl/bsd/login.c
@@ -575,7 +575,7 @@ static int k5_get_password (user_pwstring, pwsize)
 {
     krb5_error_code code;
     char prompt[255];                  
-    sprintf(prompt,"Password for %s: ", username);
+    sprintf(prompt,"Password for %s", username);
 
     /* reduce opportunities to be swapped out */
     code = krb5_read_password(kcontext, prompt, 0, user_pwstring, &pwsize);

diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index 53a2c15dbe5f6a13e992c36fb8fdb6b621695fd9..802ab3e0148d84412a61636174c0959373cce2e3 100644 (file)
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * kinit.c (k4_kinit): Remove trailing colon, as new implementation
+       of krb5_read_password() appends it.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index 824d20c5b4fbe41f1f27818a85e66b6fb2ae7b55..740b0302ac887586f8ee735a8a2cc6ca9b21a5e2 100644 (file)
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -907,7 +907,7 @@ k4_kinit(opts, k4, ctx)
            krb5_error_code code;
            char prompt[1024];
 
-           sprintf(prompt, "Password for %s: ", opts->principal_name);
+           sprintf(prompt, "Password for %s", opts->principal_name);
            stash_password[0] = 0;
            /*
              Note: krb5_read_password does not actually look at the

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 94b426519a1f6aea1bcb12f631f7fc695ae1effa..755ff1cbba46b0ad7f70a3bd9e4b3c17bba4e8d5 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * k5-int.h (DEFAULT_PWD_STRING1, DEFAULT_PWD_STRING2): Remove
+       trailing colon, as new implementation of krb5_read_password()
+       appends it.
+
 2002-10-31  Ken Raeburn  <raeburn@mit.edu>
 
        * k5-int.h (krb5_ser_handle): Now points to const.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index e6d69205cdbe711a164104d74e6dd742da4f1510..90d2c9caa41675965b4d794e6a630e0732c7fffd 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -138,8 +138,8 @@ typedef unsigned char       u_char;
 #endif /* HAVE_SYS_TYPES_H */
 #endif /* KRB5_SYSTYPES__ */
 
-#define DEFAULT_PWD_STRING1 "Enter password:"
-#define DEFAULT_PWD_STRING2 "Re-enter password for verification:"
+#define DEFAULT_PWD_STRING1 "Enter password"
+#define DEFAULT_PWD_STRING2 "Re-enter password for verification"
 
 #define        KRB5_KDB_MAX_LIFE       (60*60*24) /* one day */
 #define        KRB5_KDB_MAX_RLIFE      (60*60*24*7) /* one week */

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index d620091a9870677289cfd780eae5bbc62a0992d7..66a48e3e6f113ed395e53db9ea1613e0cf10cb96 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * kdb.h (KRB5_KDC_MKEY_1, KRB5_KDC_MKEY_2): Remove trailing colon,
+       as new implementation of krb5_read_password() appends it.
+
 2002-09-18  Ken Raeburn  <raeburn@mit.edu>
 
        * adm.h (struct __krb5_realm_params): New field

diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index f21fa845784737cb581959e840c516bbab34fe1c..1670b54369051e02ae956bad4595ae1b4d60951f 100644 (file)
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -162,8 +162,8 @@ typedef struct _krb5_db_entry_new {
 #define KRB5_KDB_M_NAME                "K/M"   /* Kerberos/Master */
 
 /* prompts used by default when reading the KDC password from the keyboard. */
-#define KRB5_KDC_MKEY_1        "Enter KDC database master key:"
-#define KRB5_KDC_MKEY_2        "Re-enter KDC database master key to verify:"
+#define KRB5_KDC_MKEY_1        "Enter KDC database master key"
+#define KRB5_KDC_MKEY_2        "Re-enter KDC database master key to verify"
 
 extern char *krb5_mkey_pwd_prompt1;
 extern char *krb5_mkey_pwd_prompt2;

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 3b468f1631f0250591b80b95a61dc6fb93c02a24..a77e0509cafb11a70efb877968b41e336e7c6e90 100644 (file)
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * kadmin.c (kadmin_addprinc, kadmin_cpw): Remove trailing colon,
+       as new implementation of krb5_read_password() appends it.
+
 2002-10-08  Tom Yu  <tlyu@mit.edu>
 
        * kadmin.c (quit): Release exclusive lock, if acquired.

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 72dc594b86a27c285c8b056a604b19cde5e944fc..189938e65767c03244687effc1005d3310fc1c7b 100644 (file)
--- 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);

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 73b191dbe480e19eef7b4255f871d401d978b5b2..cf66191569817537397e6d83e1a99e9e5c5a58c1 100644 (file)
--- 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 461da833d215d99a9e324d2f88bb1a21825c058c..e6bd1f407471759a555e103c2134ddcf493e3bff 100644 (file)
--- 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 7ddba43c04aaf10e17dcfa6ad0811a222f4a7e67..07bc27645e7a2681de9b3c5ea554350dac5534f2 100644 (file)
--- 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);

diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 388fde50898b48d8feec6f82c8c9d5d004cfef54..cccc4936334a04ef5de0f89851751c798b7d5eaa 100644 (file)
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * ktutil_funcs.c (ktutil_add): Remove trailing colon, as new
+       implementation of krb5_read_password() appends it.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * ktutil_ct.ct: Add final "end" statement.

diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
index 073b036283dd04e9d04384ae5d0169e7436b5639..c64a41caea55aedc23384354f153f7538d93e62b 100644 (file)
--- a/src/kadmin/ktutil/ktutil_funcs.c
+++ b/src/kadmin/ktutil/ktutil_funcs.c
@@ -161,7 +161,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
            goto cleanup;
        }
 
-       sprintf(promptstr, "Password for %.1000s: ", princ_str);
+       sprintf(promptstr, "Password for %.1000s", princ_str);
         retval = krb5_read_password(context, promptstr, NULL, password.data,
                                    &password.length);
        if (retval)

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 2138214720202c3d194461c7fac9127fa5be7236..206902358eb9abc95fa4416c165eee28136450e2 100644 (file)
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * kpasswd_strings.et: Remove trailing colon, as new implementation
+       of krb5_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/passwd/kpasswd_strings.et b/src/kadmin/passwd/kpasswd_strings.et
index b78aa9d6f2d1ed6882d97ca5708b5a468a8fc887..7e826d270f2f71a5695e6c17b92cecf8caff6396 100644 (file)
--- a/src/kadmin/passwd/kpasswd_strings.et
+++ b/src/kadmin/passwd/kpasswd_strings.et
@@ -45,7 +45,7 @@ error_code KPW_STR_NOT_IN_PASSWD_FILE,        "Unable to identify user from password fi
 error_code KPW_STR_CHANGING_PW_FOR, "Changing password for %s."
 # /* principal@realm */
 
-error_code KPW_STR_OLD_PASSWORD_PROMPT, "Old password:"
+error_code KPW_STR_OLD_PASSWORD_PROMPT, "Old password"
 error_code KPW_STR_WHILE_READING_PASSWORD, "while reading new password."
 
 # /* M4 */

diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 419b941ef84930a8a757c78597782737e2495e87..ced30673668798fbf3d5f9092e5ad29c6f592155 100644 (file)
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * kpasswd.c (kpwd_change_prompt_1, kpwd_change_prompt_2)
+       (kpwd_old_password_prompt, kpwd_old_pwd_name_fmt): Remove trailing
+       colon, as new implementation of krb5_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/v5passwdd/kpasswd.c b/src/kadmin/v5passwdd/kpasswd.c
index 5f76cea60337890a76c669fc6ed91817f2c1bffb..9a9318044b5ff8329335d8dc5ce841e9aa8f195c 100644 (file)
--- a/src/kadmin/v5passwdd/kpasswd.c
+++ b/src/kadmin/v5passwdd/kpasswd.c
@@ -55,10 +55,10 @@
  * Local data.
  */
 #define kpwd_serror_head               "server"
-#define kpwd_change_prompt_1           "   Enter new password: "
-#define kpwd_change_prompt_2           "Re-enter new password: "
-#define kpwd_old_password_prompt       "   Enter old password: "
-#define kpwd_old_pwd_name_fmt          "Enter old password for %s: "
+#define kpwd_change_prompt_1           "   Enter new password"
+#define kpwd_change_prompt_2           "Re-enter new password"
+#define kpwd_old_password_prompt       "   Enter old password"
+#define kpwd_old_pwd_name_fmt          "Enter old password for %s"
 
 #ifdef LANGUAGES_SUPPORTED
 #define kpwd_usage_error_fmt           "%s: usage is %s [-u user] [-l language]\n"

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6a91bf428c845acfd90f3589db38604d6540136f..a1b5057f14d1c0038f1fee97f71a162fd3f933b4 100644 (file)
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-05  Tom Yu  <tlyu@mit.edu>
+
+       * chpass_util_strings.et: Remove trailing colons, as new
+       implementation of krb5_read_password() appends it.
+
 2002-10-08  Tom Yu  <tlyu@mit.edu>
 
        * adb.h (struct _osa_adb_db_ent_t): Add opencnt, which keeps track

diff --git a/src/lib/kadm5/chpass_util_strings.et b/src/lib/kadm5/chpass_util_strings.et
index 03225499824cd0f2b2d043abb2cbd50137d825c5..eb4bccaed35729a6cd6757b7f2662000a96cb134 100644 (file)
--- a/src/lib/kadm5/chpass_util_strings.et
+++ b/src/lib/kadm5/chpass_util_strings.et
@@ -7,8 +7,8 @@ error_code CHPASS_UTIL_GET_PRINC_INFO, "while getting principal info."
 error_code CHPASS_UTIL_NEW_PASSWORD_MISMATCH, 
        "New passwords do not match - password not changed.\n"
 
-error_code CHPASS_UTIL_NEW_PASSWORD_PROMPT, "New password:"
-error_code CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT, "New password (again):"
+error_code CHPASS_UTIL_NEW_PASSWORD_PROMPT, "New password"
+error_code CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT, "New password (again)"
 error_code CHPASS_UTIL_NO_PASSWORD_READ, "You must type a password. Passwords must be at least one character long.\n"
 error_code CHPASS_UTIL_NO_POLICY_YET_Q_ERROR, 
 "yet no policy set!  Contact your system security administrator."