[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0-83-gd103475

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  d1034756a1456db4aa29e07ba444be5f39ad8c90 (commit)
       via  cb9a9707f137e9bf73ed48f46bcd2c0a09f705b9 (commit)
      from  65300a996e266a1116c883b5d582864658a9e814 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit d1034756a1456db4aa29e07ba444be5f39ad8c90
Author: Alexander Bokovoy <ab at samba.org>
Date:   Sun Jul 20 10:36:05 2008 +0400

    Fix link to Using Samba
    (cherry picked from commit 04cce8c620108ba00921bd1630a8692abdc2e0dc)

commit cb9a9707f137e9bf73ed48f46bcd2c0a09f705b9
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jul 18 10:01:39 2008 +0200

    Fix the build of vfs_zfsacl.c
    (cherry picked from commit b83beeda44e1c8d485c2ad6bb8ee539cdcbe8bda)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/htmldocs.html      |    2 +-
 source/modules/vfs_zfsacl.c |   17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
index 9657691..d2be5ef 100644
--- a/docs-xml/htmldocs.html
+++ b/docs-xml/htmldocs.html
@@ -23,7 +23,7 @@
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+ <td valign="top"><a href="../using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
  <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
 </tr>
 <tr>
diff --git a/source/modules/vfs_zfsacl.c b/source/modules/vfs_zfsacl.c
index ce2e287..6fdf6e6 100644
--- a/source/modules/vfs_zfsacl.c
+++ b/source/modules/vfs_zfsacl.c
@@ -234,23 +234,8 @@ static vfs_op_tuple zfsacl_ops[] = {
 	{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
 };
 
-/* != 0 if this module will be compiled as static */
-
-#define STATIC 0
-
-#if STATIC
 NTSTATUS vfs_zfsacl_init(void);
-#else
-NTSTATUS init_module(void);
-#endif
-
-NTSTATUS
-#if STATIC
-	vfs_zfsacl_init
-#else
-	init_module
-#endif
-		(void)
+NTSTATUS vfs_zfsacl_init(void)
 {
 	return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "zfsacl",
 				zfsacl_ops);


-- 
Samba Shared Repository