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

20 files changed, 20 insertions, 5 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 6c2fbad59a4..9585398a566 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -45,6 +45,7 @@
 #include "utils/net.h"
 #include "secrets.h"
 #include "lib/netapi/netapi.h"
+#include "../libcli/security/security.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index a07e6c56eaa..bc83a3d746d 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -34,6 +34,7 @@
 #include "smb_krb5.h"
 #include "secrets.h"
 #include "krb5_env.h"
+#include "../libcli/security/security.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 5e3b5bc61a2..5efc5aee81a 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../libcli/security/security.h"
 
 /*********************************************************
  Figure out if the input was an NT group or a SID string.
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index 268d5222c85..488132b5157 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -23,6 +23,7 @@
 #include "secrets.h"
 #include "idmap.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 
 #define ALLOC_CHECK(mem) do { \
 	if (!mem) { \
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index 3609eacdf8c..0a85da346fd 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -22,6 +22,7 @@
 #include "libads/dns.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "smb_krb5.h"
+#include "../libcli/security/security.h"
 
 int net_lookup_usage(struct net_context *c, int argc, const char **argv)
 {
diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index 634b6766c92..5f4c19d6e25 100644
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/cli_spoolss.h"
 #include "rpc_client/cli_spoolss.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 #define FORMS_PREFIX "FORMS/"
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 7c49645cfc6..d6fa4ab4188 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -36,7 +36,7 @@
 #include "secrets.h"
 #include "lib/netapi/netapi.h"
 #include "rpc_client/init_lsa.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 0396e2a601e..1e218049ede 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -24,6 +24,7 @@
 #include "nt_printing.h"
 #include "registry.h"
 #include "registry/reg_objects.h"
+#include "../libcli/security/security.h"
 
 /* support itanium as well */
 static const struct print_architecture_table_node archi_table[]= {
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 5af984ee07b..5d962dea312 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -22,6 +22,7 @@
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
 
 /********************************************************************
 ********************************************************************/
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 59c52bc2700..cf270ae1bfd 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -29,7 +29,7 @@
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
 #include "libnet/libnet_samsync.h"
 #include "libnet/libnet_dssync.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
 						      int argc,
diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 435af091e30..f98be9c7d33 100644
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -20,6 +20,7 @@
 #include "popt_common.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "../libcli/security/security.h"
 
 /*
  * Do something with the account policies. Read them all, run a function on
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index da3b9c3d004..51d49849ae1 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -22,6 +22,7 @@
 #include "utils/net.h"
 #include "../librpc/gen_ndr/samr.h"
 #include "smbldap.h"
+#include "../libcli/security/security.h"
 
 /*
  * Set a user's data
diff --git a/source3/utils/net_usershare.c b/source3/utils/net_usershare.c
index bbaf39a6e45..61b2caa606a 100644
--- a/source3/utils/net_usershare.c
+++ b/source3/utils/net_usershare.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "../libcli/security/security.h"
 
 struct {
 	const char *us_errstr;
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 11ef42cd61c..6badf940b86 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -25,6 +25,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_dssetup.h"
 #include "secrets.h"
+#include "../libcli/security/security.h"
 
 NTSTATUS net_rpc_lookup_name(struct net_context *c,
 			     TALLOC_CTX *mem_ctx, struct cli_state *cli,
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 9dff45b8f37..5482b1099e5 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "popt_common.h"
 #include "../librpc/gen_ndr/samr.h"
+#include "../libcli/security/security.h"
 
 #define BIT_BACKEND	0x00000004
 #define BIT_VERBOSE	0x00000008
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 6c6c7fdb013..50c9d534e9a 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -23,7 +23,7 @@
 #include "popt_common.h"
 #include "registry/reg_objects.h"
 #include "registry/regfio.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 /* GLOBAL VARIABLES */
 
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index decd0639134..a945fe58f6f 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "popt_common.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 static TALLOC_CTX *ctx;
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index fa039f639f3..63858ea08df 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -25,7 +25,7 @@
 #include "popt_common.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 extern bool AllowDebugChange;
 
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index f473808886c..8ee573eafcd 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "fake_file.h"
+#include "../libcli/security/security.h"
 
 static char *server;
 
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 053efab5929..ecfbf061372 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -33,6 +33,7 @@
 #include "includes.h"
 #include "popt_common.h"
 #include "dbwrap.h"
+#include "../libcli/security/security.h"
 
 #define SMB_MAXPIDS		2048
 static uid_t 		Ucrit_uid = 0;               /* added by OH */