summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-08-30 06:59:57 +0000
committerAndrew Tridgell <tridge@samba.org>2002-08-30 06:59:57 +0000
commitdcd029169424d8846c1fbb0b1527516a4a026b27 (patch)
tree0d1ca640b6c60ebf20458154b19c2f557a0b8f60 /source3/include/includes.h
parenta6ace770eb9b11271803215f218bf772fa7d9faa (diff)
downloadsamba-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/include/includes.h')
-rw-r--r--source3/include/includes.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index f1c8c50df4..544487f273 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -410,18 +410,14 @@
#if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
-#else
-#undef HAVE_KRB5
#endif
#if HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
-#else
-#undef HAVE_KRB5
#endif
/* we support ADS if we have krb5 and ldap libs */
-#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_GSSAPI)
+#if defined(HAVE_KRB5) && defined(HAVE_LDAP)
#define HAVE_ADS
#endif