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

15 files changed, 15 insertions, 1 deletions

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index cd8d6a26e8..b49b89396c 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 /*
    This module implements directory related functions for Samba.
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index 1d1776218e..28d028fcb1 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 #undef  DBGC_CLASS
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 19a22e2b1e..7275868ffa 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 #define VALID_FNUM(fnum)   (((fnum) >= 0) && ((fnum) < real_max_open_files))
 
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 2b01e89d6c..e5527a5812 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -39,6 +39,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "rpc_client/init_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "../libcli/security/security.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 017703ee97..3a9f6813ec 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d3953319fe..77f33b1cb3 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -24,6 +24,7 @@
 #include "smbd/globals.h"
 #include "fake_file.h"
 #include "librpc/gen_ndr/messaging.h"
+#include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
 
 extern const struct generic_mapping file_generic_mapping;
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index dfe8756a19..9f31abe569 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -27,6 +27,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "libcli/security/security.h"
 
 #define	PIPE		"\\PIPE\\"
 #define	PIPELEN		strlen(PIPE)
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 9713ec0b30..fa715fb673 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../libcli/security/dom_sid.h"
+#include "../libcli/security/security.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c84c077d58..5af5dacc9b 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -32,6 +32,7 @@
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "libcli/security/security.h"
 
 /****************************************************************************
  Ensure we check the path in *exactly* the same way as W2K for a findfirst/findnext
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index 675ae2b0d5..ab68cb783e 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/security.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/smbd/share_access.c b/source3/smbd/share_access.c
index 72e7abe66a..387d988a4d 100644
--- a/source3/smbd/share_access.c
+++ b/source3/smbd/share_access.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "smbd/globals.h"
+#include "../libcli/security/security.h"
 
 /*
  * No prefix means direct username
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 7f3bc35616..b1866d1481 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "libcli/security/security.h"
 
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 					      struct tevent_context *ev,
diff --git a/source3/smbd/smb2_tcon.c b/source3/smbd/smb2_tcon.c
index 8f80a56a42..1cfb4ceaa6 100644
--- a/source3/smbd/smb2_tcon.c
+++ b/source3/smbd/smb2_tcon.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
+#include "../libcli/security/security.h"
 
 static NTSTATUS smbd_smb2_tree_connect(struct smbd_smb2_request *req,
 				       const char *in_path,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ac6f8cd9e3..7ca5f5057a 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -29,6 +29,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/xattr.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
 
 #define DIR_ENTRY_SAFETY_MARGIN 4096
 
diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c
index c52a819ba3..2b16d05b7c 100644
--- a/source3/smbd/uid.c
+++ b/source3/smbd/uid.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "libcli/security/security.h"
 
 /* what user is current? */
 extern struct current_user current_user;