summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-02-26 18:32:21 +0100
committerMichael Adam <obnox@samba.org>2010-03-03 09:16:34 +0100
commit15b60a7e3f7d106af6dd7e83e820629401e6f9c1 (patch)
treed89d4aa8775f54d080d23a280cee5bf0de448b76
parent5338e42182ee34f20fde104006a752662099af22 (diff)
downloadsamba-15b60a7e3f7d106af6dd7e83e820629401e6f9c1.tar.gz
samba-15b60a7e3f7d106af6dd7e83e820629401e6f9c1.tar.bz2
samba-15b60a7e3f7d106af6dd7e83e820629401e6f9c1.zip
s4:move the sddl code down to the top level
Michael
-rw-r--r--libcli/security/config.mk2
-rw-r--r--libcli/security/sddl.c (renamed from source4/libcli/security/sddl.c)0
-rw-r--r--libcli/security/sddl.h32
-rw-r--r--source4/libcli/security/config.mk2
-rw-r--r--source4/libcli/security/security.h1
5 files changed, 35 insertions, 2 deletions
diff --git a/libcli/security/config.mk b/libcli/security/config.mk
index 060429bd67..2a0ce0510f 100644
--- a/libcli/security/config.mk
+++ b/libcli/security/config.mk
@@ -2,4 +2,4 @@
PRIVATE_DEPENDENCIES = TALLOC
LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \
- dom_sid.o display_sec.o secace.o secacl.o security_descriptor.o)
+ dom_sid.o display_sec.o secace.o secacl.o security_descriptor.o sddl.o)
diff --git a/source4/libcli/security/sddl.c b/libcli/security/sddl.c
index c4f8c5667b..c4f8c5667b 100644
--- a/source4/libcli/security/sddl.c
+++ b/libcli/security/sddl.c
diff --git a/libcli/security/sddl.h b/libcli/security/sddl.h
new file mode 100644
index 0000000000..e8bc25a619
--- /dev/null
+++ b/libcli/security/sddl.h
@@ -0,0 +1,32 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba utility functions
+
+ Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
+
+ 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 __SDDL_H__
+#define __SDDL_H__
+
+#include "librpc/gen_ndr/security.h"
+
+struct security_descriptor *sddl_decode(TALLOC_CTX *mem_ctx, const char *sddl,
+ const struct dom_sid *domain_sid);
+char *sddl_encode(TALLOC_CTX *mem_ctx, const struct security_descriptor *sd,
+ const struct dom_sid *domain_sid);
+
+
+#endif /* __SDDL_H__ */
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index f1ca20a2e8..21de2ae246 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -2,7 +2,7 @@
PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON
LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \
- security_token.o access_check.o privilege.o sddl.o \
+ security_token.o access_check.o privilege.o \
create_descriptor.o object_tree.o)
$(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c)))
diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
index bdf473bcf1..2870c4122b 100644
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -42,3 +42,4 @@ struct object_tree {
#include "libcli/security/secacl.h"
#include "libcli/security/proto.h"
#include "libcli/security/security_descriptor.h"
+#include "libcli/security/sddl.h"