trying to get HEAD building again. If you want the code

[samba.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 534bbfbf26c50d839c1ae895cfadfbadd5977e95..edaeda3abedaf55bb659aeb10f0b3639d6a8851f 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -437,6 +437,18 @@
 #include <com_err.h>
 #endif
 
+#if HAVE_ATTR_XATTR_H
+#include <attr/xattr.h>
+#endif
+
+#if HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+#if HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
 /* Special macros that are no-ops except when run under Valgrind on
  * x86.  They've moved a little bit from valgrind 1.0.4 to 1.9.4 */
 #if HAVE_VALGRIND_MEMCHECK_H
@@ -769,9 +781,6 @@ extern int errno;
 #include "version.h"
 
 #include "smb.h"
-/*
-#include "smbw.h"
-*/
 
 #include "nameserv.h"
 
@@ -808,14 +817,12 @@ extern int errno;
 
 #include "auth.h"
 
-#include "sam.h"
-
-#include "gums.h"
-
 #include "idmap.h"
 
 #include "client.h"
+
 #include "smbw.h"
+
 #include "session.h"
 
 #include "asn_1.h"
@@ -828,8 +835,6 @@ extern int errno;
 
 #include "nsswitch/winbind_client.h"
 
-#include "genparser.h"
-
 /*
  * Type for wide character dirent structure.
  * Only d_name is defined by POSIX.
@@ -876,6 +881,10 @@ struct printjob;
 
 struct smb_ldap_privates;
 
+/* forward declarations from smbldap.c */
+
+#include "smbldap.h"
+
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
 #include "proto.h"
@@ -1034,10 +1043,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 int vasprintf(char **ptr, const char *format, va_list ap);
 #endif
 
-#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET)
-#define bzero(a,b) memset((a),'\0',(b))
-#endif
-
 #ifdef REPLACE_GETPASS
 #define getpass(prompt) getsmbpass((prompt))
 #endif
@@ -1283,7 +1288,7 @@ krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
 krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
 void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
-BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]);
+BOOL get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]);
 #endif /* HAVE_KRB5 */
 
 /* TRUE and FALSE are part of the C99 standard and gcc, but