[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Oct 10 23:54:02 MDT 2012
The branch, master has been updated
via 957f9fa rpc_server:srvsvc Remove psd variable that was no longer set by SMB_VFS_FGET_NT_ACL
via 0f435a7 build: Remove --disable-shared
via 1722074 vfs: Remove irixacl module (all the fucntions in it are unimplemented)
via a0588fd vfs: Fix alternative posix and no-op sys acl implementations to take a mem_ctx
from 547a260 vfs: Improve formatting of vfs_fake_acls
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 957f9fa3ff2ba838bb1669c371da0f70ddeb2360
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 11 15:08:25 2012 +1100
rpc_server:srvsvc Remove psd variable that was no longer set by SMB_VFS_FGET_NT_ACL
This fixes up an error introduced by c8ade07760ae0ccfdf2d875c9f3027926e62321b.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Oct 11 07:53:36 CEST 2012 on sn-devel-104
commit 0f435a7adceb6bb7e2cc57eda3bf5a4a615d6a79
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Oct 10 21:20:24 2012 +1100
build: Remove --disable-shared
This does not work, and has no known use cases. Remove it so we do
not waste time trying to support it.
This also removes it for ldb/tdb/ntdb/talloc, but as these are first
shared libraries, and then tools on top of those, rpath or (for
emergency tools) --nonshared-binary= seems more appropriate.
Andrew Bartlett
commit 1722074a9b4b7370ae50ba7a0b787c5f325f592b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 11 14:49:13 2012 +1100
vfs: Remove irixacl module (all the fucntions in it are unimplemented)
commit a0588fdea82ab1b5d4dbd8bf75b01b82c0879d21
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 11 14:42:39 2012 +1100
vfs: Fix alternative posix and no-op sys acl implementations to take a mem_ctx
These were missed with the initial conversion to use a talloc context.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_bundled.py | 4 -
buildtools/wafsamba/wscript | 13 +----
source3/Makefile.in | 5 --
source3/configure.in | 6 --
source3/lib/sysacls.c | 84 ++++++++++-----------------
source3/modules/vfs_aixacl.c | 12 ++--
source3/modules/vfs_irixacl.c | 90 -----------------------------
source3/modules/vfs_irixacl.h | 45 --------------
source3/modules/vfs_solarisacl.c | 2 +-
source3/modules/wscript_build | 8 ---
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 8 +--
source3/wscript | 4 -
12 files changed, 44 insertions(+), 237 deletions(-)
delete mode 100644 source3/modules/vfs_irixacl.c
delete mode 100644 source3/modules/vfs_irixacl.h
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index b8a4101..afcf708 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -30,8 +30,6 @@ def target_in_list(target, lst, default):
def BUILTIN_LIBRARY(bld, name):
'''return True if a library should be builtin
instead of being built as a shared lib'''
- if bld.env.DISABLE_SHARED:
- return True
return target_in_list(name, bld.env.BUILTIN_LIBRARIES, False)
Build.BuildContext.BUILTIN_LIBRARY = BUILTIN_LIBRARY
@@ -249,8 +247,6 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
def NONSHARED_BINARY(bld, name):
'''return True if a binary should be built without non-system shared libs'''
- if bld.env.DISABLE_SHARED:
- return True
return target_in_list(name, bld.env.NONSHARED_BINARIES, False)
Build.BuildContext.NONSHARED_BINARY = NONSHARED_BINARY
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 5e1898c..441e727 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -50,9 +50,6 @@ def set_options(opt):
help=("list of minimum system library versions (LIBNAME1:version,LIBNAME2:version)"),
action="store", dest='MINIMUM_LIBRARY_VERSION', default='')
- gr.add_option('--disable-shared',
- help=("Disable all use of shared libraries"),
- action="store_true", dest='disable_shared', default=False)
gr.add_option('--disable-rpath',
help=("Disable use of rpath for build binaries"),
action="store_true", dest='disable_rpath_build', default=False)
@@ -248,7 +245,6 @@ def configure(conf):
conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')
conf.env.PRIVATE_LIBS = Options.options.PRIVATE_LIBS.split(',')
conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',')
- conf.env.DISABLE_SHARED = Options.options.disable_shared
conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',')
conf.env.PRIVATE_EXTENSION = Options.options.PRIVATE_EXTENSION
@@ -297,12 +293,8 @@ def configure(conf):
headers='stdio.h',
msg='Checking simple C program')
- # see if we can build shared libs
- if not conf.CHECK_LIBRARY_SUPPORT():
- conf.env.DISABLE_SHARED = True
-
# check for rpath
- if not conf.env.DISABLE_SHARED and conf.CHECK_LIBRARY_SUPPORT(rpath=True):
+ if conf.CHECK_LIBRARY_SUPPORT(rpath=True):
support_rpath = True
conf.env.RPATH_ON_BUILD = not Options.options.disable_rpath_build
conf.env.RPATH_ON_INSTALL = (conf.env.RPATH_ON_BUILD and
@@ -322,8 +314,7 @@ def configure(conf):
# the user can of course always override it.
conf.env.PRIVATELIBDIR = conf.env.LIBDIR
- if (not conf.env.DISABLE_SHARED and
- not Options.options.disable_symbol_versions and
+ if (not Options.options.disable_symbol_versions and
conf.CHECK_LIBRARY_SUPPORT(rpath=support_rpath,
version_script=True,
msg='-Wl,--version-script support')):
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b202df3..bafa82a 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. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ZFSACL_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_ZFSACL_OBJ) @ZFSACL_LIBS@
-bin/irixacl. at SHLIBEXT@: $(BINARY_PREREQS) $(VFS_IRIXACL_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_IRIXACL_OBJ)
-
bin/hpuxacl. at 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 d47f08a..ab54227 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 2245491..b63e682 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
@@ -395,14 +391,16 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
#elif defined(HAVE_AIX_ACLS)
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type)
+ const char *path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return aixacl_sys_acl_get_file(handle, path_p, type);
+ return aixacl_sys_acl_get_file(handle, path_p, type, mem_ctx);
}
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
- return aixacl_sys_acl_get_fd(handle, fsp);
+ return aixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
int sys_acl_set_file(vfs_handle_struct *handle,
@@ -426,14 +424,17 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
#elif defined(HAVE_TRU64_ACLS)
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type)
+ const char *path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return tru64acl_sys_acl_get_file(handle, path_p, type);
+ return tru64acl_sys_acl_get_file(handle, path_p, type,
+ mem_ctx);
}
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
- return tru64acl_sys_acl_get_fd(handle, fsp);
+ return tru64acl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
int sys_acl_set_file(vfs_handle_struct *handle,
@@ -457,14 +458,18 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
#elif defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type)
+ const char *path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return solarisacl_sys_acl_get_file(handle, path_p, type);
+ return solarisacl_sys_acl_get_file(handle, path_p, type,
+ mem_ctx);
}
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
- return solarisacl_sys_acl_get_fd(handle, fsp);
+ return solarisacl_sys_acl_get_fd(handle, fsp,
+ mem_ctx);
}
int sys_acl_set_file(vfs_handle_struct *handle,
@@ -488,14 +493,16 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
#elif defined(HAVE_HPUX_ACLS)
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p, SMB_ACL_TYPE_T type)
+ const char *path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
- return hpuxacl_sys_acl_get_file(handle, path_p, type);
+ return hpuxacl_sys_acl_get_file(handle, path_p, type, mem_ctx);
}
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
- return hpuxacl_sys_acl_get_fd(handle, fsp);
+ return hpuxacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
int sys_acl_set_file(vfs_handle_struct *handle,
@@ -516,41 +523,11 @@ 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)
-{
- return irixacl_sys_acl_get_file(handle, path_p, type);
-}
-
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
-{
- return irixacl_sys_acl_get_fd(handle, fsp);
-}
-
-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,
- const char *path_p, SMB_ACL_TYPE_T type)
+ const char *path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
#ifdef ENOTSUP
errno = ENOTSUP;
@@ -560,7 +537,8 @@ SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
return NULL;
}
-SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp)
+SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
#ifdef ENOTSUP
errno = ENOTSUP;
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index 25d9089..459ea6f 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -23,8 +23,9 @@
#include "vfs_aixacl_util.h"
SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
- const char *path_p,
- SMB_ACL_TYPE_T type)
+ const char *path_p,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx)
{
struct acl *file_acl = (struct acl *)NULL;
struct smb_acl_t *result = (struct smb_acl_t *)NULL;
@@ -71,7 +72,7 @@ SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
DEBUG(10,("Got facl and returned it\n"));
- result = aixacl_to_smbacl(file_acl);
+ result = aixacl_to_smbacl(file_acl, mem_ctx);
SAFE_FREE(file_acl);
return result;
@@ -80,7 +81,8 @@ SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
}
SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp)
+ files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
struct acl *file_acl = (struct acl *)NULL;
@@ -122,7 +124,7 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
DEBUG(10,("Got facl and returned it\n"));
- result = aixacl_to_smbacl(file_acl);
+ result = aixacl_to_smbacl(file_acl, mem_ctx);
SAFE_FREE(file_acl);
return result;
diff --git a/source3/modules/vfs_irixacl.c b/source3/modules/vfs_irixacl.c
deleted file mode 100644
index b397224..0000000
--- a/source3/modules/vfs_irixacl.c
+++ /dev/null
@@ -1,90 +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)
-{
- errno = ENOTSUP;
- return NULL;
-}
-
-SMB_ACL_T irixacl_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp)
-{
- 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 2a4abd9..0000000
--- 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/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index a5f787f..dd5fe82 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -120,7 +120,7 @@ SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
* access acl. So we need to filter this out here.
*/
result = solaris_acl_to_smb_acl(solaris_acl, count,
- SMB_ACL_TYPE_ACCESS);
+ SMB_ACL_TYPE_ACCESS, mem_ctx);
if (result == NULL) {
DEBUG(10, ("conversion solaris_acl -> smb_acl failed (%s).\n",
strerror(errno)));
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index d73a707..380afba 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',
--
Samba Shared Repository
More information about the samba-cvs
mailing list