diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-10-12 15:27:50 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-12 05:54:10 +0000 |
| commit | f768b32e37788e6722217148b0a73e54c04bc03a (patch) | |
| tree | cfbd8582766d35dc9fd7627e987ea58740679d6c /source3 | |
| parent | 5742f5115cc5102a668f8debc86deec23a4081f1 (diff) | |
| download | samba-f768b32e37788e6722217148b0a73e54c04bc03a.tar.gz samba-f768b32e37788e6722217148b0a73e54c04bc03a.tar.xz samba-f768b32e37788e6722217148b0a73e54c04bc03a.zip | |
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
Diffstat (limited to 'source3')
145 files changed, 145 insertions, 45 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9fbc7f1ba36..98cef791411 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 690838d779c..344e8e97a64 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 8666f88a2d5..826801ce504 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 a24b7e31442..e979ddfacf0 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 5e2e54487e5..0c6da8c2b93 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 dab2520fc19..cd9a59cb4f7 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 ea7cb6d9b19..c91258ef12f 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 bf72d91efed..fbe3a7ee39d 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 bf8d1667d61..b9dd1e98721 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 676f6df9edc..b2d08b7a59e 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 fb8e163be05..1e2620f9743 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 a9bca2689fb..704964a79f4 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 151c24b5398..152b72733db 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 3380d472a57..00dfefebc18 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 4c846282909..9ceba100158 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 3c19e77fcc3..59be365e1ef 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 6a97b608035..568a7ee6b93 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 5ff796137f7..7f1e9163384 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 680dd29ba77..81def879318 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 6c16fea5857..13032b8779a 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 9b95809aee6..57cb3a9f6a5 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 32138a784c1..c1af5b575b1 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 375a2d31ffe..45bef570b2b 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 28b2f6c6540..424945146b7 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 6e416af180c..a464a004ab4 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 a837ecd6dc8..9d72194c03a 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 002200ddaad..32be011db9e 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 2150768341f..369e03781ad 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 bc329bf226c..7086808f3cf 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 45354f1c77e..2e7a9c6b031 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 8c8f05f90ec..56f60114b69 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 ed07d7a25a6..4a619531769 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 58da9047692..2ddcd0ea23e 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 a5e1f5e6f67..8cde7f42b7b 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 aa4a85c3c8e..d21ad3d4b20 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 a66c48d3967..40d8ddd4c9c 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 fa855f3467f..5c6118f8ce8 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 6e5a970f4c7..4de51b82c92 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 1989f6d1919..dafe55eef75 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 e172f145de5..01f730eb20f 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 13a7b5f69f6..387ee2a322c 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 493e9ed0dd7..762c23fe52d 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 e57ee7bbfe0..a0913a3ea92 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 d046a527a6f..942fd7fc564 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 93697269883..f188399f780 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 e1c2c437ff6..da61e48a99d 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 1bb0e25cf77..28a725a7414 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 cf483bbb96e..a2cbbc76f68 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 24d2c454490..ce64dc2d886 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 4f6f3f308dd..5ca26db7113 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 10804046bca..84de565159b 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 90f11eee743..94671983a02 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 c1a29851f47..8426b84fec5 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 ea65c439b9b..a96047817d9 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 6373d48305b..ca0159a6491 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 52fd6037e02..1b1c0724568 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 7c2cc1ce9a3..a3275acec20 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 fc19969a7be..feec3661a25 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 fb60ef86cae..05d6bd684c2 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 c8c5572b575..874a9214f23 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 3783d0fba71..62725ee95a7 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 b901d964072..714567619d1 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 a4d7726d28d..f59b972861b 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 6c74ade0851..2a7ef816456 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 8c00254291f..ee2b419696c 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 0b11be9df9a..f55400d134e 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 7730e65c121..5f5819fdf93 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 b0412ef1d25..34a81742e48 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 a224ab22c72..ca375d22d48 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 cd8d6a26e80..b49b89396c0 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 1d1776218eb..28d028fcb1a 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 19a22e2b1e4..7275868ffae 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 2b01e89d6cb..e5527a58124 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 017703ee975..3a9f6813ecd 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 d3953319fe9..77f33b1cb30 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 dfe8756a19c..9f31abe569c 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 9713ec0b301..fa715fb6733 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 c84c077d581..5af5dacc9b1 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 675ae2b0d56..ab68cb783e5 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 72e7abe66a7..387d988a4d9 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 7f3bc356160..b1866d14811 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 8f80a56a42c..1cfb4ceaa61 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 ac6f8cd9e36..7ca5f5057a3 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 c52a819ba3b..2b16d05b7c9 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 db24f10cc59..1d9c02e4bde 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 c77a1a02c75..6c8317e5aad 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 abec6111bd4..18072828cf6 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 f5afeb7adc1..588ff0f61f2 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 6c2fbad59a4..9585398a566 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 a07e6c56eaa..bc83a3d746d 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 5e3b5bc61a2..5efc5aee81a 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 268d5222c85..488132b5157 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 3609eacdf8c..0a85da346fd 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 634b6766c92..5f4c19d6e25 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 7c49645cfc6..d6fa4ab4188 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 0396e2a601e..1e218049ede 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 5af984ee07b..5d962dea312 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 59c52bc2700..cf270ae1bfd 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 435af091e30..f98be9c7d33 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 da3b9c3d004..51d49849ae1 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 bbaf39a6e45..61b2caa606a 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 11ef42cd61c..6badf940b86 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 9dff45b8f37..5482b1099e5 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 6c6c7fdb013..50c9d534e9a 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 decd0639134..a945fe58f6f 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 fa039f639f3..63858ea08df 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 f473808886c..8ee573eafcd 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 053efab5929..ecfbf061372 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 e633036de3b..85bd33b7de0 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 9f2f2609515..15675980606 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 dcdc14f2776..7b1f247c479 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 9a274fc9ff2..778cfda0b92 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 d743f8ce23f..7525fa76203 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 8accc639afb..3e9f52047b4 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 4ccc51ae187..cc75ff5bdcc 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 ca407b21170..5755ffa0773 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 d4416f1a76d..6bde2b5abfb 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 c01bc5d211a..1fb7af3694d 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 564616eaedd..c28b51a7743 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 6fe8a65c37b..a831e9ff2d4 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 3970daa5ac2..e1478aa6bd5 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 b7d6af846c5..f14fbcbed6c 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 15cf394e2f7..76fe3269961 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 51c70c57154..21bf61b3fc3 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 857066844c1..46b896a1409 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 fa498d63dff..6acdc0ba9e7 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 4d527312737..8e53892bd83 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 81317464efb..9ee8f6ab2a6 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 3d84b626528..9de15b08cfa 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 b1910b62c98..6bbd0ffd9d1 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 5dfd123b7cb..5058788e784 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 4c6fb97e709..b661fb37e44 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 055de17f91a..efea3fd2b36 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 5fcb8922ce4..f01dac9c4ce 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 0bba0248624..9fdff4fc66f 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 257b7e48478..157c2ab644b 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 0889cffc8d8..20ba79ee16f 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 6f4ae4d0c7a..596699f4f12 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 500c279ff34..8b2e55084d0 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 968ffcd9ca3..6850b75d445 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 0a643f5644d..88b19962582 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 455d4941d7f..c7528d1c66f 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 1e712cfbee0..b0b0e6e211e 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 43cb43255b2..bf2824f9d8d 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 14be0e26fa2..aec4cc60a2d 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 |