mirror of
https://github.com/samba-team/samba.git
synced 2025-12-16 00:23:52 +03:00
s3: Remove use of iconv_convenience.
This commit is contained in:
@@ -77,7 +77,7 @@ static NTSTATUS parse_acl_blob(const DATA_BLOB *pblob,
|
||||
enum ndr_err_code ndr_err;
|
||||
size_t sd_size;
|
||||
|
||||
ndr_err = ndr_pull_struct_blob(pblob, ctx, NULL, &xacl,
|
||||
ndr_err = ndr_pull_struct_blob(pblob, ctx, &xacl,
|
||||
(ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
|
||||
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
|
||||
@@ -144,7 +144,7 @@ static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
|
||||
memcpy(&xacl.info.sd_hs3->hash[0], hash, XATTR_SD_HASH_SIZE);
|
||||
|
||||
ndr_err = ndr_push_struct_blob(
|
||||
pblob, ctx, NULL, &xacl,
|
||||
pblob, ctx, &xacl,
|
||||
(ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
|
||||
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
|
||||
|
||||
@@ -47,8 +47,7 @@ static NTSTATUS xattr_tdb_pull_attrs(TALLOC_CTX *mem_ctx,
|
||||
|
||||
blob = data_blob_const(data->dptr, data->dsize);
|
||||
|
||||
ndr_err = ndr_pull_struct_blob(
|
||||
&blob, result, NULL, result,
|
||||
ndr_err = ndr_pull_struct_blob(&blob, result, result,
|
||||
(ndr_pull_flags_fn_t)ndr_pull_tdb_xattrs);
|
||||
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
|
||||
@@ -73,8 +72,7 @@ static NTSTATUS xattr_tdb_push_attrs(TALLOC_CTX *mem_ctx,
|
||||
DATA_BLOB blob;
|
||||
enum ndr_err_code ndr_err;
|
||||
|
||||
ndr_err = ndr_push_struct_blob(
|
||||
&blob, mem_ctx, NULL, attribs,
|
||||
ndr_err = ndr_push_struct_blob(&blob, mem_ctx, attribs,
|
||||
(ndr_push_flags_fn_t)ndr_push_tdb_xattrs);
|
||||
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
|
||||
|
||||
Reference in New Issue
Block a user