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/printing/nt_printing.c | |
| 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/printing/nt_printing.c')
| -rw-r--r-- | source3/printing/nt_printing.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 3a81f27ad6..ac3817b94a 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -435,7 +435,7 @@ static int sec_desc_upg_fn( TDB_CONTEXT *the_tdb, TDB_DATA key, /* store it back */ - sd_size = ndr_size_security_descriptor(sd_store->sd, 0) + sd_size = ndr_size_security_descriptor(sd_store->sd, NULL, 0) + sizeof(SEC_DESC_BUF); if ( !prs_init(&ps, sd_size, ctx, MARSHALL) ) { DEBUG(0,("sec_desc_upg_fn: Failed to allocate prs memory for %s\n", key.dptr )); @@ -5477,7 +5477,8 @@ WERROR nt_printing_setsec(const char *sharename, SEC_DESC_BUF *secdesc_ctr) /* Store the security descriptor in a tdb */ if (!prs_init(&ps, - (uint32)ndr_size_security_descriptor(new_secdesc_ctr->sd, 0) + (uint32_t)ndr_size_security_descriptor(new_secdesc_ctr->sd, + NULL, 0) + sizeof(SEC_DESC_BUF), mem_ctx, MARSHALL) ) { status = WERR_NOMEM; goto out; @@ -5630,7 +5631,7 @@ bool nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, SEC_DESC_BUF **s /* Save default security descriptor for later */ - if (!prs_init(&ps, (uint32)ndr_size_security_descriptor((*secdesc_ctr)->sd, 0) + + if (!prs_init(&ps, (uint32_t)ndr_size_security_descriptor((*secdesc_ctr)->sd, NULL, 0) + sizeof(SEC_DESC_BUF), ctx, MARSHALL)) return False; |