Move the security_descriptor utility code to the top-level.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 21 Apr 2009 12:27:25 +0000 (14:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 21 Apr 2009 13:14:35 +0000 (15:14 +0200)
libcli/security/config.mk
libcli/security/security_descriptor.c [moved from source4/libcli/security/security_descriptor.c with 100% similarity]
libcli/security/security_descriptor.h [new file with mode: 0644]
source3/Makefile.in
source3/include/includes.h
source4/libcli/security/config.mk
source4/libcli/security/security.h

index 7ade015..060429b 100644 (file)
@@ -2,4 +2,4 @@
 PRIVATE_DEPENDENCIES = TALLOC
 
 LIBSECURITY_COMMON_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/security/, \
-                                       dom_sid.o display_sec.o secace.o secacl.o)
+                                       dom_sid.o display_sec.o secace.o secacl.o security_descriptor.o)
diff --git a/libcli/security/security_descriptor.h b/libcli/security/security_descriptor.h
new file mode 100644 (file)
index 0000000..c535f5d
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+   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 __SECURITY_DESCRIPTOR_H__
+#define __SECURITY_DESCRIPTOR_H__
+
+#include "librpc/gen_ndr/security.h"
+
+struct security_descriptor *security_descriptor_initialise(TALLOC_CTX *mem_ctx);
+struct security_descriptor *security_descriptor_copy(TALLOC_CTX *mem_ctx, 
+                                                    const struct security_descriptor *osd);
+NTSTATUS security_descriptor_sacl_add(struct security_descriptor *sd,
+                                     const struct security_ace *ace);
+NTSTATUS security_descriptor_dacl_add(struct security_descriptor *sd,
+                                     const struct security_ace *ace);
+NTSTATUS security_descriptor_dacl_del(struct security_descriptor *sd,
+                                     const struct dom_sid *trustee);
+NTSTATUS security_descriptor_sacl_del(struct security_descriptor *sd,
+                                     const struct dom_sid *trustee);
+bool security_ace_equal(const struct security_ace *ace1, 
+                       const struct security_ace *ace2);
+bool security_acl_equal(const struct security_acl *acl1, 
+                       const struct security_acl *acl2);
+bool security_descriptor_equal(const struct security_descriptor *sd1, 
+                              const struct security_descriptor *sd2);
+bool security_descriptor_mask_equal(const struct security_descriptor *sd1, 
+                                   const struct security_descriptor *sd2, 
+                                   uint32_t mask);
+struct security_descriptor *security_descriptor_append(struct security_descriptor *sd,
+                                                      ...);
+struct security_descriptor *security_descriptor_dacl_create(TALLOC_CTX *mem_ctx,
+                                                           uint16_t sd_type,
+                                                           const char *owner_sid,
+                                                           const char *group_sid,
+                                                           ...);
+struct security_descriptor *security_descriptor_sacl_create(TALLOC_CTX *mem_ctx,
+                                                           uint16_t sd_type,
+                                                           const char *owner_sid,
+                                                           const char *group_sid,
+                                                           ...);
+struct security_ace *security_ace_create(TALLOC_CTX *mem_ctx,
+                                        const char *sid_str,
+                                        enum security_ace_type type,
+                                        uint32_t access_mask,
+                                        uint8_t flags);
+
+#endif /* __SECURITY_DESCRIPTOR_H__ */
index 51a469b..ca42d5b 100644 (file)
@@ -388,7 +388,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
          ../libcli/security/secacl.o \
          libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \
          lib/file_id.o lib/idmap_cache.o \
-         ../libcli/security/dom_sid.o
+         ../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o
 
 LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o
 LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
index 943de8d..596c772 100644 (file)
@@ -702,6 +702,7 @@ enum flush_reason_enum {
 #endif
 #include "libcli/security/secace.h"
 #include "libcli/security/secacl.h"
+#include "libcli/security/security_descriptor.h"
 
 #if defined(HAVE_POSIX_ACLS)
 #include "modules/vfs_posixacl.h"
index 9d23fe9..d08c25d 100644 (file)
@@ -2,7 +2,6 @@
 PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON
 
 LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \
-                                          security_token.o security_descriptor.o \
-                                          access_check.o privilege.o sddl.o) \
+                                          security_token.o access_check.o privilege.o sddl.o) \
 
 $(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c)))
index 2608c9f..6dbbe01 100644 (file)
@@ -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/security_descriptor.h"