From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 Jan 2014 02:57:13 +0000 (+1300)
Subject: auth: Remove USE_BOTH_CRYPT_CALLS block from pass_check.c
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=634cc8fdffbf83e339844a8da2812fae3964cd31;p=mat%2Fsamba.git

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 <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c
index 2941bc07f8..6450559175 100644
--- a/source3/auth/pass_check.c
+++ b/source3/auth/pass_check.c
@@ -96,25 +96,6 @@ static NTSTATUS password_check(const char *user, const char *password, const voi
 #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, get_this_salt()), get_this_crypted()) == 0)
-		return NT_STATUS_OK;
-	else
-		ret = (strcmp((char *)crypt(password, get_this_salt()), get_this_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, get_this_salt()), get_this_crypted()) == 0);
@@ -136,7 +117,6 @@ static NTSTATUS password_check(const char *user, const char *password, const voi
 		return NT_STATUS_WRONG_PASSWORD;
 	}
 #endif /* HAVE_CRYPT */
-#endif /* HAVE_BIGCRYPT && HAVE_CRYPT && USE_BOTH_CRYPT_CALLS */
 #endif /* WITH_PAM */
 }
 
diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c
index d1f62858ea..00abc44f37 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,