diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-10-25 15:51:50 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-10-25 15:51:50 +0000 |
| commit | 064436f6e85481f30c8cd640a55acf3e7b8fe680 (patch) | |
| tree | f17ab81afe7f6cc1c2e6b921827510caf41d9119 | |
| parent | e0bbafeb1739fb127be72d11542fdd30adcde925 (diff) | |
| download | FreeBSD-src-064436f6e85481f30c8cd640a55acf3e7b8fe680.zip FreeBSD-src-064436f6e85481f30c8cd640a55acf3e7b8fe680.tar.gz | |
Don't put an extra space after password prompts, because it violates POLA,
makes FreeBSD inconsistent with previous releases and "other unices" as well
as with some internal password-asking services (e.g. ftp) within the same
release.
| -rw-r--r-- | lib/libpam/modules/pam_krb5/pam_krb5.c | 6 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_unix/pam_unix.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index a629adc..1eaa470 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -228,9 +228,9 @@ static const char *compat_princ_component(krb5_context, krb5_principal, int); static void compat_free_data_contents(krb5_context, krb5_data *); #define USER_PROMPT "Username: " -#define PASSWORD_PROMPT "Password: " -#define NEW_PASSWORD_PROMPT "New Password: " -#define NEW_PASSWORD_PROMPT_2 "New Password (again): " +#define PASSWORD_PROMPT "Password:" +#define NEW_PASSWORD_PROMPT "New Password:" +#define NEW_PASSWORD_PROMPT_2 "New Password (again):" enum { PAM_OPT_AUTH_AS_SELF=PAM_OPT_STD_MAX, PAM_OPT_CCACHE, PAM_OPT_FORWARDABLE, PAM_OPT_NO_CCACHE, PAM_OPT_REUSE_CCACHE }; diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c index 546cec6..af6f989 100644 --- a/lib/libpam/modules/pam_unix/pam_unix.c +++ b/lib/libpam/modules/pam_unix/pam_unix.c @@ -60,10 +60,10 @@ __FBSDID("$FreeBSD$"); #include "pam_mod_misc.h" #define USER_PROMPT "Username: " -#define PASSWORD_PROMPT "Password: " -#define PASSWORD_PROMPT_EXPIRED "\nPassword expired\nOld Password: " -#define NEW_PASSWORD_PROMPT_1 "New Password: " -#define NEW_PASSWORD_PROMPT_2 "New Password (again): " +#define PASSWORD_PROMPT "Password:" +#define PASSWORD_PROMPT_EXPIRED "\nPassword expired\nOld Password:" +#define NEW_PASSWORD_PROMPT_1 "New Password:" +#define NEW_PASSWORD_PROMPT_2 "New Password (again):" #define PASSWORD_HASH "md5" #define DEFAULT_WARN (2L * 7L * 86400L) /* Two weeks */ #define MAX_TRIES 3 |
