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 e1e01f76ea46e9dbe4aa2dc0576c23903a9a24cb..a95036e2f879670014e784a577fd319c7491601c 100644 (file)
--- 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;
 }