summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-12-10 23:13:34 +0100
committerVolker Lendecke <vl@samba.org>2008-12-10 23:13:34 +0100
commit7ad9676864a70366c3165c6f35e5c8665bc6468d (patch)
treed97856d6e612b1ff680d58d46bb7d58aa2430168
parentc044b09572631cbdd686e5dbbdfbcc731145533a (diff)
downloadsamba-7ad9676864a70366c3165c6f35e5c8665bc6468d.tar.gz
samba-7ad9676864a70366c3165c6f35e5c8665bc6468d.tar.bz2
samba-7ad9676864a70366c3165c6f35e5c8665bc6468d.zip
Revert "Fix the build"
This reverts commit c044b09572631cbdd686e5dbbdfbcc731145533a.
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/modules/vfs_gpfs.c9
2 files changed, 9 insertions, 4 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7fa6266910..4feedcdb04 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -7896,10 +7896,6 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
char **pp_saved_last_component,
SMB_STRUCT_STAT *pst);
NTSTATUS check_name(connection_struct *conn, const char *name);
-int get_real_filename(connection_struct *conn, const char *path,
- const char *name, TALLOC_CTX *mem_ctx,
- char **found_name);
-
/* The following definitions come from smbd/files.c */
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index fae08dd252..780bd9b8a5 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -446,6 +446,11 @@ static NTSTATUS gpfsacl_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp
return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd);
}
+static NTSTATUS gpfsacl_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, char *name, uint32 security_info_sent, SEC_DESC *psd)
+{
+ return gpfsacl_set_nt_acl_internal(fsp, security_info_sent, psd);
+}
+
static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl)
{
SMB_ACL_T result;
@@ -890,6 +895,10 @@ static vfs_op_tuple gpfs_op_tuples[] = {
SMB_VFS_OP_FSET_NT_ACL,
SMB_VFS_LAYER_TRANSPARENT },
+ { SMB_VFS_OP(gpfsacl_set_nt_acl),
+ SMB_VFS_OP_SET_NT_ACL,
+ SMB_VFS_LAYER_TRANSPARENT },
+
{ SMB_VFS_OP(gpfsacl_sys_acl_get_file),
SMB_VFS_OP_SYS_ACL_GET_FILE,
SMB_VFS_LAYER_TRANSPARENT },