summaryrefslogtreecommitdiffstats
path: root/src/kadmin
diff options
context:
space:
mode:
Diffstat (limited to 'src/kadmin')
-rw-r--r--src/kadmin/cli/ChangeLog5
-rw-r--r--src/kadmin/cli/kadmin.c8
-rw-r--r--src/kadmin/dbutil/ChangeLog6
-rw-r--r--src/kadmin/dbutil/dumpv4.c2
-rw-r--r--src/kadmin/dbutil/loadv4.c2
-rw-r--r--src/kadmin/ktutil/ChangeLog5
-rw-r--r--src/kadmin/ktutil/ktutil_funcs.c2
-rw-r--r--src/kadmin/passwd/ChangeLog5
-rw-r--r--src/kadmin/passwd/kpasswd_strings.et2
-rw-r--r--src/kadmin/v5passwdd/ChangeLog6
-rw-r--r--src/kadmin/v5passwdd/kpasswd.c8
11 files changed, 39 insertions, 12 deletions
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 <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 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);
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);
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index 388fde508..cccc49363 100644
--- 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 073b03628..c64a41cae 100644
--- 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 213821472..206902358 100644
--- 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 b78aa9d6f..7e826d270 100644
--- 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 419b941ef..ced306736 100644
--- 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 5f76cea60..9a9318044 100644
--- 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"
generated by cgit (git 2.34.1) at 2024-11-10 00:34:11 +0000