RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-28 16:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: auth: report valid crypto(3) support depending on build options

Browse Source 
Since 1.8 with commit e8692b41e ("CLEANUP: auth: use the build options list
to report its support"), crypt(3) is always reported as being supported in
"haproxy -vv" because no test on USE_LIBCRYPT is made anymore when
producing the output.

This reintroduces the distinction between with and without USE_LIBCRYPT
in the output by indicating "yes" or "no". It may be backported as far
as 1.8, though the code differs due to a number of include files cleanups.
This commit is contained in:
Victor Kislov 2020-08-06 19:21:39 +03:00 committed by Willy Tarreau
parent 587be9ce30
commit ec00251c88
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/auth.c
View File

@ -36,6 +36,7 @@
struct userlist *userlist = NULL; /* list of all existing userlists */ struct userlist *userlist = NULL; /* list of all existing userlists */
#ifdef USE_LIBCRYPT #ifdef USE_LIBCRYPT
#define CRYPT_STATE_MSG "yes"
#ifdef HA_HAVE_CRYPT_R #ifdef HA_HAVE_CRYPT_R
/* context for crypt_r() */ /* context for crypt_r() */
static THREAD_LOCAL struct crypt_data crypt_data = { .initialized = 0 }; static THREAD_LOCAL struct crypt_data crypt_data = { .initialized = 0 };
@ -43,6 +44,8 @@ static THREAD_LOCAL struct crypt_data crypt_data = { .initialized = 0 };
/* lock for crypt() */ /* lock for crypt() */
__decl_thread(static HA_SPINLOCK_T auth_lock); __decl_thread(static HA_SPINLOCK_T auth_lock);
#endif #endif
#else /* USE_LIBCRYPT */
#define CRYPT_STATE_MSG "no"
#endif #endif
/* find targets for selected groups. The function returns pointer to /* find targets for selected groups. The function returns pointer to
@ -310,4 +313,4 @@ pat_match_auth(struct sample *smp, struct pattern_expr *expr, int fill)
return NULL; return NULL;
} }
REGISTER_BUILD_OPTS("Encrypted password support via crypt(3): yes"); REGISTER_BUILD_OPTS("Encrypted password support via crypt(3): "CRYPT_STATE_MSG);