summaryrefslogtreecommitdiff
path: root/libcli/security
diff options
context:
space:
mode:
Diffstat (limited to 'libcli/security')
-rw-r--r--libcli/security/display_sec.c4
-rw-r--r--libcli/security/sddl.c2
-rw-r--r--libcli/security/secace.c2
-rw-r--r--libcli/security/security.h48
-rw-r--r--libcli/security/security_descriptor.c3
5 files changed, 52 insertions, 7 deletions
diff --git a/libcli/security/display_sec.c b/libcli/security/display_sec.c
index 6a820673b6..f45b770f8c 100644
--- a/libcli/security/display_sec.c
+++ b/libcli/security/display_sec.c
@@ -19,9 +19,7 @@
*/
#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"
/****************************************************************************
diff --git a/libcli/security/sddl.c b/libcli/security/sddl.c
index 463a142dc3..5b605c0531 100644
--- a/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
@@ -20,7 +20,7 @@
*/
#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"
diff --git a/libcli/security/secace.c b/libcli/security/secace.c
index 5787e15110..1577550418 100644
--- 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 "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))
diff --git a/libcli/security/security.h b/libcli/security/security.h
new file mode 100644
index 0000000000..8018bee893
--- /dev/null
+++ b/libcli/security/security.h
@@ -0,0 +1,48 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Copyright (C) Stefan Metzmacher 2006
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _LIBCLI_SECURITY_SECURITY_H_
+#define _LIBCLI_SECURITY_SECURITY_H_
+
+#include "librpc/gen_ndr/security.h"
+
+#define PRIMARY_USER_SID_INDEX 0
+#define PRIMARY_GROUP_SID_INDEX 1
+
+struct object_tree {
+ uint32_t remaining_access;
+ struct GUID guid;
+ int num_of_children;
+ struct object_tree *children;
+};
+
+/* Moved the dom_sid functions to the top level dir with manual proto header */
+#include "libcli/security/dom_sid.h"
+#include "libcli/security/secace.h"
+#include "libcli/security/secacl.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
diff --git a/libcli/security/security_descriptor.c b/libcli/security/security_descriptor.c
index 4e67e0a96b..60f9de8f87 100644
--- a/libcli/security/security_descriptor.c
+++ b/libcli/security/security_descriptor.c
@@ -20,8 +20,7 @@
*/
#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)