commit 5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1
author Igor Sysoev <igor@sysoev.ru> Mon May 16 14:54:50 2011 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon May 16 14:54:50 2011 +0000
tree 37bc6eae1d5fa69c41621d03f93d06fb5e7d9dd9
parent ffc72712505da246d7d55300f71693e55a36957d

"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
patch by Maxim Dounin

src/os/unix/ngx_user.c

diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c
index 165c6a4..c46fb2b 100644
--- a/src/os/unix/ngx_user.c
+++ b/src/os/unix/ngx_user.c
@@ -23,7 +23,7 @@
 #if (NGX_HAVE_GNU_CRYPT_R)
 
 ngx_int_t
-ngx_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)
 {
     char               *value;
     size_t              len;
@@ -58,7 +58,7 @@
 #else
 
 ngx_int_t
-ngx_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)
 {
     char       *value;
     size_t      len;

src/os/unix/ngx_user.h

diff --git a/src/os/unix/ngx_user.h b/src/os/unix/ngx_user.h
index 7cd944d..68d1c6e 100644
--- a/src/os/unix/ngx_user.h
+++ b/src/os/unix/ngx_user.h
@@ -16,7 +16,7 @@
 typedef gid_t  ngx_gid_t;
 
 
-ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
+ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);
 
 

src/os/win32/ngx_user.c

diff --git a/src/os/win32/ngx_user.c b/src/os/win32/ngx_user.c
index cc07603..5167870 100644
--- a/src/os/win32/ngx_user.c
+++ b/src/os/win32/ngx_user.c
@@ -10,7 +10,7 @@
 #if (NGX_CRYPT)
 
 ngx_int_t
-ngx_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)
 {
     /* STUB: a plain text password */
 

src/os/win32/ngx_user.h

diff --git a/src/os/win32/ngx_user.h b/src/os/win32/ngx_user.h
index 6e8c58b..fd30df2 100644
--- a/src/os/win32/ngx_user.h
+++ b/src/os/win32/ngx_user.h
@@ -17,7 +17,7 @@
 #define ngx_gid_t  ngx_int_t
 
 
-ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
+ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt,
     u_char **encrypted);