summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-02-25 23:34:23 +0100
committerGünther Deschner <gd@samba.org>2011-03-30 01:13:07 +0200
commit49ccae1c2006806b36994992a9550cbb1bb8b769 (patch)
tree023c0e8b64fcd6acfdafd4055fac46763545a56e
parent1d7b7ce42e1dd8c648bd62c317f1414b29ddbd08 (diff)
downloadsamba-49ccae1c2006806b36994992a9550cbb1bb8b769.tar.gz
samba-49ccae1c2006806b36994992a9550cbb1bb8b769.tar.bz2
samba-49ccae1c2006806b36994992a9550cbb1bb8b769.zip
s3-includes: no point in including all security headers globally.
Guenther
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/libads/disp_sec.c1
-rw-r--r--source3/registry/regfio.c1
-rw-r--r--source3/rpcclient/cmd_spoolss.c1
-rw-r--r--source3/utils/net_registry.c1
5 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index b0f77cf6d1..8440108e42 100644
--- 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 05ac216bbe..b06276e12e 100644
--- 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 5d3fdba3c0..bd5380787c 100644
--- 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 48eb73351a..a246d27fe2 100644
--- 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 10486b0250..84891aa0be 100644
--- 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"
/*
*