diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-11-06 00:42:57 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-11-06 00:42:57 +0000 |
| commit | c1599f83f727ef71249e2fbfd3cc0f0cd430df26 (patch) | |
| tree | 30802757ae833537861283ee6bf65da3d21f901c /src/include | |
| parent | 8d702bfe4bccba2b07d599ae2ecdd4225fa8a895 (diff) | |
| download | krb5-c1599f83f727ef71249e2fbfd3cc0f0cd430df26.zip krb5-c1599f83f727ef71249e2fbfd3cc0f0cd430df26.tar.gz krb5-c1599f83f727ef71249e2fbfd3cc0f0cd430df26.tar.bz2 | |
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/include')
| -rw-r--r-- | src/include/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/k5-int.h | 4 | ||||
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/kdb.h | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 94b4265..755ff1c 100644 --- 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 e6d6920..90d2c9c 100644 --- 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 d620091..66a48e3 100644 --- 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 f21fa84..1670b54 100644 --- 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; |