summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-08-13 15:28:38 +0200
committerMichael Adam <obnox@samba.org>2008-08-14 11:22:48 +0200
commit7871fa0b69467eacbf9add9e4670a0faae10184d (patch)
tree1a9d3f3354175bcc8fb2de1742030b8774cfb58c
parent40b133eb88600049d1aed403540d441c7f23c5b9 (diff)
downloadsamba-7871fa0b69467eacbf9add9e4670a0faae10184d.tar.gz
samba-7871fa0b69467eacbf9add9e4670a0faae10184d.tar.bz2
samba-7871fa0b69467eacbf9add9e4670a0faae10184d.zip
Put prototypes of modules/vfs_posixacl.c into new modules/vfs_posixacl.h.
Michael (This used to be commit 876f6793434174051084b17f3b02bd1bbb24ec44)
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/proto.h18
-rw-r--r--source3/modules/vfs_posixacl.h46
3 files changed, 50 insertions, 18 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 8eb0ee52dd..244571983c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -794,6 +794,10 @@ enum flush_reason_enum {
#include "proto.h"
#endif
+#if defined(HAVE_POSIX_ACLS)
+#include "modules/vfs_posixacl.h"
+#endif
+
#ifdef HAVE_LDAP
#include "ads_protos.h"
#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a1595dda46..c3cfa45f78 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5384,24 +5384,6 @@ ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, c
ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size);
NTSTATUS vfs_default_init(void);
-/* The following definitions come from modules/vfs_posixacl.c */
-
-SMB_ACL_T posixacl_sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p,
- SMB_ACL_TYPE_T type);
-SMB_ACL_T posixacl_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp);
-int posixacl_sys_acl_set_file(vfs_handle_struct *handle,
- const char *name,
- SMB_ACL_TYPE_T type,
- SMB_ACL_T theacl);
-int posixacl_sys_acl_set_fd(vfs_handle_struct *handle,
- files_struct *fsp,
- SMB_ACL_T theacl);
-int posixacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
- const char *path);
-NTSTATUS vfs_posixacl_init(void);
-
/* The following definitions come from nmbd/asyncdns.c */
int asyncdns_fd(void);
diff --git a/source3/modules/vfs_posixacl.h b/source3/modules/vfs_posixacl.h
new file mode 100644
index 0000000000..9ef3f86620
--- /dev/null
+++ b/source3/modules/vfs_posixacl.h
@@ -0,0 +1,46 @@
+/*
+ Unix SMB/Netbios implementation.
+ VFS module to get and set posix acls
+ Copyright (C) Volker Lendecke 2006
+ Copyright (C) Michael Adam 2008
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __VFS_POSIXACL_H__
+#define __VFS_POSIXACL_H__
+
+SMB_ACL_T posixacl_sys_acl_get_file(vfs_handle_struct *handle,
+ const char *path_p,
+ SMB_ACL_TYPE_T type);
+
+SMB_ACL_T posixacl_sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp);
+
+int posixacl_sys_acl_set_file(vfs_handle_struct *handle,
+ const char *name,
+ SMB_ACL_TYPE_T type,
+ SMB_ACL_T theacl);
+
+int posixacl_sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_T theacl);
+
+int posixacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
+ const char *path);
+
+NTSTATUS vfs_posixacl_init(void);
+
+#endif
+