Fix pdb_ldap segfaults, and wrong default values for ldapsam_compat.

Reviewed by vl, metze.

Andrew Bartlett
(This used to be commit 9804ad458ad35c9ea7de3e2e86bf8b2f85ae6533)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index fe575d4e3e5bf37a26cba07a8e5249d19a4a9488..1149a92a997923fe134cd777d730b12051ced5cb 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -182,6 +182,7 @@ static void smbldap_delete_state(struct smbldap_state *smbldap_state)
                if (t->smbldap_state == smbldap_state) {
                        DLIST_REMOVE(smbldap_state_lookup_list, t);
                        SAFE_FREE(t);
+                       return;
                }
        }
 }
@@ -3427,10 +3428,8 @@ static NTSTATUS pdb_init_ldapsam_compat(PDB_CONTEXT *pdb_context, PDB_METHODS **
        NTSTATUS nt_status;
        struct ldapsam_privates *ldap_state;
 
-#ifndef WITH_LDAP_SAMCONFIG
-       location = "ldap://localhost";
-#else
-       {
+#ifdef WITH_LDAP_SAMCONFIG
+       if (!location) {
                int ldap_port = lp_ldap_port();
                        
                /* remap default port if not using SSL (ie clear or TLS) */