diff options
| author | Volker Lendecke <vl@samba.org> | 2007-12-29 23:00:49 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2007-12-29 23:13:26 +0100 |
| commit | 7cbdb48475b0340154fad60cb4b7cc53dc2bbcfd (patch) | |
| tree | c46834dc96c1bd189ab4e37d9afe38a309d14abb /source3/lib | |
| parent | 7be5525792a2f4aa19c308afb516ef1fe02b7be2 (diff) | |
| download | samba-7cbdb48475b0340154fad60cb4b7cc53dc2bbcfd.tar.gz samba-7cbdb48475b0340154fad60cb4b7cc53dc2bbcfd.tar.bz2 samba-7cbdb48475b0340154fad60cb4b7cc53dc2bbcfd.zip | |
Remove tiny code duplication
ndr_size_security_descriptor does the same as sec_desc_size
(This used to be commit bc3bd7a8e7c6e9e27acb195c86abb92c0f53112f)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/secdesc.c | 29 | ||||
| -rw-r--r-- | source3/lib/sharesec.c | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 5e5042e521..44ae23271e 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -32,35 +32,6 @@ const struct generic_mapping file_generic_mapping = { }; /******************************************************************* - Works out the linearization size of a SEC_DESC. -********************************************************************/ - -size_t sec_desc_size(SEC_DESC *psd) -{ - size_t offset; - - if (!psd) return 0; - - offset = SEC_DESC_HEADER_SIZE; - - /* don't align */ - - if (psd->owner_sid != NULL) - offset += ndr_size_dom_sid(psd->owner_sid, 0); - - if (psd->group_sid != NULL) - offset += ndr_size_dom_sid(psd->group_sid, 0); - - if (psd->sacl != NULL) - offset += psd->sacl->size; - - if (psd->dacl != NULL) - offset += psd->dacl->size; - - return offset; -} - -/******************************************************************* Compares two SEC_DESC structures ********************************************************************/ diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index 0027a8813a..ba025dacc1 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -144,7 +144,7 @@ SEC_DESC *get_share_security( TALLOC_CTX *ctx, const char *servicename, } if (psd) - *psize = sec_desc_size(psd); + *psize = ndr_size_security_descriptor(psd, 0); return psd; } |