git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f88ab17
)
Move setting of psd->dacl->revision and protect against null SD's.
author
Jeremy Allison
<jra@samba.org>
Tue, 9 Oct 2012 19:45:30 +0000
(12:45 -0700)
committer
Jeremy Allison
<jra@samba.org>
Tue, 9 Oct 2012 19:45:30 +0000
(12:45 -0700)
source3/rpc_server/srvsvc/srv_srvsvc_nt.c
patch
|
blob
|
history
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);