diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/lib/sysacls.c | 37 | ||||
| -rw-r--r-- | source3/modules/vfs_irixacl.c | 92 | ||||
| -rw-r--r-- | source3/modules/vfs_irixacl.h | 45 | ||||
| -rw-r--r-- | source3/modules/wscript_build | 8 | ||||
| -rw-r--r-- | source3/wscript | 4 |
7 files changed, 0 insertions, 197 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index b202df3745..bafa82aba9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -876,7 +876,6 @@ VFS_AIXACL2_OBJ = modules/vfs_aixacl2.o modules/vfs_aixacl_util.o modules/nfs4_a VFS_SOLARISACL_OBJ = modules/vfs_solarisacl.o VFS_ZFSACL_OBJ = modules/vfs_zfsacl.o modules/nfs4_acls.o VFS_HPUXACL_OBJ = modules/vfs_hpuxacl.o -VFS_IRIXACL_OBJ = modules/vfs_irixacl.o VFS_TRU64ACL_OBJ = modules/vfs_tru64acl.o VFS_CATIA_OBJ = modules/vfs_catia.o VFS_STREAMS_XATTR_OBJ = modules/vfs_streams_xattr.o @@ -2816,10 +2815,6 @@ bin/zfsacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@ -bin/irixacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ) - @echo "Building plugin $@" - @$(SHLD_MODULE) $(VFS_IRIXACL_OBJ) - bin/hpuxacl.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_HPUXACL_OBJ) @echo "Building plugin $@" @$(SHLD_MODULE) $(VFS_HPUXACL_OBJ) diff --git a/source3/configure.in b/source3/configure.in index d47f08a4a7..ab54227e71 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5216,11 +5216,6 @@ else AC_DEFINE(HAVE_HPUX_ACLS,1,[Whether HPUX ACLs are available]) default_static_modules="$default_static_modules vfs_hpuxacl" ;; - *irix*) - AC_MSG_NOTICE(Using IRIX ACLs) - AC_DEFINE(HAVE_IRIX_ACLS,1,[Whether IRIX ACLs are available]) - default_static_modules="$default_static_modules vfs_irixacl" - ;; *aix*) AC_MSG_NOTICE(Using AIX ACLs) AC_DEFINE(HAVE_AIX_ACLS,1,[Whether AIX ACLs are available]) @@ -6391,7 +6386,6 @@ SMB_MODULE(vfs_posixacl, \$(VFS_POSIXACL_OBJ), "bin/posixacl.$SHLIBEXT", VFS) SMB_MODULE(vfs_aixacl, \$(VFS_AIXACL_OBJ), "bin/aixacl.$SHLIBEXT", VFS) SMB_MODULE(vfs_aixacl2, \$(VFS_AIXACL2_OBJ), "bin/aixacl2.$SHLIBEXT", VFS) SMB_MODULE(vfs_solarisacl, \$(VFS_SOLARISACL_OBJ), "bin/solarisacl.$SHLIBEXT", VFS) -SMB_MODULE(vfs_irixacl, \$(VFS_IRIXACL_OBJ), "bin/irixacl.$SHLIBEXT", VFS) SMB_MODULE(vfs_hpuxacl, \$(VFS_HPUXACL_OBJ), "bin/hpuxacl.$SHLIBEXT", VFS) SMB_MODULE(vfs_tru64acl, \$(VFS_TRU64ACL_OBJ), "bin/tru64acl.$SHLIBEXT", VFS) SMB_MODULE(vfs_catia, \$(VFS_CATIA_OBJ), "bin/catia.$SHLIBEXT", VFS) diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index d77b2a6822..b63e682bd4 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -38,10 +38,6 @@ #include "modules/vfs_hpuxacl.h" #endif -#if defined(HAVE_IRIX_ACLS) -#include "modules/vfs_irixacl.h" -#endif - #undef DBGC_CLASS #define DBGC_CLASS DBGC_ACLS @@ -527,39 +523,6 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle, return hpuxacl_sys_acl_delete_def_file(handle, path); } -#elif defined(HAVE_IRIX_ACLS) - -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const char *path_p, SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - return irixacl_sys_acl_get_file(handle, path_p, type, mem_ctx); -} - -SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, - TALLOC_CTX *mem_ctx) -{ - return irixacl_sys_acl_get_fd(handle, fsp, mem_ctx); -} - -int sys_acl_set_file(vfs_handle_struct *handle, - const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d) -{ - return irixacl_sys_acl_set_file(handle, name, type, acl_d); -} - -int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, - SMB_ACL_T acl_d) -{ - return irixacl_sys_acl_set_fd(handle, fsp, acl_d); -} - -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const char *path) -{ - return irixacl_sys_acl_delete_def_file(handle, path); -} - #else /* No ACLs. */ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c deleted file mode 100644 index 78484fc7f8..0000000000 --- a/source3/modules/vfs_irixacl.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - Unix SMB/Netbios implementation. - VFS module to get and set irix acls - Copyright (C) Michael Adam 2006,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/>. -*/ - -#include "includes.h" -#include "system/filesys.h" -#include "smbd/smbd.h" -#include "modules/vfs_irixacl.h" - - -/* prototypes for private functions first - for clarity */ - -/* public functions - the api */ - -SMB_ACL_T irixacl_sys_acl_get_file(vfs_handle_struct *handle, - const char *path_p, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - errno = ENOTSUP; - return NULL; -} - -SMB_ACL_T irixacl_sys_acl_get_fd(vfs_handle_struct *handle, - files_struct *fsp, - TALLOC_CTX *mem_ctx) -{ - errno = ENOTSUP; - return NULL; -} - -int irixacl_sys_acl_set_file(vfs_handle_struct *handle, - const char *name, - SMB_ACL_TYPE_T type, - SMB_ACL_T theacl) -{ - errno = ENOTSUP; - return -1; -} - -int irixacl_sys_acl_set_fd(vfs_handle_struct *handle, - files_struct *fsp, - SMB_ACL_T theacl) -{ - errno = ENOTSUP; - return -1; -} - -int irixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, - const char *path) -{ - errno = ENOTSUP; - return -1; -} - -/* private functions */ - -/* VFS operations structure */ - -static struct vfs_fn_pointers irixacl_fns = { - .sys_acl_get_file_fn = irixacl_sys_acl_get_file, - .sys_acl_get_fd_fn = irixacl_sys_acl_get_fd, - .sys_acl_blob_get_file_fn = posix_sys_acl_blob_get_file, - .sys_acl_blob_get_fd_fn = posix_sys_acl_blob_get_fd, - .sys_acl_set_file_fn = irixacl_sys_acl_set_file, - .sys_acl_set_fd_fn = irixacl_sys_acl_set_fd, - .sys_acl_delete_def_file_fn = irixacl_sys_acl_delete_def_file, -}; - -NTSTATUS vfs_irixacl_init(void); -NTSTATUS vfs_irixacl_init(void) -{ - return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "irixacl", - &irixacl_fns); -} - -/* ENTE */ diff --git a/source3/modules/vfs_irixacl.h b/source3/modules/vfs_irixacl.h deleted file mode 100644 index 2a4abd94fc..0000000000 --- a/source3/modules/vfs_irixacl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - Unix SMB/Netbios implementation. - VFS module to get and set irix acls - prototype header - 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_IRIXACL_H__ -#define __VFS_IRIXACL_H__ - -SMB_ACL_T irixacl_sys_acl_get_file(vfs_handle_struct *handle, - const char *path_p, - SMB_ACL_TYPE_T type); - -SMB_ACL_T irixacl_sys_acl_get_fd(vfs_handle_struct *handle, - files_struct *fsp); - -int irixacl_sys_acl_set_file(vfs_handle_struct *handle, - const char *name, - SMB_ACL_TYPE_T type, - SMB_ACL_T theacl); - -int irixacl_sys_acl_set_fd(vfs_handle_struct *handle, - files_struct *fsp, - SMB_ACL_T theacl); - -int irixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, - const char *path); - -NTSTATUS vfs_irixacl_init(void); - -#endif - diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index d73a70724b..380afbaf8b 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -22,7 +22,6 @@ VFS_AIXACL2_SRC = '''vfs_aixacl2.c''' VFS_SOLARISACL_SRC = '''vfs_solarisacl.c''' VFS_ZFSACL_SRC = '''vfs_zfsacl.c''' VFS_HPUXACL_SRC = '''vfs_hpuxacl.c''' -VFS_IRIXACL_SRC = '''vfs_irixacl.c''' VFS_TRU64ACL_SRC = '''vfs_tru64acl.c''' VFS_CATIA_SRC = 'vfs_catia.c' VFS_STREAMS_XATTR_SRC = 'vfs_streams_xattr.c' @@ -248,13 +247,6 @@ bld.SAMBA3_MODULE('vfs_hpuxacl', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl')) -bld.SAMBA3_MODULE('vfs_irixacl', - subsystem='vfs', - source=VFS_IRIXACL_SRC, - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_irixacl'), - enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_irixacl')) - bld.SAMBA3_MODULE('vfs_tru64acl', subsystem='vfs', source=VFS_TRU64ACL_SRC, diff --git a/source3/wscript b/source3/wscript index e4898efa9b..11ef767c0a 100644 --- a/source3/wscript +++ b/source3/wscript @@ -324,10 +324,6 @@ utimensat vsyslog _write __write __xstat conf.DEFINE('HAVE_HPUX_ACLS',1) conf.DEFINE('POSIX_ACL_NEEDS_MASK',1) default_static_modules.extend(TO_LIST('vfs_hpuxacl')) - elif (host_os.rfind('irix') > -1): - Logs.info('Using IRIX ACLs') - conf.DEFINE('HAVE_IRIX_ACLS',1) - default_static_modules.extend(TO_LIST('vfs_irixacl')) elif (host_os.rfind('aix') > -1): Logs.info('Using AIX ACLs') conf.DEFINE('HAVE_AIX_ACLS',1) |