rbb 2002/11/22 09:01:12
Modified: . configure.in
passwd apr_getpass.c
Log:
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 <[EMAIL PROTECTED]>
Revision Changes Path
1.505 +1 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- configure.in 15 Nov 2002 11:32:13 -0000 1.504
+++ configure.in 22 Nov 2002 17:01:12 -0000 1.505
@@ -873,7 +873,7 @@
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)
1.24 +4 -0 apr/passwd/apr_getpass.c
Index: apr_getpass.c
===================================================================
RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apr_getpass.c 14 Sep 2002 20:41:10 -0000 1.23
+++ apr_getpass.c 22 Nov 2002 17:01:12 -0000 1.24
@@ -253,7 +253,11 @@
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);