Move setting of psd->dacl->revision and protect against null SD's.

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 2d34b9b4d1ce901fcd3980852b7662280df876dc..1d976e1e87d5cc7b39e5ff195da1c5a97d2b1ba2 100644 (file)
--- 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);