From 745e2490ae406737cc720acd5b757687c26269b0 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 12 May 2006 20:40:22 +0000
Subject: r15547: say goodbye to --with-ldapsam (although the ldapsam_compat
 passdb backend still exists (This used to be commit
 7d99e05ee8f60b2b4d18405dc8be6f9ff822c3ad)

---
 source3/passdb/pdb_ldap.c | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'source3/passdb')

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 20a55ce811..24fcd7b39f 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -5427,23 +5427,6 @@ NTSTATUS pdb_init_ldapsam_compat(struct pdb_methods **pdb_method, const char *lo
 	struct ldapsam_privates *ldap_state;
 	char *uri = talloc_strdup( NULL, location );
 
-#ifdef WITH_LDAP_SAMCONFIG
-	if (!uri) {
-		int ldap_port = lp_ldap_port();
-			
-		/* remap default port if not using SSL (ie clear or TLS) */
-		if ( (lp_ldap_ssl() != LDAP_SSL_ON) && (ldap_port == 636) ) {
-			ldap_port = 389;
-		}
-
-		uri = talloc_asprintf(NULL, "%s://%s:%d", lp_ldap_ssl() == LDAP_SSL_ON ? "ldaps" : "ldap", lp_ldap_server(), ldap_port);
-		if (!uri) {
-			return NT_STATUS_NO_MEMORY;
-		}
-		location = uri;
-	}
-#endif
-
 	if (!NT_STATUS_IS_OK(nt_status = pdb_init_ldapsam_common( pdb_method, uri ))) {
 		return nt_status;
 	}
-- 
cgit