From f768b32e37788e6722217148b0a73e54c04bc03a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 12 Oct 2010 15:27:50 +1100 Subject: 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 Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104 --- source3/lib/eventlog/eventlog.c | 1 + source3/lib/idmap_cache.c | 1 + source3/lib/netapi/group.c | 2 +- source3/lib/netapi/localgroup.c | 2 +- source3/lib/netapi/samr.c | 1 + source3/lib/netapi/sid.c | 1 + source3/lib/netapi/user.c | 2 +- source3/lib/privileges.c | 1 + source3/lib/secdesc.c | 2 +- source3/lib/sharesec.c | 1 + source3/lib/smbldap.c | 1 + source3/lib/tldap_util.c | 1 + source3/lib/util_nttoken.c | 2 +- source3/lib/util_seaccess.c | 1 + source3/lib/winbind_util.c | 1 + 15 files changed, 15 insertions(+), 5 deletions(-) (limited to 'source3/lib') 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) -- cgit