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/registry | |
| 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/registry')
| -rw-r--r-- | source3/registry/reg_api.c | 2 | ||||
| -rw-r--r-- | source3/registry/regfio.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 30ad3d9751..a5f3935821 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -436,7 +436,7 @@ WERROR reg_queryinfokey(struct registry_key *key, uint32_t *num_subkeys, return err; } - *secdescsize = ndr_size_security_descriptor(secdesc, 0); + *secdescsize = ndr_size_security_descriptor(secdesc, NULL, 0); TALLOC_FREE(mem_ctx); *last_changed_time = 0; diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index b6e822955c..5395f225f1 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -1553,7 +1553,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 + ndr_size_security_descriptor(sd, 0) + sizeof(uint32); + size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, NULL, 0) + sizeof(uint32); /* multiple of 8 */ size_mod8 = size & 0xfffffff8; @@ -1783,7 +1783,7 @@ 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 = ndr_size_security_descriptor(sec_desc, 0) + nk->sec_desc->size = ndr_size_security_descriptor(sec_desc, NULL, 0) + sizeof(uint32); DLIST_ADD_END( file->sec_desc_list, nk->sec_desc, REGF_SK_REC *); |