Put prototypes of modules/vfs_posixacl.c into new modules/vfs_posixacl.h.

Michael
(This used to be commit 876f6793434174051084b17f3b02bd1bbb24ec44)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 8eb0ee52dd2c4a13fd4807b88c1a397db7b71b9d..244571983c49bf4df7ea1b243b2850385967a336 100644 (file)
--- 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 a1595dda4689a9c681288bde336891cfe3b65428..c3cfa45f787fb9d8519f5dc138747fef99d5a767 100644 (file)
--- 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 (file)
index 0000000..9ef3f86
--- /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
+