added the beginnings of ADS support in smbd

(This used to be commit c7f611691941ca92f57665e19d6e46b161599427)

2 files changed, 35 insertions, 0 deletions

diff --git a/source3/include/config.h.in b/source3/include/config.h.in
index c54190e29a..6280c793eb 100644
--- a/source3/include/config.h.in
+++ b/source3/include/config.h.in
@@ -248,6 +248,7 @@
 #undef I18N_DEFAULT_PREF_LANG
 #undef HAVE_KRB5
 #undef BROKEN_REDHAT_7_SYSTEM_HEADERS
+#undef HAVE_LDAP
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
@@ -741,6 +742,12 @@
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
 
+/* Define if you have the strlcat function.  */
+#undef HAVE_STRLCAT
+
+/* Define if you have the strlcpy function.  */
+#undef HAVE_STRLCPY
+
 /* Define if you have the strpbrk function.  */
 #undef HAVE_STRPBRK
 
@@ -816,6 +823,9 @@
 /* Define if you have the <lastlog.h> header file.  */
 #undef HAVE_LASTLOG_H
 
+/* Define if you have the <ldap.h> header file.  */
+#undef HAVE_LDAP_H
+
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
@@ -870,6 +880,9 @@
 /* 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 17c95eb6f7..8b61bc573c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -381,6 +381,19 @@
 #include <krb5.h>
 #endif
 
+#if HAVE_LDAP
+#include <ldap.h>
+#endif
+
+#if HAVE_SASL_H
+#include <sasl.h>
+#endif
+
+/* we support ADS if we have krb5 and ldap libs */
+#if defined(HAVE_KRB5) && defined(HAVE_LDAP) && defined(HAVE_SASL_H)
+#define HAVE_ADS
+#endif
+
 /*
  * Define VOLATILE if needed.
  */
@@ -650,6 +663,7 @@ extern int errno;
 #include "../tdb/tdb.h"
 #include "../tdb/spinlock.h"
 #include "talloc.h"
+#include "ads.h"
 #include "interfaces.h"
 #include "hash.h"
 #include "trans2.h"
@@ -871,6 +885,14 @@ int rename(const char *zfrom, const char *zto);
 time_t mktime(struct tm *t);
 #endif
 
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char *d, const char *s, size_t bufsize);
+#endif
+
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *d, const char *s, size_t bufsize);
+#endif
+
 #ifndef HAVE_FTRUNCATE
 int ftruncate(int f,long l);
 #endif