[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3787-gf68b0d0
Michael Adam
obnox at samba.org
Thu Aug 21 11:04:15 GMT 2008
The branch, v3-3-test has been updated
via f68b0d02879ddfb6a7faad8f7bb4fe51ce4c2f09 (commit)
via 50b0bd094ec0aa86ab0b6e109f7539b04d877e9f (commit)
via 2482f86705320ae578fcccc3fc8a285c5c2c059f (commit)
via 19008ca631320a07949a5516abdc382fb78e1711 (commit)
via ec75422f1a09d92ac4034287a950b9172589474e (commit)
from 2985eebbecd6da17ed628e01664b1cad08ab3285 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit f68b0d02879ddfb6a7faad8f7bb4fe51ce4c2f09
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 13 15:59:14 2008 +0200
Put prototypes of modules/vfs_irixacl.c to new modules/vfs_irixacl.h.
Thereby (hopefully) fixing the potential build problems with IRIX acls.
Michael
(cherry picked from commit 61c201d416bbc37950b980e8598b7ef1292336bc)
commit 50b0bd094ec0aa86ab0b6e109f7539b04d877e9f
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 13 15:58:06 2008 +0200
Put prototypes of modules/vfs_hpuxacl.c to new modules/vfs_hpuxacl.h.
Thereby (hopefully) fixing the potential build problems with HPUX acls.
Michael
(cherry picked from commit 4f2a1de990dc9063a1db877c06a5c1d68924edcf)
commit 2482f86705320ae578fcccc3fc8a285c5c2c059f
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 13 15:56:44 2008 +0200
Put prototypes of modules/vfs_solarisacl.c to new modules/vfs_solarisacl.h.
Thereby (hopefully) fixing the potential build problems with solaris acls.
Michael
(cherry picked from commit 8413c05afcde65006fa7c8743f30b53cc33c1729)
commit 19008ca631320a07949a5516abdc382fb78e1711
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 13 15:31:53 2008 +0200
Put prototypes of modules/vfs_tru64acl.c to new modules/vfs_tru64acl.h.
Thereby (hopefully) fixing the build with tru64 acls.
Michael
(cherry picked from commit 1ab64b69850489a2648a2543da6d0e1157df68bc)
commit ec75422f1a09d92ac4034287a950b9172589474e
Author: Michael Adam <obnox at samba.org>
Date: Wed Aug 13 15:28:38 2008 +0200
Put prototypes of modules/vfs_posixacl.c into new modules/vfs_posixacl.h.
Michael
(cherry picked from commit 876f6793434174051084b17f3b02bd1bbb24ec44)
-----------------------------------------------------------------------
Summary of changes:
source/include/includes.h | 20 +++++++++++++
source/include/proto.h | 18 ------------
source/modules/vfs_hpuxacl.h | 58 +++++++++++++++++++++++++++++++++++++++
source/modules/vfs_irixacl.h | 45 ++++++++++++++++++++++++++++++
source/modules/vfs_posixacl.h | 46 +++++++++++++++++++++++++++++++
source/modules/vfs_solarisacl.h | 45 ++++++++++++++++++++++++++++++
source/modules/vfs_tru64acl.h | 45 ++++++++++++++++++++++++++++++
7 files changed, 259 insertions(+), 18 deletions(-)
create mode 100644 source/modules/vfs_hpuxacl.h
create mode 100644 source/modules/vfs_irixacl.h
create mode 100644 source/modules/vfs_posixacl.h
create mode 100644 source/modules/vfs_solarisacl.h
create mode 100644 source/modules/vfs_tru64acl.h
Changeset truncated at 500 lines:
diff --git a/source/include/includes.h b/source/include/includes.h
index 8eb0ee5..fa385cb 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -794,6 +794,26 @@ enum flush_reason_enum {
#include "proto.h"
#endif
+#if defined(HAVE_POSIX_ACLS)
+#include "modules/vfs_posixacl.h"
+#endif
+
+#if defined(HAVE_TRU64_ACLS)
+#include "modules/vfs_tru64acl.h"
+#endif
+
+#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
+#include "modules/vfs_solarisacl.h"
+#endif
+
+#if defined(HAVE_HPUX_ACLS)
+#include "modules/vfs_hpuxacl.h"
+#endif
+
+#if defined(HAVE_IRIX_ACLS)
+#include "modules/vfs_irixacl.h"
+#endif
+
#ifdef HAVE_LDAP
#include "ads_protos.h"
#endif
diff --git a/source/include/proto.h b/source/include/proto.h
index 9554c92..d3a8dbb 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -5360,24 +5360,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/source/modules/vfs_hpuxacl.h b/source/modules/vfs_hpuxacl.h
new file mode 100644
index 0000000..07b32d6
--- /dev/null
+++ b/source/modules/vfs_hpuxacl.h
@@ -0,0 +1,58 @@
+/*
+ * Unix SMB/Netbios implementation.
+ * VFS module to get and set HP-UX 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/>.
+ */
+
+/*
+ * This module supports JFS (POSIX) ACLs on VxFS (Veritas * Filesystem).
+ * These are available on HP-UX 11.00 if JFS 3.3 is installed.
+ * On HP-UX 11i (11.11 and above) these ACLs are supported out of
+ * the box.
+ *
+ * There is another form of ACLs on HFS. These ACLs have a
+ * completely different API and their own set of userland tools.
+ * Since HFS seems to be considered deprecated, HFS acls
+ * are not supported. (They could be supported through a separate
+ * vfs-module if there is demand.)
+ */
+
+#ifndef __VFS_HPUXACL_H__
+#define __VFS_HPUXACL_H__
+
+SMB_ACL_T hpuxacl_sys_acl_get_file(vfs_handle_struct *handle,
+ const char *path_p,
+ SMB_ACL_TYPE_T type);
+
+SMB_ACL_T hpuxacl_sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp);
+
+int hpuxacl_sys_acl_set_file(vfs_handle_struct *handle,
+ const char *name,
+ SMB_ACL_TYPE_T type,
+ SMB_ACL_T theacl);
+
+int hpuxacl_sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_T theacl);
+
+int hpuxacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
+ const char *path);
+
+NTSTATUS vfs_hpuxacl_init(void);
+
+#endif
+
diff --git a/source/modules/vfs_irixacl.h b/source/modules/vfs_irixacl.h
new file mode 100644
index 0000000..2a4abd9
--- /dev/null
+++ b/source/modules/vfs_irixacl.h
@@ -0,0 +1,45 @@
+/*
+ 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/source/modules/vfs_posixacl.h b/source/modules/vfs_posixacl.h
new file mode 100644
index 0000000..9ef3f86
--- /dev/null
+++ b/source/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
+
diff --git a/source/modules/vfs_solarisacl.h b/source/modules/vfs_solarisacl.h
new file mode 100644
index 0000000..84c2cb7
--- /dev/null
+++ b/source/modules/vfs_solarisacl.h
@@ -0,0 +1,45 @@
+/*
+ Unix SMB/Netbios implementation.
+ VFS module to get and set Solaris 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_SOLARISACL_H__
+#define __VFS_SOLARISACL_H__
+
+SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
+ const char *path_p,
+ SMB_ACL_TYPE_T type);
+
+SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp);
+
+int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
+ const char *name,
+ SMB_ACL_TYPE_T type,
+ SMB_ACL_T theacl);
+
+int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_T theacl);
+
+int solarisacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
+ const char *path);
+
+NTSTATUS vfs_solarisacl_init(void);
+
+#endif
+
diff --git a/source/modules/vfs_tru64acl.h b/source/modules/vfs_tru64acl.h
new file mode 100644
index 0000000..af79e2f
--- /dev/null
+++ b/source/modules/vfs_tru64acl.h
@@ -0,0 +1,45 @@
+/*
+ Unix SMB/Netbios implementation.
+ VFS module to get and set Tru64 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_TRU64ACL_H__
+#define __VFS_TRU64ACL_H__
+
+SMB_ACL_T tru64acl_sys_acl_get_file(vfs_handle_struct *handle,
+ const char *path_p,
+ SMB_ACL_TYPE_T type);
+
+SMB_ACL_T tru64acl_sys_acl_get_fd(vfs_handle_struct *handle,
+ files_struct *fsp);
+
+int tru64acl_sys_acl_set_file(vfs_handle_struct *handle,
+ const char *name,
+ SMB_ACL_TYPE_T type,
+ SMB_ACL_T theacl);
+
+int tru64acl_sys_acl_set_fd(vfs_handle_struct *handle,
+ files_struct *fsp,
+ SMB_ACL_T theacl);
+
+int tru64acl_sys_acl_delete_def_file(vfs_handle_struct *handle,
+ const char *path);
+
+NTSTATUS vfs_tru64acl_init(void);
+
+#endif
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list