diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-02-26 12:25:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:24 -0500 |
| commit | 9fffb6ab5b9eebdc3173ad63b90aec974f18ab53 (patch) | |
| tree | 19e233c904732cc87f4e839f0da3ea6280ef93ee | |
| parent | 52576153670f79014992020cb5179cc51ee0a6b9 (diff) | |
| download | samba-9fffb6ab5b9eebdc3173ad63b90aec974f18ab53.tar.gz samba-9fffb6ab5b9eebdc3173ad63b90aec974f18ab53.tar.bz2 samba-9fffb6ab5b9eebdc3173ad63b90aec974f18ab53.zip | |
r13693: More Solaris/LDAP fixes from Bjoern <bjoern@j3e.de>
(This used to be commit 7c098ca0ae4c7e11c7100fb09b42ce716beffb56)
| -rw-r--r-- | source3/include/includes.h | 6 | ||||
| -rw-r--r-- | source3/lib/smbldap.c | 6 | ||||
| -rw-r--r-- | source3/passdb/pdb_nds.c | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 372744c8ea..aef3437d56 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -474,6 +474,12 @@ #if defined(LDAP_SASL_BIND_INPROGRESS) && !defined(LDAP_SASL_BIND_IN_PROGRESS) #define LDAP_SASL_BIND_IN_PROGRESS LDAP_SASL_BIND_INPROGRESS #endif +/* Solaris 8 defines SSL_LDAP_PORT, not LDAPS_PORT and it only does so if + LDAP_SSL is defined - but SSL is not working. We just want the + port number! Let's just define LDAPS_PORT correct. */ +#if !defined(LDAPS_PORT) +#define LDAPS_PORT 636 +#endif #else #undef HAVE_LDAP #endif diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index c045be51c5..e54464a49b 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -999,7 +999,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) #endif if (reopen) { /* the other end has died. reopen. */ - ldap_unbind_ext(ldap_state->ldap_struct, NULL, NULL); + ldap_unbind(ldap_state->ldap_struct); ldap_state->ldap_struct = NULL; ldap_state->last_ping = (time_t)0; } else { @@ -1017,7 +1017,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) } if ((rc = smbldap_connect_system(ldap_state, ldap_state->ldap_struct))) { - ldap_unbind_ext(ldap_state->ldap_struct, NULL, NULL); + ldap_unbind(ldap_state->ldap_struct); ldap_state->ldap_struct = NULL; return rc; } @@ -1039,7 +1039,7 @@ static NTSTATUS smbldap_close(struct smbldap_state *ldap_state) return NT_STATUS_INVALID_PARAMETER; if (ldap_state->ldap_struct != NULL) { - ldap_unbind_ext(ldap_state->ldap_struct, NULL, NULL); + ldap_unbind(ldap_state->ldap_struct); ldap_state->ldap_struct = NULL; } diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c index 34e550d413..a82f4e48d4 100644 --- a/source3/passdb/pdb_nds.c +++ b/source3/passdb/pdb_nds.c @@ -819,7 +819,7 @@ static NTSTATUS pdb_nds_update_login_attempts(struct pdb_methods *methods, rc = ldap_simple_bind_s(ld, dn, clear_text_pw); if (rc == LDAP_SUCCESS) { DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Successful for %s\n", username)); - ldap_unbind_ext(ld, NULL, NULL); + ldap_unbind(ld); } else { NTSTATUS nt_status = NT_STATUS_ACCOUNT_RESTRICTION; DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Failed for %s\n", username)); |