1berry/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: fix build without libcrypt.

Browse Source 
libcrypt is no longer part of glibc, so it might not be available.

Signed-off-by: Piotr Sikora <piotr@aviatrix.com>
This commit is contained in:
Piotr Sikora 2025-02-12 10:40:58 +02:00 committed by Roman Arutyunyan
parent f274b3f72f
commit 9a4090f02a
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/unix
View File

@ -150,7 +150,7 @@ fi
ngx_feature="crypt()" ngx_feature="crypt()"
ngx_feature_name= ngx_feature_name="NGX_HAVE_CRYPT"
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs= ngx_feature_incs=
ngx_feature_path= ngx_feature_path=
@ -162,7 +162,7 @@ ngx_feature_test="crypt(\"test\", \"salt\");"
if [ $ngx_found = no ]; then if [ $ngx_found = no ]; then
ngx_feature="crypt() in libcrypt" ngx_feature="crypt() in libcrypt"
ngx_feature_name= ngx_feature_name="NGX_HAVE_CRYPT"
ngx_feature_run=no ngx_feature_run=no
ngx_feature_incs= ngx_feature_incs=
ngx_feature_path= ngx_feature_path=

6
src/os/unix/ngx_linux_config.h
View File

@ -52,7 +52,6 @@
#include <malloc.h> /* memalign() */ #include <malloc.h> /* memalign() */
#include <limits.h> /* IOV_MAX */ #include <limits.h> /* IOV_MAX */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <crypt.h>
#include <sys/utsname.h> /* uname() */ #include <sys/utsname.h> /* uname() */
#include <dlfcn.h> #include <dlfcn.h>
@ -61,6 +60,11 @@
#include <ngx_auto_config.h> #include <ngx_auto_config.h>
#if (NGX_HAVE_CRYPT_H)
#include <crypt.h>
#endif
#if (NGX_HAVE_POSIX_SEM) #if (NGX_HAVE_POSIX_SEM)
#include <semaphore.h> #include <semaphore.h>
#endif #endif

10
src/os/unix/ngx_user.c
View File

@ -41,7 +41,7 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
return NGX_ERROR; return NGX_ERROR;
} }
#else #elif (NGX_HAVE_CRYPT)
ngx_int_t ngx_int_t
ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
@ -71,6 +71,14 @@ ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
return NGX_ERROR; return NGX_ERROR;
} }
#else
ngx_int_t
ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
{
return NGX_ERROR;
}
#endif #endif
#endif /* NGX_CRYPT */ #endif /* NGX_CRYPT */