diff options
author | Andrew Tridgell <tridge@samba.org> | 2005-04-14 13:19:40 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:33 -0500 |
commit | d9c15b0f280621fca844c0e8482b5e95f4ad2d11 (patch) | |
tree | 2b4e506c9012caece3916f1d63fd9daf7a46fd9c /source4/include/smb_interfaces.h | |
parent | fdbc094c3ebdc2464ebcdd220667348b684ce103 (diff) | |
download | samba-d9c15b0f280621fca844c0e8482b5e95f4ad2d11.tar.gz samba-d9c15b0f280621fca844c0e8482b5e95f4ad2d11.tar.bz2 samba-d9c15b0f280621fca844c0e8482b5e95f4ad2d11.zip |
r6342: fixed a bad union assumption that caused ACLs to fail on 64 bit machines
Thanks to lars and agruen for finding this
(This used to be commit 2acc06918574b1178eecf3d61026f84f85bb40e1)
Diffstat (limited to 'source4/include/smb_interfaces.h')
-rw-r--r-- | source4/include/smb_interfaces.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 370afb09ea..e91d2f7c53 100644 --- a/source4/include/smb_interfaces.h +++ b/source4/include/smb_interfaces.h @@ -677,10 +677,8 @@ union smb_fileinfo { /* RAW_FILEINFO_SEC_DESC */ struct { enum smb_fileinfo_level level; - struct { - uint16_t fnum; - uint32_t secinfo_flags; - } in; + union smb_fileinfo_in in; + uint32_t secinfo_flags; struct { struct security_descriptor *sd; } out; |