diff options
| author | Kyle J. McKay <Kyle J. McKay> | 2015-12-04 20:53:51 +0000 |
|---|---|---|
| committer | Stefan Bühler <stbuehler@web.de> | 2015-12-04 20:53:51 +0000 |
| commit | b37dd77491e7a2fe6dfff29e1151d7357657d35b (patch) | |
| tree | 4763ca4ebdd23812de4aee9131c08f78472079cb | |
| parent | 159ca0c15d71355457337d859aea2c3fc6ccb2ca (diff) | |
| download | lighttpd-git-lighttpd-1.4.38.tar.gz | |
[core] show correct crypt support result (fixes #2690)lighttpd-1.4.38
If the crypt function is available as part of the standard
system library, then HAVE_LIBCRYPT will not be set, but
HAVE_CRYPT or HAVE_CRYPT_R will.
Make server.c test HAVE_CRYPT, HAVE_CRYPT_R and HAVE_LIBCRYPT
to determine the correct value of crypt support.
Signed-off-by: Kyle J. McKay
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3061 152afb58-edef-0310-8abb-c4023f1b3aa9
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/server.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -19,6 +19,7 @@ NEWS * [mod_secdownload] add required algorithm option; old behaviour available as "md5", new options "hmac-sha1" and "hmac-sha256" * [mod_fastcgi/mod_scgi] zero sockaddr structs before use (fixes #2691, thx Kyle J. McKay) * [network] add darwin-sendfile backend (fixes #2687, thx Kyle J. McKay) + * [core] show correct crypt support result (fixes #2690, thx Kyle J. McKay) - 1.4.37 - 2015-08-30 * [mod_proxy] remove debug log line from error log (fixes #2659) diff --git a/src/server.c b/src/server.c index 8a563b6a..8a8a9254 100644 --- a/src/server.c +++ b/src/server.c @@ -459,7 +459,7 @@ static void show_features (void) { #else "\t- bzip2 support\n" #endif -#ifdef HAVE_LIBCRYPT +#if defined(HAVE_CRYPT) || defined(HAVE_CRYPT_R) || defined(HAVE_LIBCRYPT) "\t+ crypt support\n" #else "\t- crypt support\n" |