summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-01 22:25:57 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-01 22:25:57 +0100
commit9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (patch)
tree075bfaec7798dc54db47398ab6ebfe68c85b1573 /source4
parent7ab8f373c84c328b197f923287163e83371e7ccb (diff)
parent8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e (diff)
downloadsamba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.gz
samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.bz2
samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.zip
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/security/config.mk4
-rw-r--r--source4/libcli/security/security.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index cd5b75bb81..d6d9ad5545 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -3,6 +3,8 @@ 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 sddl.o) \
+ ../libcli/security/secace.o \
+ ../libcli/security/secacl.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 517f3e8ebe..2608c9f7ed 100644
--- a/source4/libcli/security/security.h
+++ b/source4/libcli/security/security.h
@@ -30,5 +30,6 @@ struct auth_session_info;
/* 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/proto.h"