From f9f8007361583c1d38be7e15eeae6b58a09614b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Fri, 28 May 2010 02:19:32 +0200 Subject: [PATCH] s3-build: only use ndr_security.h where needed. Guenther --- libgpo/gpo_util.c | 1 + source3/lib/secdesc.c | 1 + source3/lib/sharesec.c | 1 + source3/lib/util_sid.c | 1 + source3/libsmb/cliquota.c | 1 + source3/modules/vfs_acl_common.c | 2 ++ source3/passdb/lookup_sid.c | 1 + source3/printing/nt_printing.c | 1 + source3/registry/reg_api.c | 1 + source3/registry/regfio.c | 1 + source3/rpc_server/srv_spoolss_util.c | 1 + source3/rpc_server/srv_srvsvc_nt.c | 1 + source3/rpc_server/srv_svcctl_nt.c | 1 + source3/smbd/file_access.c | 1 + source3/smbd/nttrans.c | 1 + source3/smbd/open.c | 1 + source3/smbd/smb2_create.c | 1 + source3/smbd/trans2.c | 1 + source3/utils/net_printing.c | 1 + source3/utils/net_rpc_registry.c | 1 + source3/winbindd/wb_group_members.c | 1 + source3/winbindd/winbindd_ndr.c | 1 + 22 files changed, 23 insertions(+) diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index ef16329504e..0afed55fb5c 100644 --- 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 a1599a845e2..fc40b9ebf8c 100644 --- 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 67a035749be..f84c8c5f815 100644 --- 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 2a77be77dd5..bbb1b53974f 100644 --- 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 3cd4edf1659..6642cf0f930 100644 --- 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 46d54c2d81b..a3f207738e8 100644 --- 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 . */ +#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 181b17a8381..14494cbeec2 100644 --- 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 42ea5fb7c4e..78f43756c24 100644 --- 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 4f3b7a2f86a..e380a0d6e23 100644 --- 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 60a05040e26..d64eab84f9a 100644 --- 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 eeae1def3e9..0ebe0ba109a 100644 --- 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 3888061ee43..40c26f68096 100644 --- 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 24c67d3baf5..bc751e79b8d 100644 --- 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 065f2b6c75b..b487afb5e8d 100644 --- 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 84a20ae8755..577a7e4076e 100644 --- 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 ce69157df57..ca5b133ec66 100644 --- 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 77fd60795aa..37acfac589a 100644 --- 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 4032120007e..2c0bca939d2 100644 --- 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 c7a262433ef..81e0515e6ab 100644 --- 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 7f8f5bb6ffa..59971af3a35 100644 --- 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 0a42e796593..2649926d737 100644 --- 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 9ab44f0cad9..396aa06985d 100644 --- 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 -- 2.34.1