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/rpc_parse | |
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/rpc_parse')
-rw-r--r-- | source3/rpc_parse/parse_buffer.c | 2 | ||||
-rw-r--r-- | source3/rpc_parse/parse_sec.c | 6 | ||||
-rw-r--r-- | source3/rpc_parse/parse_spoolss.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_parse/parse_buffer.c b/source3/rpc_parse/parse_buffer.c index 63a73c4b7c..b5177cc634 100644 --- a/source3/rpc_parse/parse_buffer.c +++ b/source3/rpc_parse/parse_buffer.c @@ -439,7 +439,7 @@ bool smb_io_relsecdesc(const char *desc, RPC_BUFFER *buffer, int depth, SEC_DESC } if (*secdesc != NULL) { - buffer->string_at_end -= ndr_size_security_descriptor(*secdesc, 0); + buffer->string_at_end -= ndr_size_security_descriptor(*secdesc, NULL, 0); if(!prs_set_offset(ps, buffer->string_at_end)) return False; diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index c71b31086a..23c9610381 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -275,14 +275,14 @@ bool sec_io_desc(const char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth) if (psd->owner_sid != NULL) { off_owner_sid = offset; - offset += ndr_size_dom_sid(psd->owner_sid, 0); + offset += ndr_size_dom_sid(psd->owner_sid, NULL, 0); } else { off_owner_sid = 0; } if (psd->group_sid != NULL) { off_grp_sid = offset; - offset += ndr_size_dom_sid(psd->group_sid, 0); + offset += ndr_size_dom_sid(psd->group_sid, NULL, 0); } else { off_grp_sid = 0; } @@ -410,7 +410,7 @@ bool sec_io_desc_buf(const char *desc, SEC_DESC_BUF **ppsdb, prs_struct *ps, int if(!prs_uint32 ("ptr ", ps, depth, &ptr)) return False; - len = ndr_size_security_descriptor(psdb->sd, 0); + len = ndr_size_security_descriptor(psdb->sd, NULL, 0); if(!prs_uint32_pre("len ", ps, depth, &len, &off_len)) return False; diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c index 78a80a019b..3fe0c3a416 100644 --- a/source3/rpc_parse/parse_spoolss.c +++ b/source3/rpc_parse/parse_spoolss.c @@ -3103,7 +3103,7 @@ uint32 spoolss_size_printer_info_2(PRINTER_INFO_2 *info) size += 4; - size += ndr_size_security_descriptor( info->secdesc, 0 ); + size += ndr_size_security_descriptor( info->secdesc, NULL, 0 ); size+=size_of_device_mode( info->devmode ); @@ -3190,7 +3190,7 @@ return the size required by a struct in the stream uint32 spoolss_size_printer_info_3(PRINTER_INFO_3 *info) { /* The 8 is for the self relative pointer - 8 byte aligned.. */ - return 8 + (uint32)ndr_size_security_descriptor( info->secdesc, 0 ); + return 8 + (uint32)ndr_size_security_descriptor( info->secdesc, NULL, 0 ); } /******************************************************************* |