From 08259c1c52a9921de6fba08939130698b474f382 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 1 Jan 2009 04:45:33 +0100 Subject: Add iconv_convenience argument to size functions. --- source3/smbd/nttrans.c | 2 +- source3/smbd/trans2.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/smbd') diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 9bfc566410..b17aec80fa 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1655,7 +1655,7 @@ static void call_nt_transact_query_security_desc(connection_struct *conn, security_info_wanted & DACL_SECURITY_INFORMATION) psd->type |= SEC_DESC_DACL_PRESENT; - sd_size = ndr_size_security_descriptor(psd, 0); + sd_size = ndr_size_security_descriptor(psd, NULL, 0); DEBUG(3,("call_nt_transact_query_security_desc: sd_size = %lu.\n",(unsigned long)sd_size)); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 5abfffd618..390b166f5f 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3071,6 +3071,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned i < conn->server_info->ptok->num_sids; ++i) { sid_bytes += ndr_size_dom_sid( &conn->server_info->ptok->user_sids[i], + NULL, 0); } @@ -3093,6 +3094,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned i < conn->server_info->ptok->num_sids; ++i) { int sid_len = ndr_size_dom_sid( &conn->server_info->ptok->user_sids[i], + NULL, 0); sid_linearize(pdata + data_len, sid_len, -- cgit