From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 12 May 2017 14:04:02 +0000 (+0200)
Subject: s4:ldap_server: avoid pointless check arround LDAP_INVALID_CREDENTIALS
X-Git-Tag: ldb-1.1.31~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8d431250edebf96c1d80aacf2f676c93da907f4;p=thirdparty%2Fsamba.git

s4:ldap_server: avoid pointless check arround LDAP_INVALID_CREDENTIALS

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index e36cb1cebf6..06b52fe9510 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -428,11 +428,9 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
 
 	if (!NT_STATUS_IS_OK(status)) {
 		status = nt_status_squash(status);
-		if (result == 0) {
-			result = LDAP_INVALID_CREDENTIALS;
-			errstr = ldapsrv_bind_error_msg(reply, HRES_SEC_E_LOGON_DENIED,
-							0x0C0904DC, status);
-		}
+		result = LDAP_INVALID_CREDENTIALS;
+		errstr = ldapsrv_bind_error_msg(reply, HRES_SEC_E_LOGON_DENIED,
+						0x0C0904DC, status);
 		talloc_unlink(conn, conn->gensec);
 		conn->gensec = NULL;
 		goto do_reply;