diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-06-24 14:23:34 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-06-24 14:23:34 +0000 |
| commit | 137265b8061f7ca9fa4de4e7c30dda6e4acf59db (patch) | |
| tree | 918037c20ab31d2be2bfdab29e75587a4344b5bb /source3 | |
| parent | a34ba41ae549d908a8a49651dad27e3b7e1ecab3 (diff) | |
| download | samba-137265b8061f7ca9fa4de4e7c30dda6e4acf59db.tar.gz samba-137265b8061f7ca9fa4de4e7c30dda6e4acf59db.tar.bz2 samba-137265b8061f7ca9fa4de4e7c30dda6e4acf59db.zip | |
Fix pdb_ldap segfaults, and wrong default values for ldapsam_compat.
Reviewed by vl, metze.
Andrew Bartlett
(This used to be commit 9804ad458ad35c9ea7de3e2e86bf8b2f85ae6533)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index fe575d4e3e..1149a92a99 100644 --- 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) */ |