s4:move the sddl code down to the top level

Michael

diff --git a/libcli/security/config.mk b/libcli/security/config.mk
index 060429bd67a76fc781f7f4f28c61dbf6de5d7860..2a0ce0510faabb77c2e7b692a18d6e882dae96d9 100644 (file)
--- a/libcli/security/config.mk
+++ b/libcli/security/config.mk
@@ -2,4 +2,4 @@
 PRIVATE_DEPENDENCIES = TALLOC
 
 LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \
 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
similarity index 100%
rename from source4/libcli/security/sddl.c
rename to libcli/security/sddl.c

diff --git a/libcli/security/sddl.h b/libcli/security/sddl.h
new file mode 100644 (file)
index 0000000..e8bc25a
--- /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 f1ca20a2e8c9b77448ddbcac7182d1fbf795ea40..21de2ae246e9834da34ba8c6bb465d3830c234a7 100644 (file)
--- 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/, \
 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)))
                                                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 bdf473bcf1f848fb7ba6d0083c00ff3e42b5dca8..2870c4122b036fa7ac7bd6c1178a8841043c0850 100644 (file)
--- 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/secacl.h"
 #include "libcli/security/proto.h"
 #include "libcli/security/security_descriptor.h"

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