summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-06-11 20:56:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:15 -0500
commit0d5265e9d4e7bb0800490fd100e1f0998b9add06 (patch)
treecb05c206140d44b88ed6a2ef868b48342f3fd7d7
parentc99449016b2ccd0c9f35e3867a96ed3500d2f064 (diff)
downloadsamba-0d5265e9d4e7bb0800490fd100e1f0998b9add06.tar.gz
samba-0d5265e9d4e7bb0800490fd100e1f0998b9add06.tar.bz2
samba-0d5265e9d4e7bb0800490fd100e1f0998b9add06.zip
r23423: 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. (This used to be commit b5be0c7403195d2bd503fb1512cb46e65587adc4)
-rw-r--r--source3/modules/vfs_catia.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index d9a5cbd0f0..a32bd59d5c 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -232,7 +232,7 @@ static char *catia_realpath(vfs_handle_struct *handle,
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 size_t catia_get_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
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);