s3-build: only use ndr_security.h where needed.

Guenther

diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index ef16329504ec85c28fa4221a39283494a25eefd0..0afed55fb5c92088b1b9aa676d09ab4a87d9cb31 100644 (file)
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -19,6 +19,7 @@
 #define TALLOC_DEPRECATED 1
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 #include "../libgpo/gpo.h"
 #if _SAMBA_BUILD_ == 4
 #include "system/filesys.h"

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index a1599a845e2c5fc2b475b87cbe27319d228903b2..fc40b9ebf8cd580c402b245fa9c663ea55814215 100644 (file)
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /* Map generic permissions to file object specific permissions */
 

diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 67a035749be42dad5988ddf0e10e68bead8a803a..f84c8c5f815677d1cf08886afb11ee6f993ef5f3 100644 (file)
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /*******************************************************************
  Create the share security tdb.

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 2a77be77dd56aa5d57fd077e98fd709011595a21..bbb1b53974f93c6eb438bafca5e762f60b4908d2 100644 (file)
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /*
  * Some useful sids, more well known sids can be found at

diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c
index 3cd4edf16596f36219d9185c24200f2f3d7e0e25..6642cf0f930dbb576a389562fe5742b91db3adec 100644 (file)
--- a/source3/libsmb/cliquota.c
+++ b/source3/libsmb/cliquota.c
@@ -18,6 +18,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
 {

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 46d54c2d81bcd77cacad34d7178b2b336193ccfb..a3f207738e8398fe322a3155c6229d0fece78a1e 100644 (file)
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -19,6 +19,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../librpc/gen_ndr/ndr_security.h"
+
 static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
                        DATA_BLOB *pblob,
                        uint16_t hash_type,

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 181b17a8381bc6bd57048c22422a30cc857fd296..14494cbeec20ca58bf6577fb35bf859d5497c8ab 100644 (file)
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /*****************************************************************
  Dissect a user-provided name into domain, name, sid and type.

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 42ea5fb7c4e71be0813d6913a05a4c64dec64e00..78f43756c24462f3b544dc2455195dbeb8d0e7b6 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -24,6 +24,7 @@
 #include "printing/pcap.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 static TDB_CONTEXT *tdb_forms; /* used for forms files */
 static TDB_CONTEXT *tdb_drivers; /* used for driver files */

diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c
index 4f3b7a2f86a101ea286fdeb10294b43908fbb651..e380a0d6e23d5097eb84def133bf8b7fc647b769 100644 (file)
--- a/source3/registry/reg_api.c
+++ b/source3/registry/reg_api.c
@@ -71,6 +71,7 @@
 #include "reg_dispatcher.h"
 #include "reg_util_marshalling.h"
 #include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c
index 60a05040e264fd13ed05125cf376de9b155428ff..d64eab84f9a72942b95d2fa3b0a745a61c8ab4bf 100644 (file)
--- a/source3/registry/regfio.c
+++ b/source3/registry/regfio.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "regfio.h"
 #include "reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index eeae1def3e93f24bd30fdc22b4ce0988c8d3b06e..0ebe0ba109a35e791b61204160017a3720900428 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -23,6 +23,7 @@
 #include "srv_spoolss_util.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
 #include "../librpc/gen_ndr/cli_winreg.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
 #define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 3888061ee4361f348eede290a2d0676aa5296743..40c26f68096cc2840207dca0d981fe27a2ca9f67 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_srvsvc.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 24c67d3baf5f4bf800ea7e729645c9114604f211..bc751e79b8d71ad770ee767670e362b1140d6fd0 100644 (file)
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -27,6 +27,7 @@
 #include "services/services.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 065f2b6c75b3caeacdd12d26a11495e9f712f2fa..b487afb5e8ded49699075ec146d738e236508c1b 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 84a20ae8755941bfc6530ad1f7a41d2017f4c931..577a7e4076ebaa1453d8552bf217a38b186dca25 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index ce69157df5741063400a8d6dfafac21e9ded7750..ca5b133ec667b5477ed1854819de0c356caeddb9 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 77fd60795aa31d8a892e10f0d4a8260910beedad..37acfac589a310c3ff35df6174230771754bd1a7 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
 {

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4032120007e8343fe66742fbb05e1f0c984ba144..2c0bca939d22896d62cb543b8709421e2f4fffc5 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -28,6 +28,7 @@
 #include "smbd/globals.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/xattr.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index c7a262433eff5c2f20a6100b82aba76e1c9362e0..81e0515e6abdc1c9eade4a7294583ec71c358768 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 7f8f5bb6ffa40af835df6b9db51169a744d0cd59..59971af3a359983116b7a27ffd67a8b14f880dc7 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "registry/reg_util_marshalling.h"
 #include "registry/reg_objects.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /*******************************************************************
  connect to a registry hive root (open a registry policy)

diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c
index 0a42e796593f4c76839e1c8cc15d06cdbb7745ca..2649926d7374f30b34f107909437fa461c335d3c 100644 (file)
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "librpc/gen_ndr/cli_wbint.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 /*
  * We have 3 sets of routines here:

diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 9ab44f0cad99063abfb91a2ddf173d464f77522c..396aa06985d60b37d08acb067b291c1c9382fb4f 100644 (file)
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND