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

diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index 6a820673b641fd7112b58f385f1a8af57cadd991..f45b770f8c4d7f5f51ba68ff93fce409e9561670 100644 (file)
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -19,9 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 
 /****************************************************************************
 #include "librpc/ndr/libndr.h"
 
 /****************************************************************************

diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 463a142dc316a2eca62ec1354873fea846d0ae8d..5b605c0531f8064dd42b428dfdc880758e79384c 100644 (file)
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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"
 
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "system/locale.h"
 

diff --git a/libcli/security/secace.c b/libcli/security/secace.c
index 5787e151106a529d2051b20324214c77cd1a247f..15775504181c75b17b032396a36ea85f8506d718 100644 (file)
--- 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 "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))
 #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
similarity index 97%
rename from source4/libcli/security/security.h
rename to libcli/security/security.h
index 009ad64959da8fb55340ddf10adef0bb1089edff..8018bee893bcf0b3abb5422353abe30e71ad79dd 100644 (file)
--- 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/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"
 
 #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
 #endif

diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 4e67e0a96b24c871fc278f16a7e51f1296b213ae..60f9de8f8796eb69c5007fce90f1f9913734c500 100644 (file)
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -20,8 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #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)
 
 /*
   return a blank security descriptor (no owners, dacl or sacl)

diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index c5096428921e384c5eac357b63499c097e300657..38a040533a2ba7c9278291288041b0871fb91005 100644 (file)
--- 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 "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
 
 /****************************************************************
  parse the raw extension string into a GP_EXT structure

diff --git a/libgpo/gpo_sec.c b/libgpo/gpo_sec.c
index 099dbaaa77f258229490f653819ecf92b0005921..e0304d464a53fe185e7b7436543efb19e7bb1dc6 100644 (file)
--- a/libgpo/gpo_sec.c
+++ b/libgpo/gpo_sec.c
@@ -18,7 +18,7 @@
  */
 
 #include "includes.h"
  */
 
 #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"
 #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 3320d97b2123ad1cc989f51c90416ba98284e334..9e4687ddc95cf89edeedd32de5b9c296a43b5f68 100644 (file)
--- 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 "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"
 #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 7207c0b6bae96f60fef5ce2594ccb80f18a314bc..ff8588dad4aa3a501cca5bb4948ad172a75caf63 100644 (file)
--- 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 "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
 
 /*
   return the wire size of a security_ace

diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 9fbc7f1ba36f6c93f6d1a7c542e5583a75b64f9a..98cef7914119ba3a63f2c75737b3e54387671699 100644 (file)
--- 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/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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index 690838d779c4a489fecc492139f03603aa096342..344e8e97a648d5865d9a34db6fce583eb69d435d 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 8666f88a2d542be6f85508af2f7e7d064a57bbed..826801ce504acc28346bbafcba21bfacfb1045ac 100644 (file)
--- 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 "includes.h"
 #include "secrets.h"
 #include "memcache.h"

-#include "../libcli/security/dom_sid.h"

 #include "../librpc/gen_ndr/netlogon.h"
 #include "../librpc/gen_ndr/netlogon.h"

+#include "../libcli/security/security.h"

 
 /****************************************************************************
  Check for a SID in an struct security_token
 
 /****************************************************************************
  Check for a SID in an struct security_token

diff --git a/source3/client/client.c b/source3/client/client.c
index a24b7e314420ae0c0bfd4077dd3699a955e17c34..e979ddfacf0fd3a87095ab347d317947c1b051dd 100644 (file)
--- 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 "../lib/util/select.h"
 #include "system/readline.h"
 #include "../libcli/smbreadline/smbreadline.h"

+#include "../libcli/security/security.h"

 
 #ifndef REGISTER
 #define REGISTER 0
 
 #ifndef REGISTER
 #define REGISTER 0

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 5e2e54487e5dfbd79edd1a7af9c31c515a2049c7..0c6da8c2b9356e4069dbb2f97176436713b2f864 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "groupdb/mapping.h"
 
 #include "includes.h"
 #include "groupdb/mapping.h"

+#include "../libcli/security/security.h"

 
 static const struct mapping_backend *backend;
 
 
 static const struct mapping_backend *backend;
 

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index dab2520fc199564287e3daec309de0329a2b8afc..cd9a59cb4f75408c812d3ae99bf99a4a2f78ad70 100644 (file)
--- 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 "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 */
 
 
 static struct db_context *db; /* used for driver files */
 

diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index ea7cb6d9b19da1cd1f422fcf082fa141cf404ca1..c91258ef12f56c0cc45c6e91fe876df5895864a7 100644 (file)
--- 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 "includes.h"
 #include "lib/eventlog/eventlog.h"

+#include "../libcli/security/security.h"

 
 /* maintain a list of open eventlog tdbs with reference counts */
 
 
 /* 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 bf72d91efed0c2b98cb9d2dc550d93a77bc8556b..fbe3a7ee39d17a18ecbf9e6693cb6d40e31988c4 100644 (file)
--- a/source3/lib/idmap_cache.c
+++ b/source3/lib/idmap_cache.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "idmap_cache.h"
 
 #include "includes.h"
 #include "idmap_cache.h"

+#include "../libcli/security/security.h"

 
 /**
  * Find a sid2uid mapping
 
 /**
  * Find a sid2uid mapping

diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index bf8d1667d61827e8687d98f42d75c62be563e5d9..b9dd1e98721bc6bfa5d9b23bfa9cf2a314c3f8cb 100644 (file)
--- 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 "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 676f6df9edc4bcb6d46fa1aac8efe31e6fb388d8..b2d08b7a59e3b5ad7219f6b5b53214bcb31b2836 100644 (file)
--- 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 "../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,
 
 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 fb8e163be051d4ee26276a36513b32b55548b23f..1e2620f97436cef26e77c58f7166e1bf43cabc72 100644 (file)
--- 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 "../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 a9bca2689fbff991c005088367fabafcfb781bf9..704964a79f4dc834bf28d6f3d4bbda74a7da0a2f 100644 (file)
--- 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 "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 151c24b5398483411ee8a480d095fcd27b72fc10..152b72733db68bc5d3947209ee0cf445beb64bc7 100644 (file)
--- 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 "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 3380d472a57857f4f9549147293996d586629f22..00dfefebc1829d29f385ece01c0240e486329176 100644 (file)
--- 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 "includes.h"
 #include "dbwrap.h"
 #include "libcli/security/privileges_private.h"

+#include "../libcli/security/security.h"

 
 #define PRIVPREFIX              "PRIV_"
 
 
 #define PRIVPREFIX              "PRIV_"
 

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index 4c846282909ab4bf1414efc29dc5e72f45cb9d5e..9ceba100158c0d5d142ec2e2b246ed9cb0c6a4c4 100644 (file)
--- 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 "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|\
 
 #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 3c19e77fcc357bd5a4872669a336b8a86e97d4bd..59be365e1ef9fb71fda55805e95bc970cb621cb4 100644 (file)
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
  */
 
 #include "includes.h"

+#include "../libcli/security/security.h"

 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
 
 #include "../librpc/gen_ndr/ndr_security.h"
 #include "dbwrap.h"
 

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 6a97b6080358ad5192ff40c90c689cc2d8321382..568a7ee6b93a959fe8af6c9765bf5c57f41e18ee 100644 (file)
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "smbldap.h"
 #include "secrets.h"
 #include "includes.h"
 #include "smbldap.h"
 #include "secrets.h"

+#include "../libcli/security/security.h"

 
 /* Try not to hit the up or down server forever */
 
 
 /* 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 5ff796137f798783efbab00b249f7e2c8bd99916..7f1e916338485ea5edde53791798bfe5b0ed5a00 100644 (file)
--- 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 "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)
 
 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 680dd29ba77b10a4f52d451cc26dc1b85111e28f..81def87931885c1e77f4bc092ed9c8ef14e227d6 100644 (file)
--- 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"
 /* 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.
 
 /****************************************************************************
  Duplicate a SID token.

diff --git a/source3/lib/util_seaccess.c b/source3/lib/util_seaccess.c
index 6c16fea5857b1da37717c52df4f195974f7ba12a..13032b8779a9b41d0547226e87b13359429c439f 100644 (file)
--- a/source3/lib/util_seaccess.c
+++ b/source3/lib/util_seaccess.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #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
 
 /* 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 9b95809aee6638cc4891a9f89cb803e39b9ef29f..57cb3a9f6a547463545abd577b658312bba1fa2a 100644 (file)
--- a/source3/lib/winbind_util.c
+++ b/source3/lib/winbind_util.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

+#include "../libcli/security/security.h"

 
 #if defined(WITH_WINBIND)
 
 
 #if defined(WITH_WINBIND)
 

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 32138a784c1310fefc4d8226b81e42ffc2c48b47..c1af5b575b16c745d27147b8b9257d300a4da65c 100644 (file)
--- 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 "libads/dns.h"
 #include "../libds/common/flags.h"
 #include "smbldap.h"

+#include "../libcli/security/security.h"

 
 #ifdef HAVE_LDAP
 
 
 #ifdef HAVE_LDAP
 

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 375a2d31ffe50e3584d1ab1404d8d9e88d648ef8..45bef570b2b47e7e4425ff50906dbb4a1fb74cd0 100644 (file)
--- 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 "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 28b2f6c6540866ceab7c2806a0dd711fc2aabd82..424945146b7192fb7fbeee3d8aaf4d30417cd521 100644 (file)
--- 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 "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 6e416af180ce0c46ed7a8c5e193854c5fc9f07a7..a464a004ab4220e54737ad2fa308a85f3784d909 100644 (file)
--- 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/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
 
 /**
  * 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 a837ecd6dc88b74db85bd4722bd8ec11318d1668..9d72194c03a534af916af09fd72b316d4c7ba3c0 100644 (file)
--- 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 "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) ||\
 
 /* 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 002200ddaadc91be51a5b2042114ca643effc4f5..32be011db9e1c91ba105554fb531733ebd8d3bf5 100644 (file)
--- 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 "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)
 {
 
 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 2150768341f48d551ffa567511c65bdf1dd316f5..369e03781adde53f59c5c43163827f4bc575187d 100644 (file)
--- 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 "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.
 
 /* 
  * Check a server for being alive and well.

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index bc329bf226cabab86d236edf03f19e96e80bfedd..7086808f3cfd814ec3bad20d32597ef7f63d856a 100644 (file)
--- 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 "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.
 
 /*
  * 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 45354f1c77e4a086f6f0582796b1adf14d0fbc5b..2e7a9c6b031b2270af6fe5e6c0c02b335ccead42 100644 (file)
--- 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 "includes.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"

+#include "../libcli/security/security.h"

 
 #define NETSAMLOGON_TDB        "netsamlogon_cache.tdb"
 
 
 #define NETSAMLOGON_TDB        "netsamlogon_cache.tdb"
 

diff --git a/source3/libsmb/trustdom_cache.c b/source3/libsmb/trustdom_cache.c
index 8c8f05f90ecd52e552244b0fa8c8bdd6848678eb..56f60114b695545a34531c0277d7a882e955c3aa 100644 (file)
--- a/source3/libsmb/trustdom_cache.c
+++ b/source3/libsmb/trustdom_cache.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_ALL    /* there's no proper class yet */
 
 #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 ed07d7a25a6be0c03e450c5d9059a27892068757..4a619531769357164c2c80e913aae57e894ab221 100644 (file)
--- 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 "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
 
 #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 58da9047692434d237383cb0e8568a4e98373466..2ddcd0ea23e8f290216368f4c5fd39d49cb27e4a 100644 (file)
--- 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/>.
  */
 
  * 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,
 #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 a5e1f5e6f679fe9e09785759c057e90c325e5366..8cde7f42b7be33f983e851f34d1cf2cc594b81f1 100644 (file)
--- 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 "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"
 
 #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 aa4a85c3c8e16f5b42c44b6e9fa6e18887040c07..d21ad3d4b200d29a39e3af2b3b774c4cb268ea13 100644 (file)
--- 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/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"
 
 #include "secrets.h"
 #include "nmbd/nmbd.h"
 

diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index a66c48d396733ba5bf16b2afd6cc291bac1350ed..40d8ddd4c9cd08361356d155b09ec6c5aa8fd53b 100644 (file)
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
 
 #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
 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 fa855f3467f0b05ed0758b5def8220ba6c75c418..5c6118f8ce81459a117611a9a140f0013628fdaf 100644 (file)
--- 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 "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.
 
 /*****************************************************************
  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 6e5a970f4c7082b5a76fad0eb403cd127c30919e..4de51b82c921ae283fde6ff2f19a36cea90d9c46 100644 (file)
--- 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 "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
 
 /* 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 1989f6d19194f5c6c0ebd2aa50a870ce6b1fbc41..dafe55eef756fa3cbb77b8d59888e9e57e594cfd 100644 (file)
--- 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 "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "secrets.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index e172f145de522616e5253c812a2f6fb8323884c1..01f730eb20fbf872c0f5ea7e6ec7abcd96603c2d 100644 (file)
--- 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 "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;
 
 struct pdb_ads_state {
        struct sockaddr_un socket_address;

diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c
index 13a7b5f69f6516c92cf529ba048dd59e0c2055cb..387ee2a322c12a5bb685f779ace24723c29afb83 100644 (file)
--- a/source3/passdb/pdb_compat.c
+++ b/source3/passdb/pdb_compat.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
 #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 493e9ed0dd709316634e0844722b13b00e5391f6..762c23fe52d736c6abdbb2894a8847f8d916f455 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index e57ee7bbfe08fe418a1dc19d6d3e508edcb9a0b6..a0913a3ea926ba2cc23ac0a4562f84f3de3eaf91 100644 (file)
--- 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 "../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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d046a527a6f6407e84f98f799ce4ccb543c705a4..942fd7fc564bcd5064808050279875c5263c1f7a 100644 (file)
--- 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/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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index 93697269883ef29c189c7244ca1456850eb4a808..f188399f78005d7b83ca21fb906370575acdd330 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index e1c2c437ff690a4e2d16adb2957d65e57d00b21c..da61e48a99d3bb48f86423b32db1d3ffa75ac93a 100644 (file)
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "dbwrap.h"
 
 #include "includes.h"
 #include "dbwrap.h"

+#include "../libcli/security/security.h"

 
 #if 0 /* when made a module use this */
 
 
 #if 0 /* when made a module use this */
 

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 1bb0e25cf77a84c71d1bc055da208ca97c9952cb..28a725a741417aa5d5094ffe2bed46f312f1e4e2 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source3/passdb/util_builtin.c b/source3/passdb/util_builtin.c
index cf483bbb96e238da6c406a5ac6fc369ae0965c61..a2cbbc76f685fc7337fbe0eedf86ea9a9f829a77 100644 (file)
--- a/source3/passdb/util_builtin.c
+++ b/source3/passdb/util_builtin.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"

 
 struct rid_name_map {
        uint32 rid;
 
 struct rid_name_map {
        uint32 rid;

diff --git a/source3/passdb/util_unixsids.c b/source3/passdb/util_unixsids.c
index 24d2c454490162746723be38bf109c90d3505c31..ce64dc2d8869600a684f4c7add8f9a2bb3dd9350 100644 (file)
--- a/source3/passdb/util_unixsids.c
+++ b/source3/passdb/util_unixsids.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
 */
 
 #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)
 {
 
 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 4f6f3f308dd2441823ce39f6bfd0453e81b71773..5ca26db71135c198a7e2c00bbc70c2125b9e41d5 100644 (file)
--- a/source3/passdb/util_wellknown.c
+++ b/source3/passdb/util_wellknown.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"

 
 struct rid_name_map {
        uint32 rid;
 
 struct rid_name_map {
        uint32 rid;

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 10804046bca68b6f35901f01eb9e8c8d1d345eac..84de565159b34d6711fcd4a1c6e8e617f4a65f7d 100644 (file)
--- 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 "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 */
 
 
 /* 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 90f11eee743ebd320cca2c71e28b67993a8bb523..94671983a02ad0865ee5d5286de3ebdcef233162 100644 (file)
--- 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 "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/"
 
 #define FORMS_PREFIX "FORMS/"
 #define DRIVERS_PREFIX "DRIVERS/"

diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index c1a29851f47dbad913c59689b873e895c8fab716..8426b84fec501a4ef5a839a7d579e4e0f5f4692e 100644 (file)
--- 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 "../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);
 
 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 ea65c439b9b218655a7b13ae0069056a10687213..a96047817d9a033f5704a285d5daf93edfd0c43a 100644 (file)
--- 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 "includes.h"
 #include "registry.h"
 #include "reg_dispatcher.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
 #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 6373d48305b1c41d99f08a88b51ea26f81694361..ca0159a6491322dedc7f1c07c3b33f13a7cc6e65 100644 (file)
--- 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 "includes.h"
 #include "reg_util_token.h"

+#include "../libcli/security/security.h"

 
 /*
  * create a fake token just with enough rights to
 
 /*
  * 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 52fd6037e02d6de09c9ba605626e667922a8ba18..1b1c07245688e3f24b9c4d7176c67a7de66824cb 100644 (file)
--- 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 "../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
 
 /** @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 7c2cc1ce9a3e580b319f495915b3dacec8cefd45..a3275acec2064fef84bf4f3b11bd155316a6dfed 100644 (file)
--- 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 "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
 
 #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 fc19969a7bebef6f2e322144041381d14e4100dc..feec3661a25a4e945d7608f92ac235a83ade7985 100644 (file)
--- 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 "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
 
 #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 fb60ef86cae9055248cbafb71a788ff85113b447..05d6bd684c255240750bbf19c4a1d47735528677 100644 (file)
--- 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 "../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;
 
 
 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 c8c5572b57537c0fcd07cb40a7c5848b9c78f514..874a9214f23c4215361f7a1938faea6dbdf10623 100644 (file)
--- 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 "../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
 
 #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 3783d0fba715e7bcf7f98e7dfc532d6f626a0fad..62725ee95a7a935fcaac5014d59d6c93abd7d983 100644 (file)
--- 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 "../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"
 #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 b901d9640720b06d1693e4aaae89b02d8083e501..714567619d126c7c1b609d3dda8aebd5ef25458c 100644 (file)
--- 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 "../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"
 
 #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 a4d7726d28d9a20a42d7ba45dd9243f3c0a3a868..f59b972861b276db590cbf09b0749bca736cda7a 100644 (file)
--- 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 "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"
 
 #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 6c74ade08516bede978058d06b5328aba32499e6..2a7ef816456f29e7776d7d2ff533481e478e8e7f 100644 (file)
--- 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 "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
 #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 8c00254291f94795ef121c865d8593803b467c81..ee2b419696c2c37a3ca267182111830c943a2bc5 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 0b11be9df9a7eefa0b8e551c4f3fe418e0145588..f55400d134e4101dcc982ddc3b97cb6d32818fbc 100644 (file)
--- 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 "../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 */
 
 /* 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 7730e65c1218cf7ef3f634beac6ff27bf5e3789e..5f5819fdf93a9ebdf66f0d140f3499abaefeddc0 100644 (file)
--- 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 "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;
 
 
 extern struct dom_sid domain_sid;
 

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index b0412ef1d25070557019fefa413247e71623ca00..34a81742e488b2f62fef0425497817c370a61468 100644 (file)
--- 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 "../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,
 
 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 a224ab22c722db16f9491bef776d44b76e377191..ca375d22d48a8c9cc3a53bacf706221adcee50b1 100644 (file)
--- 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 "registry.h"
 #include "registry/reg_api.h"
 #include "registry/reg_api_util.h"

+#include "../libcli/security/security.h"

 
 struct rcinit_file_information {
        char *description;
 
 struct rcinit_file_information {
        char *description;

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index cd8d6a26e8016a624120ae1dae9ea3f2826ea7b1..b49b89396c02d8391a1c0da497144b38948625ca 100644 (file)
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
 
 #include "includes.h"
 #include "smbd/globals.h"

+#include "libcli/security/security.h"

 
 /*
    This module implements directory related functions for Samba.
 
 /*
    This module implements directory related functions for Samba.

diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 1d1776218ebac441fd06b37cad46ee8df6401733..28d028fcb1a1766bd21a530b41ebe2f08103f400 100644 (file)
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

+#include "../libcli/security/security.h"

 #include "../librpc/gen_ndr/ndr_security.h"
 
 #undef  DBGC_CLASS
 #include "../librpc/gen_ndr/ndr_security.h"
 
 #undef  DBGC_CLASS

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 19a22e2b1e47c4b5b5b46b78e8e9529af567e8d1..7275868ffae45302f8bf59cb418ed3ed3af70d41 100644 (file)
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
 
 #include "includes.h"
 #include "smbd/globals.h"

+#include "libcli/security/security.h"

 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
 
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
 

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 2b01e89d6cbd23243acfbbec7f55516a5bb26f08..e5527a581240dc4de021fc5a49bc8636a72d4506 100644 (file)
--- 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/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
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 017703ee9752eec80a574605fd3f5053021f660b..3a9f6813ecded55f96adcf8c45da7c2a15c819c0 100644 (file)
--- 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 "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;
 #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 d3953319fe9233ba5d4eee7d0b2f6a29a22928cf..77f33b1cb3030806ea3682cc698596567bc0aef5 100644 (file)
--- 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 "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;
 #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 dfe8756a19cfecdf97023ecfbf99fe9df84446a7..9f31abe569cfbeb6bd8ee4e2f88f8b0181c7ea86 100644 (file)
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -27,6 +27,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
 
 #include "includes.h"
 #include "smbd/globals.h"

+#include "libcli/security/security.h"

 
 #define        PIPE            "\\PIPE\\"
 #define        PIPELEN         strlen(PIPE)
 
 #define        PIPE            "\\PIPE\\"
 #define        PIPELEN         strlen(PIPE)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9713ec0b301669b9b29beec0460a35c8b0d2f028..fa715fb6733138e0bc98d7eb9c381864c7e3d950 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"

 
 extern const struct generic_mapping file_generic_mapping;
 
 
 extern const struct generic_mapping file_generic_mapping;
 

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c84c077d581b968ab9f35987c9c70b351934cad5..5af5dacc9b1c56a24a12968af61e4ce7d91b7969 100644 (file)
--- 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 "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
 
 /****************************************************************************
  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 675ae2b0d5644a306f3f6384152e0ba35bcf5315..ab68cb783e5d3c93e578b3228b87c2def845ce71 100644 (file)
--- 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 "includes.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"

+#include "../libcli/security/security.h"

 
 extern userdom_struct current_user_info;
 
 
 extern userdom_struct current_user_info;
 

diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 72e7abe66a7256135b10227b4471c785d4a3a04c..387d988a4d99e2ef86eb658265f2964dbb932336 100644 (file)
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
 
 #include "includes.h"
 #include "smbd/globals.h"

+#include "../libcli/security/security.h"

 
 /*
  * No prefix means direct username
 
 /*
  * No prefix means direct username

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 7f3bc356160e628eae7626a6b8ccfd3f457ef065..b1866d148110f4426e37d33689a7f0741856fbdd 100644 (file)
--- 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 "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,
 
 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 8f80a56a42c0b18063bda7c35d574c763ca242e1..1cfb4ceaa61f340184661a84751fac4da257875d 100644 (file)
--- 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 "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,
 
 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 ac6f8cd9e36446f47b6941855b92eca0d9ec6ee0..7ca5f5057a37cf7454a9f50da8a75323ffa95875 100644 (file)
--- 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/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
 
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 

diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index c52a819ba3b438f78dad3613e54fdbac3db23399..2b16d05b7c9414ad2bbfdb855eb780a626d9d218 100644 (file)
--- 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 "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;
 
 /* what user is current? */
 extern struct current_user current_user;

diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index db24f10cc59502dcb657bb43cbb4de93fb1db0b2..1d9c02e4bde4f3db41f486bd3e9bcd0f2d458227 100644 (file)
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "torture/proto.h"
 
 #include "includes.h"
 #include "torture/proto.h"

+#include "../libcli/security/security.h"

 
 #define MAX_FILES 1000
 
 
 #define MAX_FILES 1000
 

diff --git a/source3/torture/test_posix_append.c b/source3/torture/test_posix_append.c
index c77a1a02c759b5c7c7c4e9025b7531723f5dc572..6c8317e5aad72755850537c904cea330ab60ea98 100644 (file)
--- 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 "includes.h"
 #include "torture/proto.h"

+#include "../libcli/security/security.h"

 
 /*
  * Make sure that GENERIC_WRITE does not trigger append. See
 
 /*
  * Make sure that GENERIC_WRITE does not trigger append. See

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index abec6111bd49f9511fb394b98090b09469447523..18072828cf64ca855b7f15e5bfa8089af16d3f4c 100644 (file)
--- 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 "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"
 #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 f5afeb7adc16d4884c2ef1fa9f677ed57539e677..588ff0f61f243dc3bf21f8ef9bb0f3beba36dc9c 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "torture/proto.h"
 
 #include "includes.h"
 #include "torture/proto.h"

+#include "../libcli/security/security.h"

 
 bool torture_utable(int dummy)
 {
 
 bool torture_utable(int dummy)
 {

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 6c2fbad59a44f0c7e8590442adfca93a7da947a0..9585398a566f22f8b0941f749afe9925089a0710 100644 (file)
--- 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 "utils/net.h"
 #include "secrets.h"
 #include "lib/netapi/netapi.h"

+#include "../libcli/security/security.h"

 
 extern bool AllowDebugChange;
 
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index a07e6c56eaaaa2bf237145ed708a8e5427a2a504..bc83a3d746d5517f66ccea47469ed9d19112e725 100644 (file)
--- 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 "smb_krb5.h"
 #include "secrets.h"
 #include "krb5_env.h"

+#include "../libcli/security/security.h"

 
 #ifdef HAVE_ADS
 
 
 #ifdef HAVE_ADS
 

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 5e3b5bc61a24a1eae537afd54f7bf675953bc6f3..5efc5aee81a9c49036ff58fded6a24f34a750d67 100644 (file)
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
 
 #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.
 
 /*********************************************************
  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 268d5222c85c0904e98411a1a7c82cba61403b0c..488132b515777b9d01015364f1abd3cd56ac822a 100644 (file)
--- 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 "secrets.h"
 #include "idmap.h"
 #include "dbwrap.h"

+#include "../libcli/security/security.h"

 
 #define ALLOC_CHECK(mem) do { \
        if (!mem) { \
 
 #define ALLOC_CHECK(mem) do { \
        if (!mem) { \

diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 3609eacdf8c583a0d55cbffb20c6b5a291dc9e96..0a85da346fd7ffe55f88bc2e77310007036c0dc6 100644 (file)
--- 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 "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)
 {
 
 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 634b6766c9276af611448595e8ba78f06bf76a64..5f4c19d6e254fe306635b3b0eeb618aa080fbef7 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
 #include "librpc/gen_ndr/ndr_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/"
 #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 7c49645cfc665d6869fd579266005619425a16e3..d6fa4ab4188ed84e14fdd6f2c3a05bf9e3c3e72b 100644 (file)
--- 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 "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);
 
 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 0396e2a601e583e89ed4652f6bea82e0d93da90c..1e218049ede0506b2da721e7cac560ced8544365 100644 (file)
--- 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 "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[]= {
 
 /* 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 5af984ee07ba2f20433e04c1be174e07857a10b6..5d962dea31292b2ac851f87bb353451b4f668594 100644 (file)
--- 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 "../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 59c52bc27002016cb3ef4b2f7164b19d958222f2..cf270ae1bfde489a3f0da4cb72c0ce64d68caa32 100644 (file)
--- 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 "../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,
 
 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 435af091e300bb67e2109178fa421194fce1edc9..f98be9c7d332869e88863d7bae3a19bb66a7f188 100644 (file)
--- 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 "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
 
 /*
  * 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 da3b9c3d0049482162ef5a7743a2bc904606162b..51d49849ae135697048ca58550574b2aa347d8ad 100644 (file)
--- 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 "utils/net.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "smbldap.h"

+#include "../libcli/security/security.h"

 
 /*
  * Set a user's data
 
 /*
  * Set a user's data

diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index bbaf39a6e4598e477fa7acdbb33b853cd991ae06..61b2caa606a3384dde467be08ddac5e95789be27 100644 (file)
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
 
 #include "includes.h"
 #include "utils/net.h"

+#include "../libcli/security/security.h"

 
 struct {
        const char *us_errstr;
 
 struct {
        const char *us_errstr;

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 11ef42cd61c7ac09f35bce730efd0051694b97c3..6badf940b86b978dfe9040b00ee1aaf98d288d7d 100644 (file)
--- 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 "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,
 
 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 9dff45b8f375eb7646efd5d80669fe5addb347f2..5482b1099e5257a2325888b9efdc581a30fcec7f 100644 (file)
--- 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 "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
 
 #define BIT_BACKEND    0x00000004
 #define BIT_VERBOSE    0x00000008

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 6c6c7fdb0137b1591f315aff439561dacd886396..50c9d534e9a062e32e8c59ef637618959cef2dc4 100644 (file)
--- 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 "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 */
 
 
 /* GLOBAL VARIABLES */
 

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index decd0639134ed271fb62515de640064972ff282f..a945fe58f6f0a2006a0302499097ba852f21951d 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "popt_common.h"
 
 #include "includes.h"
 #include "popt_common.h"

-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"

 
 static TALLOC_CTX *ctx;
 
 
 static TALLOC_CTX *ctx;
 

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index fa039f639f3f208716f68525c73ff12545f3e143..63858ea08dff11847074d2045b8115d837a20e04 100644 (file)
--- 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 "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;
 
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index f473808886c5590908b30baed4326ac6dab0bc98..8ee573eafcd534dc0607952a3568a726d3332205 100644 (file)
--- 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 "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "fake_file.h"

+#include "../libcli/security/security.h"

 
 static char *server;
 
 
 static char *server;
 

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 053efab5929cb7323f1937186f28f93ed9c018f0..ecfbf0613721a16739cfff4a609d610bbe797ca6 100644 (file)
--- 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 "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 */
 
 #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 e633036de3bd8c741b857b4af35b99b9dc682bc9..85bd33b7de0d5da33432cfb56c23858c63abffc3 100644 (file)
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "web/swat_proto.h"
 
 #include "includes.h"
 #include "web/swat_proto.h"

+#include "libcli/security/security.h"

 
 #define _(x) lang_msg_rotate(talloc_tos(),x)
 
 
 #define _(x) lang_msg_rotate(talloc_tos(),x)
 

diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c
index 9f2f2609515d7115f3af859197f2f7cf2824b08e..156759806068de5e45930f2677b9eb47d5aa60ce 100644 (file)
--- 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 "nss_info.h"
 #include "secrets.h"
 #include "idmap.h"

-#include "../libcli/security/dom_sid.h"

 #include "../libcli/ldap/ldap_ndr.h"
 #include "../libcli/ldap/ldap_ndr.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index dcdc14f277611e9d468066279374316e1a4e6ae6..7b1f247c479dca55421ffec639550013a0702d9a 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 9a274fc9ff2137d5bb07d2f57c93f2035693e590..778cfda0b92443ae659e58537e0ced68e453a0de 100644 (file)
--- 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 "idmap.h"
 #include "idmap_rw.h"
 #include "dbwrap.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
index d743f8ce23f014f32594dda464c301f1bc27cb92..7525fa76203d30bfc3a24ad7a7f8c3cf0458155d 100644 (file)
--- 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 "winbindd_proto.h"
 #include "idmap.h"
 #include "idmap_cache.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP

diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c
index 8accc639afb9d040f5f3ee0c70d740d87211cd4a..3e9f52047b4e1d095f889cefe8a1ad11b7bb3295 100644 (file)
--- 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 "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;
 
 struct wb_getgrsid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 4ccc51ae1875e51d0a5a574423c298e014b5fe18..cc75ff5bdcc746f0ce3a843d2e942d224d1cefea 100644 (file)
--- 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 "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;
 
 struct wb_getpwsid_state {
        struct winbindd_domain *user_domain;

diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c
index ca407b2117022a0a7b1667f0ab0f3d3d0315a435..5755ffa07735915e8061591fd5aecff87f73388c 100644 (file)
--- 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 "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;
 
 struct wb_gettoken_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_gid2sid.c b/source3/winbindd/wb_gid2sid.c
index d4416f1a76db46e583c99eefe64b82df9b8fc288..6bde2b5abfb24e28e1b7961deb42b7cd34163694 100644 (file)
--- 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 "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;
 
 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 c01bc5d211ab9912bd80298837ecd2f810b872e7..1fb7af3694da8a6f7791512a8449ca8c7ce83061 100644 (file)
--- 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 "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:
 
 /*
  * We have 3 sets of routines here:

diff --git a/source3/winbindd/wb_lookupname.c b/source3/winbindd/wb_lookupname.c
index 564616eaedd849281ddcb95176575b92376d0807..c28b51a77430c08e7cde13f1be3082ddc59694b3 100644 (file)
--- 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 "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;
 
 struct wb_lookupname_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_lookupsid.c b/source3/winbindd/wb_lookupsid.c
index 6fe8a65c37bb078eaeb1180297c68b4cccc2d4f1..a831e9ff2d4cd73ee087b8048cc00aa89ddd303d 100644 (file)
--- 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 "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;
 
 struct wb_lookupsid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_lookupusergroups.c b/source3/winbindd/wb_lookupusergroups.c
index 3970daa5ac250880d84634b487eae222b770c57b..e1478aa6bd57441539ee74f9f4e721600a2c39ff 100644 (file)
--- 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 "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;
 
 struct wb_lookupusergroups_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_queryuser.c b/source3/winbindd/wb_queryuser.c
index b7d6af846c59892b14b0fc21402e7ca5fadfd150..f14fbcbed6cb2083d02f0a0b8de953bc9290c1a9 100644 (file)
--- 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 "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;
 
 struct wb_queryuser_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/wb_sid2gid.c b/source3/winbindd/wb_sid2gid.c
index 15cf394e2f7d5608662469ff1e43db0cd4def6cd..76fe326996107a53d83e19e6f89a02b863dc642d 100644 (file)
--- 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 "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;
 
 struct wb_sid2gid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_sid2uid.c b/source3/winbindd/wb_sid2uid.c
index 51c70c57154166eab7f03874a14771d91dc4d473..21bf61b3fc3d45a3326191529dadbcf74a790cf5 100644 (file)
--- 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 "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;
 
 struct wb_sid2uid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/wb_uid2sid.c b/source3/winbindd/wb_uid2sid.c
index 857066844c18a8dd1fce35a1cb1e23dd3992a1db..46b896a1409fa25dfe7cc278f81bdae7516d876a 100644 (file)
--- 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 "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;
 
 struct wb_uid2sid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index fa498d63dff0f449a9b8152b188c937e467d36bb..6acdc0ba9e7d703394ccbccf2d9e629d5cbeb184 100644 (file)
--- 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 "ads.h"
 #include "secrets.h"
 #include "../libcli/ldap/ldap_ndr.h"

+#include "../libcli/security/security.h"

 
 #ifdef HAVE_ADS
 
 
 #ifdef HAVE_ADS
 

diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c
index 4d5273127379996fc3380d49ca7d7f4e1f5ed7a9..8e53892bd83603db3b01d51ae4a72b4c1fc167d9 100644 (file)
--- a/source3/winbindd/winbindd_async.c
+++ b/source3/winbindd/winbindd_async.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 81317464efb4b08ebab74d09bbb2e2b9b47c890c..9ee8f6ab2a6add3a76c8483cc6958ba1e8fe3f8e 100644 (file)
--- 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 "../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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 3d84b626528a36c269ceca216023320d409c906e..9de15b08cfaf2981f65ef369b1c60fe8dee4a822 100644 (file)
--- 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 "libsmb/clidgram.h"
 #include "ads.h"
 #include "secrets.h"

+#include "../libcli/security/security.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c
index b1910b62c98240699db72e26faedd151f1262cb3..6bbd0ffd9d134bd7dc6206d6d3bea2d97ad13a13 100644 (file)
--- 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 "includes.h"
 #include "winbindd.h"
 #include "../libcli/auth/libcli_auth.h"

+#include "../libcli/security/security.h"

 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 5dfd123b7cbf5557f92e9226172e26f1ef031aa2..5058788e784057fa8395e10ae76f063e24fc5ce6 100644 (file)
--- 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 "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
 
 #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 4c6fb97e7092852aafeda7a7b42b5cdb1bd22fef..b661fb37e44b4f5b82881b7461a6a254ca3db9c3 100644 (file)
--- 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 "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)
 {
 
 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 055de17f91a73b982a87b1ca8c0074f8ee8f4d74..efea3fd2b362f9958d66d7c0b666504b92c00e9c 100644 (file)
--- a/source3/winbindd/winbindd_getpwsid.c
+++ b/source3/winbindd/winbindd_getpwsid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_getpwsid_state {
        struct dom_sid sid;
 
 struct winbindd_getpwsid_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c
index 5fcb8922ce4b8ab4e27a8b5a968b34c79b79df1c..f01dac9c4ce9cd3ab1f2fd29184577231d12cc7b 100644 (file)
--- a/source3/winbindd/winbindd_getsidaliases.c
+++ b/source3/winbindd/winbindd_getsidaliases.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_getsidaliases_state {
        struct dom_sid sid;
 
 struct winbindd_getsidaliases_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/winbindd_getuserdomgroups.c b/source3/winbindd/winbindd_getuserdomgroups.c
index 0bba0248624071785c7f80f935b273f909d23cc1..9fdff4fc66f8939f7a5c751a140b197da67c9954 100644 (file)
--- a/source3/winbindd/winbindd_getuserdomgroups.c
+++ b/source3/winbindd/winbindd_getuserdomgroups.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_getuserdomgroups_state {
        struct dom_sid sid;
 
 struct winbindd_getuserdomgroups_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/winbindd_getusersids.c b/source3/winbindd/winbindd_getusersids.c
index 257b7e4847884995c05003228cb09b5510374f48..157c2ab644bc8a41bc1517539a1ab5720e336b07 100644 (file)
--- a/source3/winbindd/winbindd_getusersids.c
+++ b/source3/winbindd/winbindd_getusersids.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_getusersids_state {
        struct dom_sid sid;
 
 struct winbindd_getusersids_state {
        struct dom_sid sid;

diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c
index 0889cffc8d8623fa3645cbbb1c595083441b6197..20ba79ee16f317b08e55179dd63c611403605ef0 100644 (file)
--- 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 "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;
 
 struct winbindd_lookuprids_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_lookupsid.c b/source3/winbindd/winbindd_lookupsid.c
index 6f4ae4d0c7a73882451ec484a629ca0309333cfe..596699f4f121f6051dbcb6f20e80f5e95d35860d 100644 (file)
--- a/source3/winbindd/winbindd_lookupsid.c
+++ b/source3/winbindd/winbindd_lookupsid.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
 
 #include "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_lookupsid_state {
        struct tevent_context *ev;
 
 struct winbindd_lookupsid_state {
        struct tevent_context *ev;

diff --git a/source3/winbindd/winbindd_msrpc.c b/source3/winbindd/winbindd_msrpc.c
index 500c279ff3452e2816e17ea930b991b0dba182c8..8b2e55084d08917eb6013f32c791a248d578504e 100644 (file)
--- 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 "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
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 968ffcd9ca39a366b62561593b30d3b2fc4a7c62..6850b75d445bc7b46aee3e3e9448a050d6c225bb 100644 (file)
--- 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 "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"
 
 #include "ads.h"
 #include "../librpc/gen_ndr/krb5pac.h"
 

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 0a643f5644d04d1d62b952d3788f30b2e8ac9546..88b19962582e329260931dcabe73b66894286d00 100644 (file)
--- 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 "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,
 
 /* 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 455d4941d7fd0e61284e77bbe818a5e294848f05..c7528d1c66f8064b76830dd23bd416b68bd8adf7 100644 (file)
--- 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 "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
 
 #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 1e712cfbee0c098303c098507f3fb1bc5b636eda..b0b0e6e211e489de9b6b2985b6912327de490a4d 100644 (file)
--- 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 "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_sid_to_gid_state {
        struct dom_sid sid;
 
 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 43cb43255b20c4a8a1b79c21c404dfd197a705f0..bf2824f9d8dbbf7ff18ccc2f0ae81453b0492038 100644 (file)
--- 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 "includes.h"
 #include "winbindd.h"

+#include "../libcli/security/security.h"

 
 struct winbindd_sid_to_uid_state {
        struct dom_sid sid;
 
 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 14be0e26fa2ccec9e2e4e3fbada1d74029ad8c8a..aec4cc60a2dfc0d0930a06281a426e8d72b367d8 100644 (file)
--- 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 "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
 
 #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 42245ce49112a9139f9d44f9bfbc92856899e1ab..7faa9359db8da4eefb1b297271addf3dac2fc3e6 100644 (file)
--- 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 "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"
 
 /*
 #include "lib/samba3/samba3.h"
 
 /*

diff --git a/source4/lib/policy/gp_ldap.c b/source4/lib/policy/gp_ldap.c
index d612cf87699e07fbd8ac71bf52fc6ef5a0d54e10..bbb2eec4e96e9e1f0885b612fb10375295594896 100644 (file)
--- 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/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"
 #include "libcli/ldap/ldap_ndr.h"
 #include "../lib/talloc/talloc.h"
 #include "lib/policy/policy.h"