summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-11-07 22:41:12 +0100
committerStefan Metzmacher <metze@samba.org>2008-11-07 22:41:12 +0100
commitff5c58da55ae359496480e66f209d9ef3e2a05cb (patch)
tree9167ce069fc03ca026d7b9951d75433c139a40f4 /source4
parentda9f41dde201d747c50ac2f5bf7973818f168855 (diff)
downloadsamba-ff5c58da55ae359496480e66f209d9ef3e2a05cb.tar.gz
samba-ff5c58da55ae359496480e66f209d9ef3e2a05cb.tar.bz2
samba-ff5c58da55ae359496480e66f209d9ef3e2a05cb.zip
librpc/ndr: move ndr_sec_helper.c to the toplevel
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/librpc/ndr/ndr_sec_helper.c88
2 files changed, 1 insertions, 89 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 37c12d8891..f9412a6851 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -52,7 +52,7 @@ NDR_COMPRESSION_OBJ_FILES = ../librpc/ndr/ndr_compression.o
PUBLIC_DEPENDENCIES = NDR_MISC LIBSECURITY
NDR_SECURITY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_security.o \
- $(ndrsrcdir)/ndr_sec_helper.o \
+ ../librpc/ndr/ndr_sec_helper.o \
$(gen_ndrsrcdir)/ndr_dom_sid.o \
$(ndrsrcdir)/ndr_dom_sid.o
diff --git a/source4/librpc/ndr/ndr_sec_helper.c b/source4/librpc/ndr/ndr_sec_helper.c
deleted file mode 100644
index 009e3524a7..0000000000
--- a/source4/librpc/ndr/ndr_sec_helper.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- fast routines for getting the wire size of security objects
-
- Copyright (C) Andrew Tridgell 2003
- Copyright (C) Stefan Metzmacher 2006-2008
-
- 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/>.
-*/
-
-
-#include "includes.h"
-#include "librpc/gen_ndr/ndr_security.h"
-
-/*
- return the wire size of a security_ace
-*/
-size_t ndr_size_security_ace(const struct security_ace *ace, int flags)
-{
- size_t ret;
-
- if (!ace) return 0;
-
- ret = 8 + ndr_size_dom_sid(&ace->trustee, flags);
-
- switch (ace->type) {
- case SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT:
- case SEC_ACE_TYPE_ACCESS_DENIED_OBJECT:
- case SEC_ACE_TYPE_SYSTEM_AUDIT_OBJECT:
- case SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT:
- ret += 4; /* uint32 bitmap ace->object.object.flags */
- if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
- ret += 16; /* GUID ace->object.object.type.type */
- }
- if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
- ret += 16; /* GUID ace->object.object.inherited_typeinherited_type */
- }
- break;
- default:
- break;
- }
-
- return ret;
-}
-
-/*
- return the wire size of a security_acl
-*/
-size_t ndr_size_security_acl(const struct security_acl *acl, int flags)
-{
- size_t ret;
- int i;
- if (!acl) return 0;
- ret = 8;
- for (i=0;i<acl->num_aces;i++) {
- ret += ndr_size_security_ace(&acl->aces[i], flags);
- }
- return ret;
-}
-
-/*
- return the wire size of a security descriptor
-*/
-size_t ndr_size_security_descriptor(const struct security_descriptor *sd, int flags)
-{
- size_t ret;
- if (!sd) return 0;
-
- ret = 20;
- ret += ndr_size_dom_sid(sd->owner_sid, flags);
- ret += ndr_size_dom_sid(sd->group_sid, flags);
- ret += ndr_size_security_acl(sd->dacl, flags);
- ret += ndr_size_security_acl(sd->sacl, flags);
- return ret;
-}
-