summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-04-26 17:38:56 +0200
committerGünther Deschner <gd@samba.org>2010-05-04 19:37:39 +0200
commit6683b0d4b6908e54af501701bd20a12990e3e77f (patch)
treeede58e0b757a8d517e89c0d785fdf2fcdc994fe1 /source3/include
parentefb1aea909fc088cc08b6d892d7dd1031fb79fdf (diff)
downloadsamba-6683b0d4b6908e54af501701bd20a12990e3e77f.tar.gz
samba-6683b0d4b6908e54af501701bd20a12990e3e77f.tar.xz
samba-6683b0d4b6908e54af501701bd20a12990e3e77f.zip
s3-lib: Create a sec_desc_merge and sec_desc_merge_buf function.
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index dabfa15257..2c5b7105a1 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -693,7 +693,8 @@ ssize_t drain_socket(int sockfd, size_t count);
/* The following definitions come from lib/secdesc.c */
uint32_t get_sec_info(const SEC_DESC *sd);
-SEC_DESC_BUF *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BUF *old_sdb);
+SEC_DESC *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC *new_sdb, SEC_DESC *old_sdb);
+SEC_DESC_BUF *sec_desc_merge_buf(TALLOC_CTX *ctx, SEC_DESC_BUF *new_sdb, SEC_DESC_BUF *old_sdb);
SEC_DESC *make_sec_desc(TALLOC_CTX *ctx,
enum security_descriptor_revision revision,
uint16 type,