From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Fri, 6 Oct 2023 00:59:59 +0000 (+1300)
Subject: s3:lib: Rearrange preprocessor directives to avoid structurally dead code (CID 242032)
X-Git-Tag: tevent-0.16.0~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7eb47179b5784a7783090ab39e7ca908e2cfa2ff;p=thirdparty%2Fsamba.git

s3:lib: Rearrange preprocessor directives to avoid structurally dead code (CID 242032)

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index e1e01f76ea4..a95036e2f87 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -670,7 +670,6 @@ static int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 				ldap_err2string(rc)));
 	}
 
-	return LDAP_SUCCESS;
 #else
 
 	/* Parse the string manually */
@@ -719,7 +718,6 @@ static int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 #endif /* LDAP_OPT_X_TLS */
 		}
 	}
-#endif /* HAVE_LDAP_INITIALIZE */
 
 	/* now set connection timeout */
 #ifdef LDAP_X_OPT_CONNECT_TIMEOUT /* Netscape */
@@ -744,6 +742,7 @@ static int smb_ldap_setup_conn(LDAP **ldap_struct, const char *uri)
 	}
 #endif
 
+#endif /* HAVE_LDAP_INITIALIZE */
 	return LDAP_SUCCESS;
 }