s4:move the sddl code down to the top level

Michael
(cherry picked from commit 8a8e4a620636b098ae56f46be6112d9e68b1c665)

diff --git a/libcli/security/config.mk b/libcli/security/config.mk
index 56d8e138ff1c15a4fb8bfc3150c01b2ba563d66e..501857c6323852d9998dcc59bc9de8e0cc9a616d 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/, \
-                                       dom_sid.o)
+                                       dom_sid.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 d6d9ad5545e19764e7f5b3c9c2e45682794dceb2..c1d51d590f61627189c27a31474afe9612e04095 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -3,7 +3,7 @@ PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON
 
 LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \
                                           security_token.o security_descriptor.o \
-                                          access_check.o privilege.o sddl.o) \
+                                          access_check.o privilege.o) \
                                           ../libcli/security/secace.o \
                                           ../libcli/security/secacl.o
 

diff --git a/source4/libcli/security/security.h b/source4/libcli/security/security.h
index 2608c9f7ed2c927b9bc09eab4146b34f82539134..b7b25f9efe4df901a47cb9d79a4f0546f03b7072 100644 (file)
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -33,3 +33,4 @@ struct auth_session_info;
 #include "libcli/security/secace.h"
 #include "libcli/security/secacl.h"
 #include "libcli/security/proto.h"
+#include "libcli/security/sddl.h"