Author: jpeach Date: 2007-06-11 20:56:17 +0000 (Mon, 11 Jun 2007) New Revision: 23423
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23423 Log: Use the correct structure types in the NT_ACL operations. It's not clear to my why the catia module feels it's necessary to implement these operations, but at least they're now the right type. Modified: branches/SAMBA_3_0/source/modules/vfs_catia.c branches/SAMBA_3_0_25/source/modules/vfs_catia.c branches/SAMBA_3_0_26/source/modules/vfs_catia.c Changeset: Modified: branches/SAMBA_3_0/source/modules/vfs_catia.c =================================================================== --- branches/SAMBA_3_0/source/modules/vfs_catia.c 2007-06-11 15:49:57 UTC (rev 23422) +++ branches/SAMBA_3_0/source/modules/vfs_catia.c 2007-06-11 20:56:17 UTC (rev 23423) @@ -232,7 +232,7 @@ static size_t catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info, - struct security_descriptor **ppdesc) + struct security_descriptor_info **ppdesc) { return SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info, ppdesc); @@ -240,7 +240,7 @@ static BOOL catia_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, - struct security_descriptor *psd) + struct security_descriptor_info *psd) { return SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent, psd); Modified: branches/SAMBA_3_0_25/source/modules/vfs_catia.c =================================================================== --- branches/SAMBA_3_0_25/source/modules/vfs_catia.c 2007-06-11 15:49:57 UTC (rev 23422) +++ branches/SAMBA_3_0_25/source/modules/vfs_catia.c 2007-06-11 20:56:17 UTC (rev 23423) @@ -222,7 +222,7 @@ static size_t catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info, - struct security_descriptor **ppdesc) + struct security_descriptor_info **ppdesc) { return SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info, ppdesc); @@ -230,7 +230,7 @@ static BOOL catia_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, - struct security_descriptor *psd) + struct security_descriptor_info *psd) { return SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent, psd); Modified: branches/SAMBA_3_0_26/source/modules/vfs_catia.c =================================================================== --- branches/SAMBA_3_0_26/source/modules/vfs_catia.c 2007-06-11 15:49:57 UTC (rev 23422) +++ branches/SAMBA_3_0_26/source/modules/vfs_catia.c 2007-06-11 20:56:17 UTC (rev 23423) @@ -232,7 +232,7 @@ static size_t catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info, - struct security_descriptor **ppdesc) + struct security_descriptor_info **ppdesc) { return SMB_VFS_NEXT_GET_NT_ACL(handle, fsp, name, security_info, ppdesc); @@ -240,7 +240,7 @@ static BOOL catia_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const char *name, uint32 security_info_sent, - struct security_descriptor *psd) + struct security_descriptor_info *psd) { return SMB_VFS_NEXT_SET_NT_ACL(handle, fsp, name, security_info_sent, psd);
