[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 3.4.7-ctdb-9-31-g24f67cd
Michael Adam
obnox at samba.org
Wed Sep 15 14:44:43 MDT 2010
The branch, v3-4-ctdb has been updated
via 24f67cd3bde4e6e6bff4f503366abb17d3b389da (commit)
via 1d683f6dd69f6a0054443274afb15c7c96dc69a0 (commit)
via cc0e99fbe3b976d17d41fb935e52e7cda77fe11d (commit)
via 3a189c4fea457c3bba0dcda13e068216f00b4050 (commit)
via 1042631ad71073a461beaf982d703bca10741fa1 (commit)
via 1f7bc6f3af4aed1ff98fa4d7f97a33dee2e4e6f9 (commit)
via c015617ab329a322fed651f60585e1c3ac8078fd (commit)
via 902ae30da0879e96feec677efe9a10e2a0a25fef (commit)
via e2aacffe02f4b6f99115ca6c82f7532608f556fd (commit)
via 2a414351cde631a5eff1a5451288a99d029de4e3 (commit)
via 47d363352af4619c9e34efb26cfd9bfccccf70ae (commit)
via d0ebcb4ca559a0e1ff086255bafb737b21598893 (commit)
via 621b6d072cb8f7fc03ceccd906fcb955af088d0e (commit)
via dc973b6b3dd5f35ca97488f14d51e87f597d09e8 (commit)
via 2329dfc50da1ad1a765d386406bad1b2e6ae6d2d (commit)
via d9dc64ae5867d1bbc9e3546be7bd359e27d2de1c (commit)
via 2004e8934a3074957a41f068f446923b2b26b253 (commit)
from 2125c5b1807037859fc619897d8cd39570939ced (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 24f67cd3bde4e6e6bff4f503366abb17d3b389da
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 13 17:27:16 2010 +0200
no need any more to manually create catalog file in build-manpages-nogit
commit 1d683f6dd69f6a0054443274afb15c7c96dc69a0
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 13 17:26:20 2010 +0200
no need any more to create catalog file manually in build-manpages-git
commit cc0e99fbe3b976d17d41fb935e52e7cda77fe11d
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 13 17:18:18 2010 +0200
docs: use abs_top_builddir instead of BUILDDIR to let configure create correct catalog file
The use of the catalog file is still controlled by exporting the
XML_CATALOG_FILES variable as described in build/README
commit 3a189c4fea457c3bba0dcda13e068216f00b4050
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 13 11:52:53 2010 +0200
packaging(RHEL-CTDB): add a comment, why we need precompiled manpages as fallback
Particularly the version of the docbook XSL style sheets shipped with
RHEL5 have are missing some definitions needed for building the manpages.
commit 1042631ad71073a461beaf982d703bca10741fa1
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:56:03 2010 +0200
packaging/RHEL-CTDB: do not use an external docs tarball
try to build the manpages instead and use a checked in manpage-only tarball
if it does not work
commit 1f7bc6f3af4aed1ff98fa4d7f97a33dee2e4e6f9
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:55:32 2010 +0200
packaging/RHEL-CTDB: add a manpages tarball for use if manpage build does not work
commit c015617ab329a322fed651f60585e1c3ac8078fd
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:25:22 2010 +0200
add script to build only the manpages (not the complete docs) - no-git version
this version uses make clean to clean the source tree before building
commit 902ae30da0879e96feec677efe9a10e2a0a25fef
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:24:30 2010 +0200
add script to build only the manual pages (not all the docs) - git version
the git version uses git clean to clean the docs source tree.
commit e2aacffe02f4b6f99115ca6c82f7532608f556fd
Author: Michael Adam <obnox at samba.org>
Date: Thu Sep 9 17:14:20 2010 +0200
packaging/RHEL-CTDB: untangle the various %doc entries to single lines
commit 2a414351cde631a5eff1a5451288a99d029de4e3
Author: Michael Adam <obnox at samba.org>
Date: Mon Aug 30 14:49:16 2010 +0200
docs:vfs_gpfs: improve the CAVEAT section on run and build time dependencies
commit 47d363352af4619c9e34efb26cfd9bfccccf70ae
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 10:45:52 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:refuse_dacl_protected'
metze
(cherry picked from commit fc79f358eb6a1dd7ed2e5f5b1e31fb664a182595)
commit d0ebcb4ca559a0e1ff086255bafb737b21598893
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 10:31:38 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:merge_writeappend'
metze
(cherry picked from commit 4d76c18f78742ba92b4772037ac306b567351ca1)
commit 621b6d072cb8f7fc03ceccd906fcb955af088d0e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 10:24:52 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:winattr'
metze
(cherry picked from commit 6cf66a04ad690e78311411e2195b3a1710953262)
commit dc973b6b3dd5f35ca97488f14d51e87f597d09e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 10:12:41 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:getrealfilename'
metze
(cherry picked from commit a8a704001e5da10fae5df5fc2856d06250739248)
commit 2329dfc50da1ad1a765d386406bad1b2e6ae6d2d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 09:29:46 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:leases'
metze
(cherry picked from commit 196699a6a1412687f7d5fe24c506577002dd769e)
commit d9dc64ae5867d1bbc9e3546be7bd359e27d2de1c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 30 09:01:21 2010 +0200
docs-xml/vfs_gpfs: document 'gpfs:sharemodes'
metze
(cherry picked from commit d35d846db14a4bb28a97a7bab6dbfdbe7a62b593)
commit 2004e8934a3074957a41f068f446923b2b26b253
Author: Volker Lendecke <vl at samba.org>
Date: Wed Sep 1 12:55:18 2010 +0200
s3: Print the IP of the server that stopped responding
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/catalog.xml.in | 4 +-
docs-xml/manpages-3/vfs_gpfs.8.xml | 157 +++++++++++++++++++++++++++++++++-
packaging/RHEL-CTDB/makerpms.sh | 7 --
packaging/RHEL-CTDB/manpages.tar.bz2 | Bin 0 -> 145635 bytes
packaging/RHEL-CTDB/samba.spec.tmpl | 41 +++++++---
release-scripts/build-manpages-git | 37 ++++++++
release-scripts/build-manpages-nogit | 42 +++++++++
source3/libsmb/clientgen.c | 6 +-
8 files changed, 270 insertions(+), 24 deletions(-)
create mode 100644 packaging/RHEL-CTDB/manpages.tar.bz2
create mode 100755 release-scripts/build-manpages-git
create mode 100755 release-scripts/build-manpages-nogit
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/catalog.xml.in b/docs-xml/build/catalog.xml.in
index 03ac0bd..4b99cf5 100644
--- a/docs-xml/build/catalog.xml.in
+++ b/docs-xml/build/catalog.xml.in
@@ -6,9 +6,9 @@
<rewriteURI
uriStartString="http://www.samba.org/samba/DTD/"
- rewritePrefix="file://@BUILDDIR@/build/DTD/"/>
+ rewritePrefix="file://@abs_top_builddir@/build/DTD/"/>
<rewriteURI
uriStartString="http://www.gnu.org/licenses/"
- rewritePrefix="file://@BUILDDIR@/Samba3-ByExample/"/>
+ rewritePrefix="file://@abs_top_builddir@/Samba3-ByExample/"/>
</catalog>
diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml
index 091de14..0b46c61 100644
--- a/docs-xml/manpages-3/vfs_gpfs.8.xml
+++ b/docs-xml/manpages-3/vfs_gpfs.8.xml
@@ -60,6 +60,146 @@
<varlistentry>
+ <term>gpfs:sharemodes = [ yes | no ]</term>
+ <listitem>
+ <para>
+ Enable/Disable cross node sharemode handling for GPFS.
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>yes(default)</command> - propagate sharemodes across all GPFS nodes.
+ </para></listitem>
+ <listitem><para>
+ <command>no</command> - do not propagate sharemodes across all GPFS nodes.
+ This should only be used if the GPFS file system is
+ exclusively exported by Samba. Access by local unix application or
+ NFS exports could lead to corrupted files.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+ <term>gpfs:leases = [ yes | no ]</term>
+ <listitem>
+ <para>
+ Enable/Disable cross node leases (oplocks) for GPFS.
+ You should also set the <command>oplocks</command> and <command>kernel oplocks</command>
+ options to the same value.
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>yes(default)</command> - propagate leases across all GPFS nodes.
+ </para></listitem>
+ <listitem><para>
+ <command>no</command> - do not propagate leases across all GPFS nodes.
+ This should only be used if the GPFS file system is
+ exclusively exported by Samba. Access by local unix application or
+ NFS exports could lead to corrupted files.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+ <term>gpfs:getrealfilename = [ yes | no ]</term>
+ <listitem>
+ <para>
+ Enable/Disable usage of the <command>gpfs_get_realfilename_path()</command> function.
+ This improves the casesensitive wildcard file name access.
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>yes(default)</command> - use <command>gpfs_get_realfilename_path()</command>.
+ </para></listitem>
+ <listitem><para>
+ <command>no</command> - do not use <command>gpfs_get_realfilename_path()</command>.
+ It seems that <command>gpfs_get_realfilename_path()</command> doesn't work on AIX.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+ <term>gpfs:winattr = [ yes | no ]</term>
+ <listitem>
+ <para>
+ Enable/Disable usage of the windows attributes in GPFS.
+ GPFS is able to store windows file attributes e.g. HIDDEN,
+ READONLY, SYSTEM and others natively. That means Samba doesn't
+ need to map them to permission bits or extended attributes.
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>no(default)</command> - do not use GPFS windows attributes.
+ </para></listitem>
+ <listitem><para>
+ <command>yes</command> - use GPFS windows attributes.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+ <term>gpfs:merge_writeappend = [ yes | no ]</term>
+ <listitem>
+ <para>
+ GPFS ACLs doesn't know about the 'APPEND' right.
+ This optionen lets Samba map the 'APPEND' right to 'WRITE'.
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>yes(default)</command> - map 'APPEND' to 'WRITE'.
+ </para></listitem>
+ <listitem><para>
+ <command>no</command> - do not map 'APPEND' to 'WRITE'.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
+ <term>gpfs:refuse_dacl_protected = [ yes | no ]</term>
+ <listitem>
+ <para>
+ As GPFS does not support the ACE4_FLAG_NO_PROPAGATE NFSv4 flag (which would be
+ the mapping for the DESC_DACL_PROTECTED flag), the status of this flag is
+ currently silently ignored by Samba. That means that if you deselect the "Allow
+ inheritable permissions..." checkbox in Windows' ACL dialog and then apply the
+ ACL, the flag will be back immediately.
+ </para>
+ <para>
+ To make sure that automatic migration with e.g. robocopy does not lead to
+ ACLs silently (and unintentionally) changed, you can set
+ <command>gpfs:refuse_dacl_protected = yes</command> to enable an explicit
+ check for this flag and if set, it will return NT_STATUS_NOT_SUPPORTED so
+ errors are shown up on the Windows side and the Administrator is aware of
+ the ACLs not being settable like intended
+ </para>
+
+ <itemizedlist>
+ <listitem><para>
+ <command>no(default)</command> - ignore the DESC_DACL_PROTECTED flags.
+ </para></listitem>
+ <listitem><para>
+ <command>yes</command> - reject ACLs with DESC_DACL_PROTECTED.
+ </para></listitem>
+ </itemizedlist>
+ </listitem>
+
+ </varlistentry>
+ <varlistentry>
+
<term>nfs4:mode = [ simple | special ]</term>
<listitem>
<para>
@@ -134,9 +274,20 @@
<refsect1>
<title>CAVEATS</title>
- <para>The gpfs gpl libraries are required by <command>gpfs</command> VFS
- module during both compilation and runtime.
- Also this VFS module is tested to work on SLES 9/10 and RHEL 4.4
+ <para>
+ Depending on the version of gpfs, the <command>libgpfs_gpl</command>
+ library or the <command>libgpfs</command> library is needed at
+ runtime by the <command>gpfs</command> VFS module:
+ Starting with gpfs 3.2.1 PTF8, the complete <command>libgpfs</command>
+ is available as open source and <command>libgpfs_gpl</command> does no
+ longer exist. With earlier versions of gpfs, only the
+ <command>libgpfs_gpl</command> library was open source and could be
+ used at run time.
+ </para>
+ <para>
+ At build time, only the header file <command>gpfs_gpl.h</command>
+ is required , which is a symlink to <command>gpfs.h</command> in
+ gpfs versions newer than 3.2.1 PTF8.
</para>
</refsect1>
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 8da9078..74d5f7b 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -13,8 +13,6 @@
# Note: Under this directory rpm expects to find the same directories
# that are under the /usr/src/redhat directory.
-# Set DOCS_TARBALL to the path to a docs release tarball in .tar.bz2 format.
-
# extra options passed to rpmbuild
EXTRA_OPTIONS="$1"
@@ -27,7 +25,6 @@ DIRNAME=$(dirname $0)
TOPDIR=${DIRNAME}/../..
SPECFILE="samba.spec"
-DOCS="docs.tar.bz2"
RPMVER=`rpm --version | awk '{print $3}'`
RPM="rpmbuild"
@@ -74,10 +71,6 @@ fi
##
## copy additional source files
##
-if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
- cp ${DOCS_TARBALL} ${RPMSRCDIR}/${DOCS}
-fi
-
pushd ${DIRNAME}
chmod 755 setup/filter-requires-samba.sh
diff --git a/packaging/RHEL-CTDB/manpages.tar.bz2 b/packaging/RHEL-CTDB/manpages.tar.bz2
new file mode 100644
index 0000000..2caef8a
Binary files /dev/null and b/packaging/RHEL-CTDB/manpages.tar.bz2 differ
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index c4fa5de..9e470e8 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -15,7 +15,6 @@ URL: http://www.samba.org/
Source: samba-%{version}.tar.bz2
# Don't depend on Net::LDAP
-Source997: docs.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
@@ -29,6 +28,8 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel, openldap-devel, krb5-devel, cups-devel, ctdb, e2fsprogs-devel
+# requirements for building the man pages:
+BuildRequires: libxslt, docbook-utils, docbook-style-xsl
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -123,7 +124,6 @@ utilized by SWAT as well as the HTML and PDF version of "Using Samba",
# setup the vendor files (init scripts, etc...)
%setup -T -D -a 999 -n samba-%{version} -q
-%setup -T -D -a 997 -n samba-%{version} -q
%build
@@ -279,8 +279,22 @@ do
fi
done
-# Remove some permission bits to avoid to many dependencies
cd ..
+
+# try and build the manpages
+#
+# NOTE: some (older) versions the docbook XSL style sheets
+# are missing some definitions that are required for building
+# the manual pages (e.g. list-indent).
+#
+# This applies in particular to the version 1.69 of
+# docbook-style-xsl that is shipped with RHEL 5.
+# We therefore use checked in precompiled manpages
+# if the docs build fails.
+#
+./release-scripts/build-manpages-nogit || tar xjf packaging/RHEL-CTDB/manpages.tar.bz2
+
+# Remove some permission bits to avoid to many dependencies
find examples docs -type f | xargs -r chmod -x
%install
@@ -370,10 +384,6 @@ ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
# Remove "*.old" files
find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
-## don't duplicate the docs. These are installed by/with SWAT
-rm -rf docs/htmldocs
-rm -rf docs/manpages
-( cd docs; ln -s %{_prefix}/share/swat/help htmldocs )
##
## Clean out man pages for tools not installed here
@@ -517,10 +527,19 @@ exit 0
%files doc
%defattr(-,root,root)
-%doc README COPYING Manifest
-%doc WHATSNEW.txt Roadmap
-%doc docs
-%doc examples/autofs examples/LDAP examples/libsmbclient examples/misc examples/printer-accounting
+%doc README
+%doc COPYING
+%doc Manifest
+%doc WHATSNEW.txt
+%doc Roadmap
+%doc docs-xml/archives/THANKS
+%doc docs-xml/archives/history
+%doc docs-xml/registry
+%doc examples/autofs
+%doc examples/LDAP
+%doc examples/libsmbclient
+%doc examples/misc
+%doc examples/printer-accounting
%doc examples/printing
##########
diff --git a/release-scripts/build-manpages-git b/release-scripts/build-manpages-git
new file mode 100755
index 0000000..a9c51b5
--- /dev/null
+++ b/release-scripts/build-manpages-git
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2010
+
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
+DIRNAME=$(dirname $0)
+DOCS_XML_DIR=${DIRNAME}/../docs-xml
+DOCS_DIR=${DIRNAME}/../docs
+
+pushd ${DOCS_XML_DIR} || exit 1
+
+git clean -xdf || _exit "Error running git clean."
+
+autoconf || _exit "Error running autoconf."
+
+./configure || _exit "Error running configure."
+
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
+
+make manpages3 || _exit "Error running make manpages3"
+
+popd
+
+test -e ${DOCS_DIR}/manpages && rm -rf ${DOCS_DIR}/manpages
+mkdir -p ${DOCS_DIR}/manpages
+
+rsync -Ca ${DOCS_XML_DIR}/output/manpages-3/ ${DOCS_DIR}/manpages
+
+echo "Success"
+exit
+
+# END
diff --git a/release-scripts/build-manpages-nogit b/release-scripts/build-manpages-nogit
new file mode 100755
index 0000000..c39b685
--- /dev/null
+++ b/release-scripts/build-manpages-nogit
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# Copyright (C) Michael Adam 2010
+
+_exit() {
+ echo $@
+ popd
+ exit 1
+}
+
+DIRNAME=$(dirname $0)
+DOCS_XML_DIR=${DIRNAME}/../docs-xml
+DOCS_DIR=${DIRNAME}/../docs
+
+pushd ${DOCS_XML_DIR} || exit 1
+
+#git clean -xdf || _exit "Error running git clean."
+
+autoconf || _exit "Error running autoconf."
+
+./configure || _exit "Error running configure."
+
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
+
+make clean || _exit "Error running make clean"
+
+# re-establish catalog (has been removed by make clean...)
+./config.status
+
+make manpages3 || _exit "Error running make manpages3"
+
+popd
+
+test -e ${DOCS_DIR}/manpages && rm -rf ${DOCS_DIR}/manpages
+mkdir -p ${DOCS_DIR}/manpages
+
+rsync -Ca ${DOCS_XML_DIR}/output/manpages-3/ ${DOCS_DIR}/manpages
+
+echo "Success"
+exit
+
+# END
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 5dc43e9..33228b7 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -171,7 +171,11 @@ bool cli_receive_smb(struct cli_state *cli)
/* If the server is not responding, note that now */
if (len < 0) {
- DEBUG(0, ("Receiving SMB: Server stopped responding\n"));
+ char addr[INET6_ADDRSTRLEN];
+
+ print_sockaddr(addr, sizeof(addr), &cli->dest_ss);
+ DEBUG(0, ("Receiving SMB: Server %s stopped responding\n",
+ addr));
close(cli->fd);
cli->fd = -1;
return false;
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list