From 6d90ddea520aeb3fd6609c6e143bd1a89366bc4b Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 6 May 2011 12:54:59 +0200
Subject: s3-includes: no need to globally include libads/ads_status.h.

Guenther
(cherry picked from commit 1e208a705718adb105d89093041c0ba5d51f2429)
(cherry picked from commit 68936f478dfc0cb9c7ae9e7b208b5e5c22ea2973)
---
 source3/include/ads.h           | 1 +
 source3/include/includes.h      | 1 -
 source3/libads/ads_status.c     | 1 +
 source3/libads/ads_status.h     | 4 ++++
 source3/libads/kerberos_proto.h | 2 ++
 source3/libsmb/libsmb.h         | 1 +
 source3/utils/net_proto.h       | 1 +
 7 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source3/include/ads.h b/source3/include/ads.h
index ee6e5b8649b..8a8ce28e530 100644
--- 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 48b8bf4c27d..1beca26f23f 100644
--- 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.h"
diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c
index b99464118de..a9e59edaddb 100644
--- 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 4c27e16f50e..cc8d9a5c085 100644
--- 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 afd57fe220c..f23346f709a 100644
--- 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 7a9fb633b80..48d6ae5e0e6 100644
--- 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 ba3860a88d8..ad20f6e0743 100644
--- 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  */
 
-- 
cgit