From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 22 Jan 2014 02:42:33 +0000 (+1300)
Subject: auth: Remove support for plaintext auth on systems that use getprpwnam()
X-Git-Tag: ldb-1.1.17~151
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=e731655f09d7b4bb87cac33738a5f286d453610e;ds=sidebyside

auth: Remove support for plaintext auth on systems that use getprpwnam()

The WAF build does not have the code to detect getprpwnam, so this is
dead code.

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 5f134feb3ba..a5e03202b88 100644
--- a/source3/auth/pass_check.c
+++ b/source3/auth/pass_check.c
@@ -261,16 +261,6 @@ NTSTATUS pass_check(const struct passwd *pass,
 	}
 #endif
 
-#ifdef HAVE_GETPRPWNAM
-	{
-		struct pr_passwd *pr_pw = getprpwnam(pass->pw_name);
-		if (pr_pw && pr_pw->ufld.fd_encrypt) {
-			if (set_this_crypted(pr_pw->ufld.fd_encrypt) == NULL) {
-				return NT_STATUS_NO_MEMORY;
-			}
-		}
-	}
-#endif
 
 #ifdef HAVE_GETPWANAM
 	{
diff --git a/source4/auth/ntlm/auth_unix.c b/source4/auth/ntlm/auth_unix.c
index 4cff61b60a9..169e9abf8b1 100644
--- a/source4/auth/ntlm/auth_unix.c
+++ b/source4/auth/ntlm/auth_unix.c
@@ -650,15 +650,6 @@ static NTSTATUS check_unix_password(TALLOC_CTX *ctx, struct loadparm_context *lp
 	}
 #endif
 
-#ifdef HAVE_GETPRPWNAM
-	{
-		struct pr_passwd *pr_pw = getprpwnam(pws->pw_name);
-		if (pr_pw && pr_pw->ufld.fd_encrypt) {
-			crypted = talloc_strdup(ctx, pr_pw->ufld.fd_encrypt);
-			NT_STATUS_HAVE_NO_MEMORY(crypted);
-		}
-	}
-#endif
 
 #ifdef HAVE_GETPWANAM
 	{