diff options
| -rw-r--r-- | source4/libcli/raw/rawfileinfo.c | 21 | ||||
| -rw-r--r-- | source4/libcli/raw/rawsetfileinfo.c | 14 |
2 files changed, 22 insertions, 13 deletions
diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c index b33d0df828..67cad83c6d 100644 --- a/source4/libcli/raw/rawfileinfo.c +++ b/source4/libcli/raw/rawfileinfo.c @@ -244,20 +244,17 @@ NTSTATUS smb_raw_fileinfo_passthru_parse(const DATA_BLOB *blob, TALLOC_CTX *mem_ return NT_STATUS_OK; case RAW_FILEINFO_SEC_DESC: { - struct ndr_pull *ndr; NTSTATUS status; - ndr = ndr_pull_init_blob(blob, mem_ctx); - if (!ndr) { - return NT_STATUS_NO_MEMORY; - } + parms->query_secdesc.out.sd = talloc(mem_ctx, struct security_descriptor); - if (parms->query_secdesc.out.sd == NULL) { - return NT_STATUS_NO_MEMORY; - } - status = ndr_pull_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS, - parms->query_secdesc.out.sd); - talloc_free(ndr); - return status; + NT_STATUS_HAVE_NO_MEMORY(parms->query_secdesc.out.sd); + + status = ndr_pull_struct_blob(blob, mem_ctx, + parms->query_secdesc.out.sd, + (ndr_pull_flags_fn_t)ndr_pull_security_descriptor); + NT_STATUS_NOT_OK_RETURN(status); + + return NT_STATUS_OK; } default: diff --git a/source4/libcli/raw/rawsetfileinfo.c b/source4/libcli/raw/rawsetfileinfo.c index 030779ad14..0daf14e0cc 100644 --- a/source4/libcli/raw/rawsetfileinfo.c +++ b/source4/libcli/raw/rawsetfileinfo.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "librpc/gen_ndr/ndr_security.h" /* @@ -83,7 +84,18 @@ BOOL smb_raw_setfileinfo_passthru(TALLOC_CTX *mem_ctx, NEED_BLOB(4); SIVAL(blob->data, 0, parms->mode_information.in.mode); return True; - + + case RAW_FILEINFO_SEC_DESC: { + NTSTATUS status; + + status = ndr_push_struct_blob(blob, mem_ctx, + parms->set_secdesc.in.sd, + (ndr_push_flags_fn_t)ndr_push_security_descriptor); + if (!NT_STATUS_IS_OK(status)) return False; + + return True; + } + /* Unhandled levels */ case RAW_SFILEINFO_1023: case RAW_SFILEINFO_1025: |