From 5d378a280f74405fccbadbfb28e1066613c76fd8 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 8 Dec 2001 11:18:56 +0000
Subject: added internal sasl/gssapi code. This means we are no longer
 dependent on cyrus-sasl which makes the code much less fragile. Also added
 code to auto-determine the server name or realm (This used to be commit
 435fdf276a79c2a517adcd7726933aeef3fa924b)

---
 source3/include/ads.h       | 2 ++
 source3/include/config.h.in | 6 +++---
 source3/include/includes.h  | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'source3/include')

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 9c5e26f703..5ae127ff28 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -8,11 +8,13 @@ typedef struct {
 	void *ld;
 	char *realm;
 	char *ldap_server;
+	char *ldap_server_name;
 	char *kdc_server;
 	int ldap_port;
 	char *bind_path;
 	time_t last_attempt;
 	char *password;
+	char *user_name;
 } ADS_STRUCT;
 
 
diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index 635c634e11..7f6f4a82db 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -817,6 +817,9 @@
 /* Define if you have the <grp.h> header file.  */
 #undef HAVE_GRP_H
 
+/* Define if you have the <gssapi/gssapi.h> header file.  */
+#undef HAVE_GSSAPI_GSSAPI_H
+
 /* Define if you have the <history.h> header file.  */
 #undef HAVE_HISTORY_H
 
@@ -886,9 +889,6 @@
 /* Define if you have the <rpcsvc/ypclnt.h> header file.  */
 #undef HAVE_RPCSVC_YPCLNT_H
 
-/* Define if you have the <sasl.h> header file.  */
-#undef HAVE_SASL_H
-
 /* Define if you have the <security/_pam_macros.h> header file.  */
 #undef HAVE_SECURITY__PAM_MACROS_H
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0ebc09b450..6a44bf7aa8 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -389,11 +389,11 @@
 #undef HAVE_LDAP
 #endif
 
-#if HAVE_SASL_H
-#include <sasl.h>
+#if HAVE_GSSAPI_GSSAPI_H
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_generic.h>
 #else
-/* we must have sasl to use ldap */
-#undef HAVE_LDAP
+#undef HAVE_KRB5
 #endif
 
 /* we support ADS if we have krb5 and ldap libs */
-- 
cgit