libcli/security Provide a common, top level libcli/security/security.h

This will reduce the noise from merges of the rest of the
libcli/security code, without this commit changing what code
is actually used.

This includes (along with other security headers) dom_sid.h and
security_token.h

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104

libcli/security/display_sec.c

@@ -19,9 +19,7 @@
 */
 
 #include "includes.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/security/secace.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "librpc/ndr/libndr.h"
 
 /****************************************************************************

libcli/security/sddl.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "system/locale.h"
 

libcli/security/secace.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "lib/util/tsort.h"
 
 #define  SEC_ACE_HEADER_SIZE (2 * sizeof(uint8_t) + sizeof(uint16_t) + sizeof(uint32_t))

libcli/security/security.h

@@ -36,10 +36,13 @@ struct object_tree {
 #include "libcli/security/dom_sid.h"
 #include "libcli/security/secace.h"
 #include "libcli/security/secacl.h"
-#include "libcli/security/proto.h"
 #include "libcli/security/security_descriptor.h"
 #include "libcli/security/security_token.h"
 #include "libcli/security/sddl.h"
 #include "libcli/security/privileges.h"
 
+#if _SAMBA_BUILD_ >= 4
+#include "libcli/security/proto.h"
+#endif
+
 #endif

libcli/security/security_descriptor.c

@@ -20,8 +20,7 @@
 */
 
 #include "includes.h"
-#include "libcli/security/security_descriptor.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)

libgpo/gpo_ldap.c

@@ -23,6 +23,7 @@
 #include "libgpo/gpo_s4.h"
 #include "source4/libgpo/ads_convenience.h"
 #endif
+#include "../libcli/security/security.h"
 
 /****************************************************************
  parse the raw extension string into a GP_EXT structure

libgpo/gpo_sec.c

@@ -18,7 +18,7 @@
  */
 
 #include "includes.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "../libgpo/gpo.h"
 #if _SAMBA_BUILD_ == 4
 #include "libgpo/ads_convenience.h"

libgpo/gpo_util.c

@@ -21,6 +21,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "../libgpo/gpo.h"
+#include "../libcli/security/security.h"
 #if _SAMBA_BUILD_ == 4
 #include "system/filesys.h"
 #include "auth/auth.h"

librpc/ndr/ndr_sec_helper.c

@@ -23,10 +23,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/dom_sid.h"
-#if _SAMBA_BUILD_ == 4
-#include "libcli/security/security.h"
-#endif
+#include "../libcli/security/security.h"
 
 /*
   return the wire size of a security_ace

source3/auth/auth_util.c

@@ -26,7 +26,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/arcfour.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source3/auth/server_info.c

@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "../lib/crypto/arcfour.h"
 #include "../librpc/gen_ndr/netlogon.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

source3/auth/token_util.c

@@ -27,8 +27,8 @@
 #include "includes.h"
 #include "secrets.h"
 #include "memcache.h"
-#include "../libcli/security/dom_sid.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************************
  Check for a SID in an struct security_token

source3/client/client.c

@@ -28,6 +28,7 @@
 #include "../lib/util/select.h"
 #include "system/readline.h"
 #include "../libcli/smbreadline/smbreadline.h"
+#include "../libcli/security/security.h"
 
 #ifndef REGISTER
 #define REGISTER 0

source3/groupdb/mapping.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "groupdb/mapping.h"
+#include "../libcli/security/security.h"
 
 static const struct mapping_backend *backend;
 

source3/groupdb/mapping_tdb.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "groupdb/mapping.h"
 #include "dbwrap.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 static struct db_context *db; /* used for driver files */
 

source3/lib/eventlog/eventlog.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/eventlog/eventlog.h"
+#include "../libcli/security/security.h"
 
 /* maintain a list of open eventlog tdbs with reference counts */
 

source3/lib/idmap_cache.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "idmap_cache.h"
+#include "../libcli/security/security.h"
 
 /**
  * Find a sid2uid mapping

source3/lib/netapi/group.c

@@ -25,7 +25,7 @@
 #include "lib/netapi/libnetapi.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
 ****************************************************************/

source3/lib/netapi/localgroup.c

@@ -27,7 +27,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
 						     struct rpc_pipe_client *pipe_cli,

source3/lib/netapi/samr.c

@@ -23,6 +23,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
 #include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
 ****************************************************************/

source3/lib/netapi/sid.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 
 #include "lib/netapi/netapi.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
 ****************************************************************/

source3/lib/netapi/user.c

@@ -27,7 +27,7 @@
 #include "rpc_client/init_samr.h"
 #include "../libds/common/flags.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
 ****************************************************************/

source3/lib/privileges.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "dbwrap.h"
 #include "libcli/security/privileges_private.h"
+#include "../libcli/security/security.h"
 
 #define PRIVPREFIX              "PRIV_"
 

source3/lib/secdesc.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
 					SECINFO_DACL|SECINFO_SACL|\

source3/lib/sharesec.c

@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
 

source3/lib/smbldap.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbldap.h"
 #include "secrets.h"
+#include "../libcli/security/security.h"
 
 /* Try not to hit the up or down server forever */
 

source3/lib/tldap_util.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "tldap.h"
 #include "tldap_util.h"
+#include "../libcli/security/security.h"
 
 bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
 			int *num_values, DATA_BLOB **values)

source3/lib/util_nttoken.c

@@ -26,7 +26,7 @@
 /* function(s) moved from auth/auth_util.c to minimize linker deps */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************************
  Duplicate a SID token.

source3/lib/util_seaccess.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/security/security.h"
 
 /* Map generic access rights to object specific rights.  This technique is
    used to give meaning to assigning read, write, execute and all access to

source3/lib/winbind_util.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 
 #if defined(WITH_WINBIND)
 

source3/libads/ldap.c

@@ -28,6 +28,7 @@
 #include "libads/dns.h"
 #include "../libds/common/flags.h"
 #include "smbldap.h"
+#include "../libcli/security/security.h"
 
 #ifdef HAVE_LDAP
 

source3/libgpo/gpo_reg.c

@@ -25,6 +25,7 @@
 #include "registry/reg_backend_db.h"
 #include "registry/reg_api_util.h"
 #include "registry/reg_init_basic.h"
+#include "../libcli/security/security.h"
 
 
 /****************************************************************

source3/libnet/libnet_join.c

@@ -35,7 +35,7 @@
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
 #include "krb5_env.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
 ****************************************************************/

source3/libnet/libnet_samsync.c

@@ -28,7 +28,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /**
  * Fix up the delta, dealing with encryption issues so that the final

source3/libnet/libnet_samsync_passdb.c

@@ -25,7 +25,7 @@
 
 #include "includes.h"
 #include "libnet/libnet_samsync.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /* Convert a struct samu_DELTA to a struct samu. */
 #define STRING_CHANGED (old_string && !new_string) ||\

source3/libsmb/cliquota.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "fake_file.h"
+#include "../libcli/security/security.h"
 
 NTSTATUS cli_get_quota_handle(struct cli_state *cli, uint16_t *quota_fnum)
 {

source3/libsmb/libsmb_server.c

@@ -28,6 +28,7 @@
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "libcli/security/security.h"
 
 /* 
  * Check a server for being alive and well.

source3/libsmb/libsmb_xattr.c

@@ -27,8 +27,7 @@
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "../libcli/security/dom_sid.h"
-
+#include "../libcli/security/security.h"
 
 /*
  * Find an lsa pipe handle associated with a cli struct.

source3/libsmb/samlogon_cache.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "../libcli/security/security.h"
 
 #define NETSAMLOGON_TDB	"netsamlogon_cache.tdb"
 

source3/libsmb/trustdom_cache.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ALL	/* there's no proper class yet */

source3/locking/locking.c

@@ -39,6 +39,7 @@
 #include "librpc/gen_ndr/messaging.h"
 #include "smbd/globals.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING

source3/modules/vfs_acl_common.c

@@ -19,6 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 static NTSTATUS create_acl_blob(const struct security_descriptor *psd,

source3/modules/vfs_smb_traffic_analyzer.c

@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "../lib/crypto/crypto.h"
 #include "vfs_smb_traffic_analyzer.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 

source3/nmbd/nmbd_processlogon.c

@@ -27,7 +27,7 @@
 #include "../libcli/netlogon.h"
 #include "../libcli/cldap/cldap.h"
 #include "../lib/tsocket/tsocket.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 #include "secrets.h"
 #include "nmbd/nmbd.h"
 

source3/passdb/account_pol.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 static struct db_context *db;
 
 /* cache all entries for 60 seconds for to save ldap-queries (cache is updated

source3/passdb/lookup_sid.c

@@ -24,7 +24,7 @@
 #include "secrets.h"
 #include "memcache.h"
 #include "idmap_cache.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /*****************************************************************
  Dissect a user-provided name into domain, name, sid and type.

source3/passdb/machine_sid.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "secrets.h"
 #include "dbwrap.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /* NOTE! the global_sam_sid is the SID of our local SAM. This is only
    equal to the domain SID when we are a DC, otherwise its our

source3/passdb/passdb.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_ads.c

@@ -24,6 +24,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "../libcli/ldap/ldap_ndr.h"
+#include "../libcli/security/security.h"
 
 struct pdb_ads_state {
 	struct sockaddr_un socket_address;

source3/passdb/pdb_compat.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_get_set.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_interface.c

@@ -25,7 +25,7 @@
 #include "../librpc/gen_ndr/samr.h"
 #include "memcache.h"
 #include "nsswitch/winbind_client.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_ldap.c

@@ -47,7 +47,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"
 #include "idmap_cache.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_smbpasswd.c

@@ -22,7 +22,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/samr.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/pdb_tdb.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 
 #if 0 /* when made a module use this */
 

source3/passdb/secrets.c

@@ -27,6 +27,7 @@
 #include "librpc/gen_ndr/ndr_secrets.h"
 #include "secrets.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

source3/passdb/util_builtin.c

@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 struct rid_name_map {
 	uint32 rid;

source3/passdb/util_unixsids.c

@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 bool sid_check_is_unix_users(const struct dom_sid *sid)
 {

source3/passdb/util_wellknown.c

@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 struct rid_name_map {
 	uint32 rid;

source3/printing/nt_printing.c

@@ -32,6 +32,7 @@
 #include "nt_printing.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
 
 /* Map generic permissions to printer object specific permissions */
 

source3/printing/nt_printing_tdb.c

@@ -24,6 +24,7 @@
 #include "printing/nt_printing_tdb.h"
 #include "librpc/gen_ndr/spoolss.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

source3/printing/printspoolss.c

@@ -22,6 +22,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "smbd/globals.h"
+#include "../libcli/security/security.h"
 
 void print_spool_terminate(struct connection_struct *conn,
 			   struct print_file_data *print_file);

source3/registry/reg_dispatcher.c

@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "reg_dispatcher.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

source3/registry/reg_util_token.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "reg_util_token.h"
+#include "../libcli/security/security.h"
 
 /*
  * create a fake token just with enough rights to

source3/rpc_client/cli_lsarpc.c

@@ -26,7 +26,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /** @defgroup lsa LSA - Local Security Architecture
  *  @ingroup rpc_client

source3/rpc_server/srv_eventlog_nt.c

@@ -26,6 +26,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "registry/reg_api_util.h"
+#include "../libcli/security/security.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpc_server/srv_lsa_nt.c

@@ -34,7 +34,7 @@
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpc_server/srv_netlog_nt.c

@@ -36,7 +36,7 @@
 #include "../lib/crypto/md4.h"
 #include "rpc_client/init_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 extern userdom_struct current_user_info;
 

source3/rpc_server/srv_samr_nt.c

@@ -39,7 +39,7 @@
 #include "../lib/crypto/arcfour.h"
 #include "secrets.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpc_server/srv_spoolss_nt.c

@@ -34,6 +34,7 @@
 #include "../librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "registry.h"
 #include "registry/reg_objects.h"

source3/rpc_server/srv_spoolss_util.c

@@ -28,7 +28,7 @@
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "secrets.h"
 #include "rpc_server/rpc_ncacn_np.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 #define TOP_LEVEL_PRINT_KEY "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print"
 #define TOP_LEVEL_PRINT_PRINTERS_KEY TOP_LEVEL_PRINT_KEY "\\Printers"

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 "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
 

source3/rpc_server/srv_svcctl_nt.c

@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/srv_svcctl.h"
 #include "services/services.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 #undef DBGC_CLASS

source3/rpc_server/srv_wkssvc_nt.c

@@ -27,6 +27,7 @@
 #include "libnet/libnet_join.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

source3/rpcclient/cmd_lsarpc.c

@@ -27,6 +27,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */

source3/rpcclient/cmd_samr.c

@@ -30,7 +30,7 @@
 #include "rpc_client/cli_samr.h"
 #include "rpc_client/init_samr.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 extern struct dom_sid domain_sid;
 

source3/rpcclient/rpcclient.c

@@ -28,6 +28,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
 #include "../libcli/smbreadline/smbreadline.h"
+#include "../libcli/security/security.h"
 
 enum pipe_auth_type_spnego {
 	PIPE_AUTH_TYPE_SPNEGO_NONE = 0,

source3/services/services_db.c

@@ -25,6 +25,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "registry/reg_api_util.h"
+#include "../libcli/security/security.h"
 
 struct rcinit_file_information {
 	char *description;

source3/smbd/dir.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 /*
    This module implements directory related functions for Samba.

source3/smbd/file_access.c

@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 #undef  DBGC_CLASS

source3/smbd/files.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
 

source3/smbd/lanman.c

@@ -39,6 +39,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "rpc_client/init_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "../libcli/security/security.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES

source3/smbd/nttrans.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;

source3/smbd/open.c

@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;

source3/smbd/pipes.c

@@ -27,6 +27,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 #define	PIPE		"\\PIPE\\"
 #define	PIPELEN		strlen(PIPE)

source3/smbd/posix_acls.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 

source3/smbd/reply.c

@@ -32,6 +32,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "libcli/security/security.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext

source3/smbd/service.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
 
 extern userdom_struct current_user_info;
 

source3/smbd/share_access.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../libcli/security/security.h"
 
 /*
  * No prefix means direct username

source3/smbd/smb2_read.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "libcli/security/security.h"
 
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 					      struct tevent_context *ev,

source3/smbd/smb2_tcon.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../libcli/security/security.h"
 
 static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
 				       const char *in_path,

source3/smbd/trans2.c

@@ -29,6 +29,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/xattr.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

source3/smbd/uid.c

@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "libcli/security/security.h"
 
 /* what user is current? */
 extern struct current_user current_user;

source3/torture/nbio.c

@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "torture/proto.h"
+#include "../libcli/security/security.h"
 
 #define MAX_FILES 1000
 

source3/torture/test_posix_append.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "torture/proto.h"
+#include "../libcli/security/security.h"
 
 /*
  * Make sure that GENERIC_WRITE does not trigger append. See

source3/torture/torture.c

@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "nsswitch/libwbclient/wbc_async.h"
 #include "torture/proto.h"
-#include "libcli/security/dom_sid.h"
+#include "libcli/security/security.h"
 #include "tldap.h"
 #include "tldap_util.h"
 #include "../librpc/gen_ndr/svcctl.h"

source3/torture/utable.c

@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "torture/proto.h"
+#include "../libcli/security/security.h"
 
 bool torture_utable(int dummy)
 {

source3/utils/net.c

@@ -45,6 +45,7 @@
 #include "utils/net.h"
 #include "secrets.h"
 #include "lib/netapi/netapi.h"
+#include "../libcli/security/security.h"
 
 extern bool AllowDebugChange;
 

source3/utils/net_ads.c

@@ -34,6 +34,7 @@
 #include "smb_krb5.h"
 #include "secrets.h"
 #include "krb5_env.h"
+#include "../libcli/security/security.h"
 
 #ifdef HAVE_ADS
 

source3/utils/net_groupmap.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../libcli/security/security.h"
 
 /*********************************************************
  Figure out if the input was an NT group or a SID string.