diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-08-30 06:59:57 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-08-30 06:59:57 +0000 |
| commit | dcd029169424d8846c1fbb0b1527516a4a026b27 (patch) | |
| tree | 0d1ca640b6c60ebf20458154b19c2f557a0b8f60 /source3/libads/ldap.c | |
| parent | a6ace770eb9b11271803215f218bf772fa7d9faa (diff) | |
| download | samba-dcd029169424d8846c1fbb0b1527516a4a026b27.tar.gz samba-dcd029169424d8846c1fbb0b1527516a4a026b27.tar.bz2 samba-dcd029169424d8846c1fbb0b1527516a4a026b27.zip | |
convert the LDAP/SASL code to use GSS-SPNEGO if possible
we now do this:
- look for suported SASL mechanisms on the LDAP server
- choose GSS-SPNEGO if possible
- within GSS-SPNEGO choose KRB5 if we can do a kinit
- otherwise use NTLMSSP
This change also means that we no longer rely on having a gssapi
library to do ADS.
todo:
- add TLS/SSL support over LDAP
- change to using LDAP/SSL for password change in ADS
(This used to be commit b04e91f660d3b26d23044075d4a7e707eb41462d)
Diffstat (limited to 'source3/libads/ldap.c')
| -rw-r--r-- | source3/libads/ldap.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index f0c4ad9040..2cfbedc6d4 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -226,7 +226,7 @@ ADS_STATUS ads_connect(ADS_STRUCT *ads) /* try via DNS */ if (ads_try_dns(ads)) { goto got_connection; - } + } /* try via netbios lookups */ if (!lp_disable_netbios() && ads_try_netbios(ads)) { @@ -274,11 +274,6 @@ got_connection: } #endif - if (ads->auth.password) { - if ((code = ads_kinit_password(ads))) - return ADS_ERROR_KRB5(code); - } - if (ads->auth.no_bind) { return ADS_SUCCESS; } |