summaryrefslogtreecommitdiffstats
path: root/source/registry/regfio.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-29 23:00:49 +0100
committerVolker Lendecke <vl@samba.org>2007-12-29 23:13:26 +0100
commitbc3bd7a8e7c6e9e27acb195c86abb92c0f53112f (patch)
treecfeaaa4c67d7005aeee58cf257fffb56b290a75b /source/registry/regfio.c
parent387936ec3952f88d46df2d4943bbc4e408ad2bb5 (diff)
downloadsamba-bc3bd7a8e7c6e9e27acb195c86abb92c0f53112f.tar.gz
samba-bc3bd7a8e7c6e9e27acb195c86abb92c0f53112f.tar.xz
samba-bc3bd7a8e7c6e9e27acb195c86abb92c0f53112f.zip
Remove tiny code duplication
ndr_size_security_descriptor does the same as sec_desc_size
Diffstat (limited to 'source/registry/regfio.c')
-rw-r--r--source/registry/regfio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/registry/regfio.c b/source/registry/regfio.c
index 22700e64817..92077aa8478 100644
--- a/source/registry/regfio.c
+++ b/source/registry/regfio.c
@@ -1554,7 +1554,7 @@ static uint32 sk_record_data_size( SEC_DESC * sd )
/* the record size is sizeof(hdr) + name + static members + data_size_field */
- size = sizeof(uint32)*5 + sec_desc_size( sd ) + sizeof(uint32);
+ size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, 0) + sizeof(uint32);
/* multiple of 8 */
size_mod8 = size & 0xfffffff8;
@@ -1784,7 +1784,8 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 )
nk->sec_desc->ref_count = 0;
/* size value must be self-inclusive */
- nk->sec_desc->size = sec_desc_size(sec_desc) + sizeof(uint32);
+ nk->sec_desc->size = ndr_size_security_descriptor(sec_desc, 0)
+ + sizeof(uint32);
DLIST_ADD_END( file->sec_desc_list, nk->sec_desc, REGF_SK_REC *);