From 634cc8fdffbf83e339844a8da2812fae3964cd31 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 Jan 2014 15:57:13 +1300 Subject: auth: Remove USE_BOTH_CRYPT_CALLS block from pass_check.c This code is dead since the move to the WAF build system, but was set for HP-UX 9, 10 and 11 in the autoconf build system. Signed-off-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- source4/auth/ntlm/auth_unix.c | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'source4/auth/ntlm/auth_unix.c') diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c index d1f62858eae..00abc44f376 100644 --- a/source4/auth/ntlm/auth_unix.c +++ b/source4/auth/ntlm/auth_unix.c @@ -543,25 +543,6 @@ static NTSTATUS password_check(const char *username, const char *password, #endif /* ULTRIX_AUTH */ -#if defined(HAVE_BIGCRYPT) && defined(HAVE_CRYPT) && defined(USE_BOTH_CRYPT_CALLS) - - /* - * Some systems have bigcrypt in the C library but might not - * actually use it for the password hashes (HPUX 10.20) is - * a noteable example. So we try bigcrypt first, followed - * by crypt. - */ - - if (strcmp(bigcrypt(password, salt), crypted) == 0) - return NT_STATUS_OK; - else - ret = (strcmp((char *)crypt(password, salt), crypted) == 0); - if (ret) { - return NT_STATUS_OK; - } else { - return NT_STATUS_WRONG_PASSWORD; - } -#else /* HAVE_BIGCRYPT && HAVE_CRYPT && USE_BOTH_CRYPT_CALLS */ #ifdef HAVE_BIGCRYPT ret = (strcmp(bigcrypt(password, salt), crypted) == 0); @@ -583,7 +564,6 @@ static NTSTATUS password_check(const char *username, const char *password, return NT_STATUS_WRONG_PASSWORD; } #endif /* HAVE_CRYPT */ -#endif /* HAVE_BIGCRYPT && HAVE_CRYPT && USE_BOTH_CRYPT_CALLS */ } static NTSTATUS check_unix_password(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx, -- cgit