s3-includes: no need to globally include libads/ads_status.h.

Guenther

diff --git a/source3/include/ads.h b/source3/include/ads.h
index ee6e5b8649b6366d23fe0c6e5576065de7d6466b..8a8ce28e5305dd7fc80f01e23b396dba7afdb3b5 100644 (file)
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -6,6 +6,7 @@
   basically this is a wrapper around ldap
 */
 
+#include "libads/ads_status.h"
 #include "smb_ldap.h"
 
 struct ads_struct;

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5e8b21235d29ef2c38d4857b5058a43a014e3b26..e6b70c782cf913318aecf76ac5b13c8c1bb1ba1f 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -521,7 +521,6 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/debug_s3.h"
 
 #include "../libcli/util/ntstatus.h"
-#include "libads/ads_status.h"
 #include "../libcli/util/error.h"
 #include "../lib/util/charset/charset.h"
 #include "dynconfig/dynconfig.h"

diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c
index b99464118debd45538043ae31b8fde741b4990dd..a9e59edaddba9a4d680b79375fd9afc5ba3f6ded 100644 (file)
--- a/source3/libads/ads_status.c
+++ b/source3/libads/ads_status.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smb_krb5.h"
 #include "smb_ldap.h"
+#include "libads/ads_status.h"
 
 /*
   build a ADS_STATUS structure

diff --git a/source3/libads/ads_status.h b/source3/libads/ads_status.h
index 4c27e16f50e2bbe0a1948b916cecf00d489eee3b..cc8d9a5c0853b09ad533d0196de148b8744736de 100644 (file)
--- a/source3/libads/ads_status.h
+++ b/source3/libads/ads_status.h
@@ -1,3 +1,5 @@
+#ifndef _LIBADS_ADS_STATUS_H_
+#define _LIBADS_ADS_STATUS_H_
 
 /* there are 5 possible types of errors the ads subsystem can produce */
 enum ads_error_type {ENUM_ADS_ERROR_KRB5, ENUM_ADS_ERROR_GSS,
@@ -40,3 +42,5 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype,
 NTSTATUS ads_ntstatus(ADS_STATUS status);
 const char *ads_errstr(ADS_STATUS status);
 NTSTATUS gss_err_to_ntstatus(uint32 maj, uint32 min);
+
+#endif /* _LIBADS_ADS_STATUS_H_ */

diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index afd57fe220cbcbcce3b8a3576662031f775d6fc2..f23346f709af9135206c3ce0cdcd2e53fb248ce4 100644 (file)
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -1,5 +1,7 @@
 struct PAC_LOGON_INFO;
 
+#include "libads/ads_status.h"
+
 /* The following definitions come from libads/kerberos_verify.c  */
 
 NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,

diff --git a/source3/libsmb/libsmb.h b/source3/libsmb/libsmb.h
index 7a9fb633b8032e7b4f21eb45f7cb83871906f5cc..48d6ae5e0e67458d3885b9aa152a4a901be447c3 100644 (file)
--- a/source3/libsmb/libsmb.h
+++ b/source3/libsmb/libsmb.h
@@ -19,6 +19,7 @@
 #define _LIBSMB_LIBSMB_H
 
 #include "client.h"
+#include "libads/ads_status.h"
 #include "libsmb/proto.h"
 
 #endif /* _LIBSMB_LIBSMB_H */

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index ba3860a88d84c993173ba0d88adf94eff54bf9a1..ad20f6e07438d59fbecede2d10a606268ffd447f 100644 (file)
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -23,6 +23,7 @@
 #ifndef _NET_PROTO_H_
 #define _NET_PROTO_H_
 
+#include "libads/ads_status.h"
 
 /* The following definitions come from utils/net.c  */