diff options
| author | Gerald Carter <jerry@samba.org> | 2006-05-12 20:40:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:16:58 -0500 |
| commit | 745e2490ae406737cc720acd5b757687c26269b0 (patch) | |
| tree | c4a80903c458881298c453113c2ab104e56c079b /source3/passdb/pdb_ldap.c | |
| parent | f01b0cca2ecedc9c074d5d7742c7cd7134dc26e3 (diff) | |
| download | samba-745e2490ae406737cc720acd5b757687c26269b0.tar.gz samba-745e2490ae406737cc720acd5b757687c26269b0.tar.bz2 samba-745e2490ae406737cc720acd5b757687c26269b0.zip | |
r15547: say goodbye to --with-ldapsam (although the ldapsam_compat passdb backend still exists
(This used to be commit 7d99e05ee8f60b2b4d18405dc8be6f9ff822c3ad)
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 17 |
1 files changed, 0 insertions, 17 deletions
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; } |