diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
| commit | 08259c1c52a9921de6fba08939130698b474f382 (patch) | |
| tree | 2e563ba2d2dd10d34965f0de5b2c56118065d0f1 /source3/lib | |
| parent | 2dc045007ef68bc42822471a3a08c8f094e29980 (diff) | |
| download | samba-08259c1c52a9921de6fba08939130698b474f382.tar.gz samba-08259c1c52a9921de6fba08939130698b474f382.tar.bz2 samba-08259c1c52a9921de6fba08939130698b474f382.zip | |
Add iconv_convenience argument to size functions.
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/secace.c | 4 | ||||
| -rw-r--r-- | source3/lib/secdesc.c | 4 | ||||
| -rw-r--r-- | source3/lib/sharesec.c | 2 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/secace.c b/source3/lib/secace.c index 9f5a0c02ba..878fac252b 100644 --- a/source3/lib/secace.c +++ b/source3/lib/secace.c @@ -59,7 +59,7 @@ void init_sec_ace(SEC_ACE *t, const DOM_SID *sid, enum security_ace_type type, { t->type = type; t->flags = flag; - t->size = ndr_size_dom_sid(sid, 0) + 8; + t->size = ndr_size_dom_sid(sid, NULL, 0) + 8; t->access_mask = mask; ZERO_STRUCTP(&t->trustee); @@ -86,7 +86,7 @@ NTSTATUS sec_ace_add_sid(TALLOC_CTX *ctx, SEC_ACE **pp_new, SEC_ACE *old, unsign (*pp_new)[i].type = SEC_ACE_TYPE_ACCESS_ALLOWED; (*pp_new)[i].flags = 0; - (*pp_new)[i].size = SEC_ACE_HEADER_SIZE + ndr_size_dom_sid(sid, 0); + (*pp_new)[i].size = SEC_ACE_HEADER_SIZE + ndr_size_dom_sid(sid, NULL, 0); (*pp_new)[i].access_mask = mask; sid_copy(&(*pp_new)[i].trustee, sid); return NT_STATUS_OK; diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index 400f5f31b0..232bbca43c 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -233,11 +233,11 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx, } if (dst->owner_sid != NULL) { - offset += ndr_size_dom_sid(dst->owner_sid, 0); + offset += ndr_size_dom_sid(dst->owner_sid, NULL, 0); } if (dst->group_sid != NULL) { - offset += ndr_size_dom_sid(dst->group_sid, 0); + offset += ndr_size_dom_sid(dst->group_sid, NULL, 0); } *sd_size = (size_t)offset; diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index 3866ff083f..a1d30f1d2b 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -190,7 +190,7 @@ SEC_DESC *get_share_security( TALLOC_CTX *ctx, const char *servicename, } if (psd) - *psize = ndr_size_security_descriptor(psd, 0); + *psize = ndr_size_security_descriptor(psd, NULL, 0); return psd; } diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index f656bb13dc..97284afae7 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -382,7 +382,7 @@ bool sid_linearize(char *outbuf, size_t len, const DOM_SID *sid) { size_t i; - if (len < ndr_size_dom_sid(sid, 0)) + if (len < ndr_size_dom_sid(sid, NULL, 0)) return False; SCVAL(outbuf,0,sid->sid_rev_num); @@ -523,7 +523,7 @@ bool non_mappable_sid(DOM_SID *sid) char *sid_binstring(const DOM_SID *sid) { char *buf, *s; - int len = ndr_size_dom_sid(sid, 0); + int len = ndr_size_dom_sid(sid, NULL, 0); buf = (char *)SMB_MALLOC(len); if (!buf) return NULL; @@ -541,7 +541,7 @@ char *sid_binstring(const DOM_SID *sid) char *sid_binstring_hex(const DOM_SID *sid) { char *buf, *s; - int len = ndr_size_dom_sid(sid, 0); + int len = ndr_size_dom_sid(sid, NULL, 0); buf = (char *)SMB_MALLOC(len); if (!buf) return NULL; |