From 957f9fa3ff2ba838bb1669c371da0f70ddeb2360 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 11 Oct 2012 15:08:25 +1100 Subject: [PATCH 1/1] rpc_server:srvsvc Remove psd variable that was no longer set by SMB_VFS_FGET_NT_ACL This fixes up an error introduced by c8ade07760ae0ccfdf2d875c9f3027926e62321b. Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Oct 11 07:53:36 CEST 2012 on sn-devel-104 --- source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c index 0249ef56610..1e734d89991 100644 --- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c +++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c @@ -2106,7 +2106,6 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p, struct srvsvc_NetGetFileSecurity *r) { struct smb_filename *smb_fname = NULL; - struct security_descriptor *psd = NULL; size_t sd_size; char *servicename = NULL; SMB_STRUCT_STAT st; @@ -2204,11 +2203,11 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p, goto error_exit; } - if (psd && psd->dacl) { - psd->dacl->revision = NT4_ACL_REVISION; + if (sd_buf->sd->dacl) { + sd_buf->sd->dacl->revision = NT4_ACL_REVISION; } - sd_size = ndr_size_security_descriptor(psd, 0); + sd_size = ndr_size_security_descriptor(sd_buf->sd, 0); sd_buf->sd_size = sd_size; @@ -2238,7 +2237,6 @@ error_exit: done: - TALLOC_FREE(psd); TALLOC_FREE(smb_fname); return werr; -- 2.34.1