diff options
156 files changed, 158 insertions, 61 deletions
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c index 6a820673b6..f45b770f8c 100644 --- a/libcli/security/display_sec.c +++ b/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" /**************************************************************************** diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c index 463a142dc3..5b605c0531 100644 --- a/libcli/security/sddl.c +++ b/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" diff --git a/libcli/security/secace.c b/libcli/security/secace.c index 5787e15110..1577550418 100644 --- a/libcli/security/secace.c +++ b/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)) diff --git a/source4/libcli/security/security.h b/libcli/security/security.h index 009ad64959..8018bee893 100644 --- a/source4/libcli/security/security.h +++ b/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 diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c index 4e67e0a96b..60f9de8f87 100644 --- a/libcli/security/security_descriptor.c +++ b/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) diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c index c509642892..38a040533a 100644 --- a/libgpo/gpo_ldap.c +++ b/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 diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c index 099dbaaa77..e0304d464a 100644 --- a/libgpo/gpo_sec.c +++ b/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" diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c index 3320d97b21..9e4687ddc9 100644 --- a/libgpo/gpo_util.c +++ b/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" diff --git a/librpc/ndr/ndr_sec_helper.c b/librpc/ndr/ndr_sec_helper.c index 7207c0b6ba..ff8588dad4 100644 --- a/librpc/ndr/ndr_sec_helper.c +++ b/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 diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9fbc7f1ba3..98cef79141 100644 --- a/source3/auth/auth_util.c +++ b/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 diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 690838d779..344e8e97a6 100644 --- a/source3/auth/server_info.c +++ b/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 diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 8666f88a2d..826801ce50 100644 --- a/source3/auth/token_util.c +++ b/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 diff --git a/source3/client/client.c b/source3/client/client.c index a24b7e3144..e979ddfacf 100644 --- a/source3/client/client.c +++ b/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 diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c index 5e2e54487e..0c6da8c2b9 100644 --- a/source3/groupdb/mapping.c +++ b/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; diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index dab2520fc1..cd9a59cb4f 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/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 */ diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c index ea7cb6d9b1..c91258ef12 100644 --- a/source3/lib/eventlog/eventlog.c +++ b/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 */ diff --git a/source3/lib/idmap_cache.c b/source3/lib/idmap_cache.c index bf72d91efe..fbe3a7ee39 100644 --- a/source3/lib/idmap_cache.c +++ b/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 diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c index bf8d1667d6..b9dd1e9872 100644 --- a/source3/lib/netapi/group.c +++ b/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" /**************************************************************** ****************************************************************/ diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c index 676f6df9ed..b2d08b7a59 100644 --- a/source3/lib/netapi/localgroup.c +++ b/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, diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c index fb8e163be0..1e2620f974 100644 --- a/source3/lib/netapi/samr.c +++ b/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" /**************************************************************** ****************************************************************/ diff --git a/source3/lib/netapi/sid.c b/source3/lib/netapi/sid.c index a9bca2689f..704964a79f 100644 --- a/source3/lib/netapi/sid.c +++ b/source3/lib/netapi/sid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "lib/netapi/netapi.h" +#include "../libcli/security/security.h" /**************************************************************** ****************************************************************/ diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c index 151c24b539..152b72733d 100644 --- a/source3/lib/netapi/user.c +++ b/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" /**************************************************************** ****************************************************************/ diff --git a/source3/lib/privileges.c b/source3/lib/privileges.c index 3380d472a5..00dfefebc1 100644 --- a/source3/lib/privileges.c +++ b/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_" diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 4c84628290..9ceba10015 100644 --- a/source3/lib/secdesc.c +++ b/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|\ diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index 3c19e77fcc..59be365e1e 100644 --- a/source3/lib/sharesec.c +++ b/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" diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 6a97b60803..568a7ee6b9 100644 --- a/source3/lib/smbldap.c +++ b/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 */ diff --git a/source3/lib/tldap_util.c b/source3/lib/tldap_util.c index 5ff796137f..7f1e916338 100644 --- a/source3/lib/tldap_util.c +++ b/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) diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c index 680dd29ba7..81def87931 100644 --- a/source3/lib/util_nttoken.c +++ b/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. diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c index 6c16fea585..13032b8779 100644 --- a/source3/lib/util_seaccess.c +++ b/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 diff --git a/source3/lib/winbind_util.c b/source3/lib/winbind_util.c index 9b95809aee..57cb3a9f6a 100644 --- a/source3/lib/winbind_util.c +++ b/source3/lib/winbind_util.c @@ -19,6 +19,7 @@ */ #include "includes.h" +#include "../libcli/security/security.h" #if defined(WITH_WINBIND) diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 32138a784c..c1af5b575b 100644 --- a/source3/libads/ldap.c +++ b/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 diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c index 375a2d31ff..45bef570b2 100644 --- a/source3/libgpo/gpo_reg.c +++ b/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" /**************************************************************** diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 28b2f6c654..424945146b 100644 --- a/source3/libnet/libnet_join.c +++ b/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" /**************************************************************** ****************************************************************/ diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c index 6e416af180..a464a004ab 100644 --- a/source3/libnet/libnet_samsync.c +++ b/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 diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c index a837ecd6dc..9d72194c03 100644 --- a/source3/libnet/libnet_samsync_passdb.c +++ b/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) ||\ diff --git a/source3/libsmb/cliquota.c b/source3/libsmb/cliquota.c index 002200ddaa..32be011db9 100644 --- a/source3/libsmb/cliquota.c +++ b/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) { diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c index 2150768341..369e03781a 100644 --- a/source3/libsmb/libsmb_server.c +++ b/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. diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c index bc329bf226..7086808f3c 100644 --- a/source3/libsmb/libsmb_xattr.c +++ b/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. diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c index 45354f1c77..2e7a9c6b03 100644 --- a/source3/libsmb/samlogon_cache.c +++ b/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" diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c index 8c8f05f90e..56f60114b6 100644 --- a/source3/libsmb/trustdom_cache.c +++ b/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 */ diff --git a/source3/locking/locking.c b/source3/locking/locking.c index ed07d7a25a..4a61953176 100644 --- a/source3/locking/locking.c +++ b/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 diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 58da904769..2ddcd0ea23 100644 --- a/source3/modules/vfs_acl_common.c +++ b/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, diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index a5e1f5e6f6..8cde7f42b7 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/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" diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index aa4a85c3c8..d21ad3d4b2 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/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" diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c index a66c48d396..40d8ddd4c9 100644 --- a/source3/passdb/account_pol.c +++ b/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 diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index fa855f3467..5c6118f8ce 100644 --- a/source3/passdb/lookup_sid.c +++ b/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. diff --git a/source3/passdb/machine_sid.c b/source3/passdb/machine_sid.c index 6e5a970f4c..4de51b82c9 100644 --- a/source3/passdb/machine_sid.c +++ b/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 diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 1989f6d191..dafe55eef7 100644 --- a/source3/passdb/passdb.c +++ b/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 diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index e172f145de..01f730eb20 100644 --- a/source3/passdb/pdb_ads.c +++ b/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; diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c index 13a7b5f69f..387ee2a322 100644 --- a/source3/passdb/pdb_compat.c +++ b/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 diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index 493e9ed0dd..762c23fe52 100644 --- a/source3/passdb/pdb_get_set.c +++ b/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 diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index e57ee7bbfe..a0913a3ea9 100644 --- a/source3/passdb/pdb_interface.c +++ b/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 diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index d046a527a6..942fd7fc56 100644 --- a/source3/passdb/pdb_ldap.c +++ b/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 diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 9369726988..f188399f78 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/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 diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index e1c2c437ff..da61e48a99 100644 --- a/source3/passdb/pdb_tdb.c +++ b/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 */ diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c index 1bb0e25cf7..28a725a741 100644 --- a/source3/passdb/secrets.c +++ b/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 diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c index cf483bbb96..a2cbbc76f6 100644 --- a/source3/passdb/util_builtin.c +++ b/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; diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c index 24d2c45449..ce64dc2d88 100644 --- a/source3/passdb/util_unixsids.c +++ b/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) { diff --git a/source3/passdb/util_wellknown.c b/source3/passdb/util_wellknown.c index 4f6f3f308d..5ca26db711 100644 --- a/source3/passdb/util_wellknown.c +++ b/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; diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 10804046bc..84de565159 100644 --- a/source3/printing/nt_printing.c +++ b/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 */ diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c index 90f11eee74..94671983a0 100644 --- a/source3/printing/nt_printing_tdb.c +++ b/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/" diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c index c1a29851f4..8426b84fec 100644 --- a/source3/printing/printspoolss.c +++ b/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); diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c index ea65c439b9..a96047817d 100644 --- a/source3/registry/reg_dispatcher.c +++ b/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 diff --git a/source3/registry/reg_util_token.c b/source3/registry/reg_util_token.c index 6373d48305..ca0159a649 100644 --- a/source3/registry/reg_util_token.c +++ b/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 diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c index 52fd6037e0..1b1c072456 100644 --- a/source3/rpc_client/cli_lsarpc.c +++ b/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 diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index 7c2cc1ce9a..a3275acec2 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/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 diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index fc19969a7b..feec3661a2 100644 --- a/source3/rpc_server/srv_lsa_nt.c +++ b/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 diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index fb60ef86ca..05d6bd684c 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/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; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index c8c5572b57..874a9214f2 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/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 diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 3783d0fba7..62725ee95a 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/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" diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index b901d96407..714567619d 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/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" diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index a4d7726d28..f59b972861 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 "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" #include "dbwrap.h" diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c index 6c74ade085..2a7ef81645 100644 --- a/source3/rpc_server/srv_svcctl_nt.c +++ b/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 diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c index 8c00254291..ee2b419696 100644 --- a/source3/rpc_server/srv_wkssvc_nt.c +++ b/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 diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c index 0b11be9df9..f55400d134 100644 --- a/source3/rpcclient/cmd_lsarpc.c +++ b/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 */ diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index 7730e65c12..5f5819fdf9 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/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; diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index b0412ef1d2..34a81742e4 100644 --- a/source3/rpcclient/rpcclient.c +++ b/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, diff --git a/source3/services/services_db.c b/source3/services/services_db.c index a224ab22c7..ca375d22d4 100644 --- a/source3/services/services_db.c +++ b/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; diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index cd8d6a26e8..b49b89396c 100644 --- a/source3/smbd/dir.c +++ b/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. diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index 1d1776218e..28d028fcb1 100644 --- a/source3/smbd/file_access.c +++ b/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 diff --git a/source3/smbd/files.c b/source3/smbd/files.c index 19a22e2b1e..7275868ffa 100644 --- a/source3/smbd/files.c +++ b/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)) diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 2b01e89d6c..e5527a5812 100644 --- a/source3/smbd/lanman.c +++ b/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 diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 017703ee97..3a9f6813ec 100644 --- a/source3/smbd/nttrans.c +++ b/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; diff --git a/source3/smbd/open.c b/source3/smbd/open.c index d3953319fe..77f33b1cb3 100644 --- a/source3/smbd/open.c +++ b/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; diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c index dfe8756a19..9f31abe569 100644 --- a/source3/smbd/pipes.c +++ b/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) diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 9713ec0b30..fa715fb673 100644 --- a/source3/smbd/posix_acls.c +++ b/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; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index c84c077d58..5af5dacc9b 100644 --- a/source3/smbd/reply.c +++ b/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 diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 675ae2b0d5..ab68cb783e 100644 --- a/source3/smbd/service.c +++ b/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; diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c index 72e7abe66a..387d988a4d 100644 --- a/source3/smbd/share_access.c +++ b/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 diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 7f3bc35616..b1866d1481 100644 --- a/source3/smbd/smb2_read.c +++ b/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, diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c index 8f80a56a42..1cfb4ceaa6 100644 --- a/source3/smbd/smb2_tcon.c +++ b/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, diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index ac6f8cd9e3..7ca5f5057a 100644 --- a/source3/smbd/trans2.c +++ b/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 diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index c52a819ba3..2b16d05b7c 100644 --- a/source3/smbd/uid.c +++ b/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; diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index db24f10cc5..1d9c02e4bd 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/proto.h" +#include "../libcli/security/security.h" #define MAX_FILES 1000 diff --git a/source3/torture/test_posix_append.c b/source3/torture/test_posix_append.c index c77a1a02c7..6c8317e5aa 100644 --- a/source3/torture/test_posix_append.c +++ b/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 diff --git a/source3/torture/torture.c b/source3/torture/torture.c index abec6111bd..18072828cf 100644 --- a/source3/torture/torture.c +++ b/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" diff --git a/source3/torture/utable.c b/source3/torture/utable.c index f5afeb7adc..588ff0f61f 100644 --- a/source3/torture/utable.c +++ b/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) { diff --git a/source3/utils/net.c b/source3/utils/net.c index 6c2fbad59a..9585398a56 100644 --- a/source3/utils/net.c +++ b/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; diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index a07e6c56ea..bc83a3d746 100644 --- a/source3/utils/net_ads.c +++ b/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 diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index 5e3b5bc61a..5efc5aee81 100644 --- a/source3/utils/net_groupmap.c +++ b/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. diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c index 268d5222c8..488132b515 100644 --- a/source3/utils/net_idmap.c +++ b/source3/utils/net_idmap.c @@ -23,6 +23,7 @@ #include "secrets.h" #include "idmap.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #define ALLOC_CHECK(mem) do { \ if (!mem) { \ diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c index 3609eacdf8..0a85da346f 100644 --- a/source3/utils/net_lookup.c +++ b/source3/utils/net_lookup.c @@ -22,6 +22,7 @@ #include "libads/dns.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "smb_krb5.h" +#include "../libcli/security/security.h" int net_lookup_usage(struct net_context *c, int argc, const char **argv) { diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index 634b6766c9..5f4c19d6e2 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 "../libcli/security/security.h" #include "../librpc/gen_ndr/ndr_security.h" #define FORMS_PREFIX "FORMS/" diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 7c49645cfc..d6fa4ab418 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -36,7 +36,7 @@ #include "secrets.h" #include "lib/netapi/netapi.h" #include "rpc_client/init_lsa.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" static int net_mode_share; static bool sync_files(struct copy_clistate *cp_clistate, const char *mask); diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index 0396e2a601..1e218049ed 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -24,6 +24,7 @@ #include "nt_printing.h" #include "registry.h" #include "registry/reg_objects.h" +#include "../libcli/security/security.h" /* support itanium as well */ static const struct print_architecture_table_node archi_table[]= { diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c index 5af984ee07..5d962dea31 100644 --- a/source3/utils/net_rpc_rights.c +++ b/source3/utils/net_rpc_rights.c @@ -22,6 +22,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" /******************************************************************** ********************************************************************/ diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 59c52bc270..cf270ae1bf 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -29,7 +29,7 @@ #include "../librpc/gen_ndr/ndr_drsuapi.h" #include "libnet/libnet_samsync.h" #include "libnet/libnet_dssync.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx, int argc, diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c index 435af091e3..f98be9c7d3 100644 --- a/source3/utils/net_rpc_sh_acct.c +++ b/source3/utils/net_rpc_sh_acct.c @@ -20,6 +20,7 @@ #include "popt_common.h" #include "utils/net.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "../libcli/security/security.h" /* * Do something with the account policies. Read them all, run a function on diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c index da3b9c3d00..51d49849ae 100644 --- a/source3/utils/net_sam.c +++ b/source3/utils/net_sam.c @@ -22,6 +22,7 @@ #include "utils/net.h" #include "../librpc/gen_ndr/samr.h" #include "smbldap.h" +#include "../libcli/security/security.h" /* * Set a user's data diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c index bbaf39a6e4..61b2caa606 100644 --- a/source3/utils/net_usershare.c +++ b/source3/utils/net_usershare.c @@ -20,6 +20,7 @@ #include "includes.h" #include "utils/net.h" +#include "../libcli/security/security.h" struct { const char *us_errstr; diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c index 11ef42cd61..6badf940b8 100644 --- a/source3/utils/net_util.c +++ b/source3/utils/net_util.c @@ -25,6 +25,7 @@ #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/cli_dssetup.h" #include "secrets.h" +#include "../libcli/security/security.h" NTSTATUS net_rpc_lookup_name(struct net_context *c, TALLOC_CTX *mem_ctx, struct cli_state *cli, diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index 9dff45b8f3..5482b1099e 100644 --- a/source3/utils/pdbedit.c +++ b/source3/utils/pdbedit.c @@ -23,6 +23,7 @@ #include "includes.h" #include "popt_common.h" #include "../librpc/gen_ndr/samr.h" +#include "../libcli/security/security.h" #define BIT_BACKEND 0x00000004 #define BIT_VERBOSE 0x00000008 diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c index 6c6c7fdb01..50c9d534e9 100644 --- a/source3/utils/profiles.c +++ b/source3/utils/profiles.c @@ -23,7 +23,7 @@ #include "popt_common.h" #include "registry/reg_objects.h" #include "registry/regfio.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" /* GLOBAL VARIABLES */ diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c index decd063913..a945fe58f6 100644 --- a/source3/utils/sharesec.c +++ b/source3/utils/sharesec.c @@ -24,7 +24,7 @@ #include "includes.h" #include "popt_common.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" static TALLOC_CTX *ctx; diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index fa039f639f..63858ea08d 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -25,7 +25,7 @@ #include "popt_common.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" extern bool AllowDebugChange; diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c index f473808886..8ee573eafc 100644 --- a/source3/utils/smbcquotas.c +++ b/source3/utils/smbcquotas.c @@ -26,6 +26,7 @@ #include "../librpc/gen_ndr/ndr_lsa.h" #include "rpc_client/cli_lsarpc.h" #include "fake_file.h" +#include "../libcli/security/security.h" static char *server; diff --git a/source3/utils/status.c b/source3/utils/status.c index 053efab592..ecfbf06137 100644 --- a/source3/utils/status.c +++ b/source3/utils/status.c @@ -33,6 +33,7 @@ #include "includes.h" #include "popt_common.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #define SMB_MAXPIDS 2048 static uid_t Ucrit_uid = 0; /* added by OH */ diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c index e633036de3..85bd33b7de 100644 --- a/source3/web/statuspage.c +++ b/source3/web/statuspage.c @@ -19,6 +19,7 @@ #include "includes.h" #include "web/swat_proto.h" +#include "libcli/security/security.h" #define _(x) lang_msg_rotate(talloc_tos(),x) diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c index 9f2f260951..1567598060 100644 --- a/source3/winbindd/idmap_ad.c +++ b/source3/winbindd/idmap_ad.c @@ -33,8 +33,8 @@ #include "nss_info.h" #include "secrets.h" #include "idmap.h" -#include "../libcli/security/dom_sid.h" #include "../libcli/ldap/ldap_ndr.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c index dcdc14f277..7b1f247c47 100644 --- a/source3/winbindd/idmap_ldap.c +++ b/source3/winbindd/idmap_ldap.c @@ -28,7 +28,7 @@ #include "secrets.h" #include "idmap.h" #include "idmap_rw.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c index 9a274fc9ff..778cfda0b9 100644 --- a/source3/winbindd/idmap_tdb.c +++ b/source3/winbindd/idmap_tdb.c @@ -28,6 +28,7 @@ #include "idmap.h" #include "idmap_rw.h" #include "dbwrap.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c index d743f8ce23..7525fa7620 100644 --- a/source3/winbindd/idmap_util.c +++ b/source3/winbindd/idmap_util.c @@ -22,6 +22,7 @@ #include "winbindd_proto.h" #include "idmap.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c index 8accc639af..3e9f52047b 100644 --- a/source3/winbindd/wb_getgrsid.c +++ b/source3/winbindd/wb_getgrsid.c @@ -20,7 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" struct wb_getgrsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c index 4ccc51ae18..cc75ff5bdc 100644 --- a/source3/winbindd/wb_getpwsid.c +++ b/source3/winbindd/wb_getpwsid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_getpwsid_state { struct winbindd_domain *user_domain; diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c index ca407b2117..5755ffa077 100644 --- a/source3/winbindd/wb_gettoken.c +++ b/source3/winbindd/wb_gettoken.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_gettoken_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_gid2sid.c b/source3/winbindd/wb_gid2sid.c index d4416f1a76..6bde2b5abf 100644 --- a/source3/winbindd/wb_gid2sid.c +++ b/source3/winbindd/wb_gid2sid.c @@ -22,6 +22,7 @@ #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" #include "idmap.h" +#include "../libcli/security/security.h" struct wb_gid2sid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_group_members.c b/source3/winbindd/wb_group_members.c index c01bc5d211..1fb7af3694 100644 --- a/source3/winbindd/wb_group_members.c +++ b/source3/winbindd/wb_group_members.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "../librpc/gen_ndr/ndr_security.h" +#include "../libcli/security/security.h" /* * We have 3 sets of routines here: diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c index 564616eaed..c28b51a774 100644 --- a/source3/winbindd/wb_lookupname.c +++ b/source3/winbindd/wb_lookupname.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupname_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_lookupsid.c b/source3/winbindd/wb_lookupsid.c index 6fe8a65c37..a831e9ff2d 100644 --- a/source3/winbindd/wb_lookupsid.c +++ b/source3/winbindd/wb_lookupsid.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c index 3970daa5ac..e1478aa6bd 100644 --- a/source3/winbindd/wb_lookupusergroups.c +++ b/source3/winbindd/wb_lookupusergroups.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_lookupusergroups_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c index b7d6af846c..f14fbcbed6 100644 --- a/source3/winbindd/wb_queryuser.c +++ b/source3/winbindd/wb_queryuser.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct wb_queryuser_state { struct dom_sid sid; diff --git a/source3/winbindd/wb_sid2gid.c b/source3/winbindd/wb_sid2gid.c index 15cf394e2f..76fe326996 100644 --- a/source3/winbindd/wb_sid2gid.c +++ b/source3/winbindd/wb_sid2gid.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" struct wb_sid2gid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_sid2uid.c b/source3/winbindd/wb_sid2uid.c index 51c70c5715..21bf61b3fc 100644 --- a/source3/winbindd/wb_sid2uid.c +++ b/source3/winbindd/wb_sid2uid.c @@ -21,6 +21,7 @@ #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" +#include "../libcli/security/security.h" struct wb_sid2uid_state { struct tevent_context *ev; diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c index 857066844c..46b896a140 100644 --- a/source3/winbindd/wb_uid2sid.c +++ b/source3/winbindd/wb_uid2sid.c @@ -22,6 +22,7 @@ #include "librpc/gen_ndr/cli_wbint.h" #include "idmap_cache.h" #include "idmap.h" +#include "../libcli/security/security.h" struct wb_uid2sid_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index fa498d63df..6acdc0ba9e 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -28,6 +28,7 @@ #include "ads.h" #include "secrets.h" #include "../libcli/ldap/ldap_ndr.h" +#include "../libcli/security/security.h" #ifdef HAVE_ADS diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c index 4d52731273..8e53892bd8 100644 --- a/source3/winbindd/winbindd_async.c +++ b/source3/winbindd/winbindd_async.c @@ -22,6 +22,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 81317464ef..9ee8f6ab2a 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -30,7 +30,7 @@ #include "../librpc/gen_ndr/ndr_wbint.h" #include "ads.h" #include "nss_info.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 3d84b62652..9de15b08cf 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -72,6 +72,7 @@ #include "libsmb/clidgram.h" #include "ads.h" #include "secrets.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index b1910b62c9..6bbd0ffd9d 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -22,6 +22,7 @@ #include "includes.h" #include "winbindd.h" #include "../libcli/auth/libcli_auth.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 5dfd123b7c..5058788e78 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -33,6 +33,7 @@ #include "librpc/gen_ndr/messaging.h" #include "secrets.h" #include "../lib/util/select.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index 4c6fb97e70..b661fb37e4 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/srv_wbint.h" #include "../librpc/gen_ndr/cli_netlogon.h" #include "idmap.h" +#include "../libcli/security/security.h" void _wbint_Ping(struct pipes_struct *p, struct wbint_Ping *r) { diff --git a/source3/winbindd/winbindd_getpwsid.c b/source3/winbindd/winbindd_getpwsid.c index 055de17f91..efea3fd2b3 100644 --- a/source3/winbindd/winbindd_getpwsid.c +++ b/source3/winbindd/winbindd_getpwsid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getpwsid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c index 5fcb8922ce..f01dac9c4c 100644 --- a/source3/winbindd/winbindd_getsidaliases.c +++ b/source3/winbindd/winbindd_getsidaliases.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getsidaliases_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getuserdomgroups.c b/source3/winbindd/winbindd_getuserdomgroups.c index 0bba024862..9fdff4fc66 100644 --- a/source3/winbindd/winbindd_getuserdomgroups.c +++ b/source3/winbindd/winbindd_getuserdomgroups.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getuserdomgroups_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_getusersids.c b/source3/winbindd/winbindd_getusersids.c index 257b7e4847..157c2ab644 100644 --- a/source3/winbindd/winbindd_getusersids.c +++ b/source3/winbindd/winbindd_getusersids.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_getusersids_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c index 0889cffc8d..20ba79ee16 100644 --- a/source3/winbindd/winbindd_lookuprids.c +++ b/source3/winbindd/winbindd_lookuprids.c @@ -20,6 +20,7 @@ #include "includes.h" #include "winbindd.h" #include "librpc/gen_ndr/cli_wbint.h" +#include "../libcli/security/security.h" struct winbindd_lookuprids_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c index 6f4ae4d0c7..596699f4f1 100644 --- a/source3/winbindd/winbindd_lookupsid.c +++ b/source3/winbindd/winbindd_lookupsid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_lookupsid_state { struct tevent_context *ev; diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c index 500c279ff3..8b2e55084d 100644 --- a/source3/winbindd/winbindd_msrpc.c +++ b/source3/winbindd/winbindd_msrpc.c @@ -30,6 +30,7 @@ #include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "rpc_client/cli_lsarpc.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 968ffcd9ca..6850b75d44 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -31,7 +31,7 @@ #include "rpc_client/cli_netlogon.h" #include "smb_krb5.h" #include "../lib/crypto/arcfour.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #include "ads.h" #include "../librpc/gen_ndr/krb5pac.h" diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 0a643f5644..88b1996258 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -33,7 +33,7 @@ #include "librpc/gen_ndr/srv_lsa.h" #include "rpc_client/cli_samr.h" #include "rpc_client/cli_lsarpc.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" /* Query display info for a domain */ NTSTATUS rpc_query_user_list(TALLOC_CTX *mem_ctx, diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c index 455d4941d7..c7528d1c66 100644 --- a/source3/winbindd/winbindd_samr.c +++ b/source3/winbindd/winbindd_samr.c @@ -34,6 +34,7 @@ #include "rpc_client/cli_lsarpc.h" #include "../librpc/gen_ndr/srv_lsa.h" #include "rpc_server/rpc_ncacn_np.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source3/winbindd/winbindd_sid_to_gid.c b/source3/winbindd/winbindd_sid_to_gid.c index 1e712cfbee..b0b0e6e211 100644 --- a/source3/winbindd/winbindd_sid_to_gid.c +++ b/source3/winbindd/winbindd_sid_to_gid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_sid_to_gid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_sid_to_uid.c b/source3/winbindd/winbindd_sid_to_uid.c index 43cb43255b..bf2824f9d8 100644 --- a/source3/winbindd/winbindd_sid_to_uid.c +++ b/source3/winbindd/winbindd_sid_to_uid.c @@ -19,6 +19,7 @@ #include "includes.h" #include "winbindd.h" +#include "../libcli/security/security.h" struct winbindd_sid_to_uid_state { struct dom_sid sid; diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 14be0e26fa..aec4cc60a2 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -23,7 +23,7 @@ #include "includes.h" #include "winbindd.h" #include "secrets.h" -#include "../libcli/security/dom_sid.h" +#include "../libcli/security/security.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c index 42245ce491..7faa9359db 100644 --- a/source4/dsdb/samdb/ldb_modules/samba3sam.c +++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c @@ -14,7 +14,6 @@ #include "librpc/gen_ndr/ndr_samr.h" #include "librpc/ndr/libndr.h" #include "libcli/security/security.h" -#include "libcli/security/proto.h" #include "lib/samba3/samba3.h" /* diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c index d612cf8769..bbb2eec4e9 100644 --- a/source4/lib/policy/gp_ldap.c +++ b/source4/lib/policy/gp_ldap.c @@ -26,8 +26,7 @@ #include "libcli/libcli.h" #include "libnet/libnet.h" #include "../librpc/gen_ndr/ndr_security.h" -#include "../libcli/security/dom_sid.h" -#include "libcli/security/security.h" +#include "../libcli/security/security.h" #include "libcli/ldap/ldap_ndr.h" #include "../lib/talloc/talloc.h" #include "lib/policy/policy.h" |