s3-includes: no point in including all security headers globally.

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index b0f77cf6d18f619dd72a021ae71b351045a22699..8440108e428cf3757de2d4abc31b0529ff504243 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -576,10 +576,6 @@ enum flush_reason_enum {
 #ifndef NO_PROTO_H
 #include "proto.h"
 #endif
-#include "libcli/security/secace.h"
-#include "libcli/security/secacl.h"
-#include "libcli/security/security_descriptor.h"
-#include "libcli/security/sddl.h"
 
 #if defined(HAVE_POSIX_ACLS)
 #include "modules/vfs_posixacl.h"

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index 05ac216bbe2335392d4614d043fb7d0aca6abb3c..b06276e12e901053e7edd98ef02dbbdf5d1ad047 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "ads.h"
 #include "libads/ldap_schema.h"
+#include "../libcli/security/secace.h"
 
 /* for ADS */
 #define SEC_RIGHTS_FULL_CTRL           0xf01ff

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 5d3fdba3c018f7c60272505820380e188048067e..bd5380787c6b14e52d92b556300156f1317b9a7e 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -21,6 +21,7 @@
 #include "system/filesys.h"
 #include "regfio.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../libcli/security/security_descriptor.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 48eb73351a3ef6721d6e9da35177b91ee7c46c61..a246d27fe26ee781cfc0c4e35d8d7558e32971d7 100644 (file)
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -32,6 +32,7 @@
 #include "registry/reg_objects.h"
 #include "nt_printing.h"
 #include "../libcli/security/display_sec.h"
+#include "../libcli/security/security_descriptor.h"
 
 #define RPCCLIENT_PRINTERNAME(_printername, _cli, _arg) \
 { \

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 10486b02501df4d8df8f8ac5608e60657e98a380..84891aa0be895cb6ca1da67dfcf9f7d1d25b98a2 100644 (file)
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -32,6 +32,7 @@
 #include "registry/reg_format.h"
 #include <assert.h>
 #include "../libcli/security/display_sec.h"
+#include "../libcli/security/sddl.h"
 
 /*
  *