From 5afabdc976d5ba1fd21dcdede85657b618fb6b76 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 9 Oct 2012 12:45:30 -0700 Subject: [PATCH] Move setting of psd->dacl->revision and protect against null SD's. --- source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 2d34b9b4d1ce..1d976e1e87d5 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -2197,6 +2197,10 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p, goto error_exit; } + if (psd && psd->dacl) { + psd->dacl->revision = NT4_ACL_REVISION; + } + sd_size = ndr_size_security_descriptor(psd, 0); sd_buf = talloc_zero(p->mem_ctx, struct sec_desc_buf); @@ -2210,8 +2214,6 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p, *r->out.sd_buf = sd_buf; - psd->dacl->revision = NT4_ACL_REVISION; - close_file(NULL, fsp, NORMAL_CLOSE); vfs_ChDir(conn, oldcwd); SMB_VFS_DISCONNECT(conn); -- 2.34.1