diff options
author | Ryan Bloom <rbb@apache.org> | 2002-11-22 17:01:12 +0000 |
---|---|---|
committer | Ryan Bloom <rbb@apache.org> | 2002-11-22 17:01:12 +0000 |
commit | 14d65d741964d58795fd0c76e149c550c3a82dcb (patch) | |
tree | 5ebdc3feade7f63dcad3b99495758304f3c9db1b | |
parent | 7fb95d100dbc05bb1e71cfbe8e645a10d0476381 (diff) | |
download | apr-14d65d741964d58795fd0c76e149c550c3a82dcb.tar.gz |
Getpass on Solaris has an 8 character limit, which makes it less than
useful. By switching to getpassphrase, we get a 256 character limit.
Submitted by: Florin Iucha <florin@iucha.net>
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@64057 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | passwd/apr_getpass.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in index dbee0e6c4..f287aca7e 100644 --- a/configure.in +++ b/configure.in @@ -873,7 +873,7 @@ if test "$native_mmap_emul" = "1"; then mmap="1" fi AC_CHECK_FUNCS(memmove, [ have_memmove="1" ], [have_memmove="0" ]) -AC_CHECK_FUNCS([getpass gmtime_r localtime_r hstrerror mkstemp]) +AC_CHECK_FUNCS([getpass getpassphrase gmtime_r localtime_r hstrerror mkstemp]) AC_SUBST(fork) AC_SUBST(have_inet_addr) diff --git a/passwd/apr_getpass.c b/passwd/apr_getpass.c index 78bab6623..72c67775e 100644 --- a/passwd/apr_getpass.c +++ b/passwd/apr_getpass.c @@ -253,7 +253,11 @@ static char *getpass(const char *prompt) APR_DECLARE(apr_status_t) apr_password_get(const char *prompt, char *pwbuf, apr_size_t *bufsiz) { +#ifdef HAVE_GETPASSPHRASE + char *pw_got = getpassphrase(prompt); +#else char *pw_got = getpass(prompt); +#endif if (!pw_got) return APR_EINVAL; apr_cpystrn(pwbuf, pw_got, *bufsiz); |