[SCM] Samba Shared Repository - branch v4-1-stable updated
Karolin Seeger
kseeger at samba.org
Fri Aug 9 01:27:43 MDT 2013
The branch, v4-1-stable has been updated
via 589cb52 VERSION: Disable git snapshots for the 4.1.0rc2 release.
via 8b468af WHATSNEW: Add release notes for Samba 4.1.0rc2.
via 099fd4c Ensure gpfs kernel leases are wrapped in a become_root()/unbecome_root() pair.
via 224ea46 Wrap setting leases in become_root()/unbecome_root() to ensure correct delivery of signals.
via cd0f88d Add torture tests to raw.eas to check sending Windows invalid names in the middle of an EA list.
via 7f52ae9 Reply with correct trans2 message on a setpathinfo with a bad EA name.
via e413edd Ensure we do pathname processing before SD and EA processing in NTTRANS_CREATE.
via 12d06fb Ensure we can't create a file using NTTRANS with an invalid EA list.
via b22b1bc Ensure we can't create a file using TRANS2_OPEN with an invalid EA list.
via 2b165a1 Add error map of STATUS_INVALID_EA_NAME -> ERRDOS, ERRbadfile
via 65d4a4c Add the ability to send an NTSTATUS result back with a trans2 reply so we can return a parameter block with an error code.
via d3b9f6c Ensure we can't create a file using SMB2_CREATE with an invalid EA list.
via dc2320a Ensure we never return an EA name to a Windows client it can't handle.
via 36bca02 Ensure set_ea cannot set invalid Windows EA names.
via a6df18d Add ea_list_has_invalid_name() function.
via 4bf25ec nsswitch: Add OPT_KRB5CCNAME to avoid an error message.
via 597846c s3: Remove old mode special substitution.
via 1ed811b s4:server: avoid calling into nss_winbind from within 'samba'
via 8925c93 s4:rpc_server: make sure we don't terminate a connection with pending requests (bug #9820)
via 3f86c28 s4-winbindd: Do not terminate a connection that is still pending (bug #9820)
via 8e4d407 service_stream: Log if the connection termination is deferred or not (bug #9820)
via 30b8af7 Fix bug 9678 - Windows 8 Roaming profiles fail
via 2b6a6fd security.idl: add new security_secinfo bits
via 34e6d50 samba-tool dbcheck: Correctly remove deleted DNs in dbcheck
via d0e3791 dsdb: Include MS-ADTS doc references on deleted object contstraints
via 0a2a985 dsdb tests: Add member/memberOf checking to delete_objects testing
via 7004a3d dsdb: Improve DRS deleted link source/target handing in repl_meta_data
via d6e1e12 dsdb: Ensure we always force deleted objects back under the deleted objects DN
via 042b3e5 dsdb/repl_meta_data: split out replmd_deletion_state()
via 20d8a33 dsdb: Prune deleted objects of links and extra attributes of replicated deletes
via a0a3b58 torture/drs: Expand an error message to aid debugging
via 071b36b dsdb/samdb: use RECYCLED it implies DELETED...
via 55f0779 selftest: ensure samba4.rpc.samr.large-dc.two.samr.many is always tested
via 8cbc577 rpc_server-drsuapi: Improve comments and DEBUG lines
via 5acbbd7 dsdb: Add assert in drepl_take_FSMO_role
via 498c92d selftest: Ensure the DC has started and and got a RID set before we proceed
via 6287ac3 dsdb-ridalloc: Rework ridalloc to return error strings where RID allocation fails
via e97dfe2 dsdb: Rework subtree_rename module to use recursive LDB_SCOPE_ONELEVEL searches
via 75ef73f dsdb-descriptor: Do not do a subtree search unless we have child entries
via c4c3d7f Fix bug #10010 - Missing integer wrap protection in EA list reading can cause server to loop with DOS.
via 2036f25 Fix bug #10010 - Missing integer wrap protection in EA list reading can cause server to loop with DOS.
via 216b3f4 s4-lib/socket: Allocate a the larger sockaddr_un and not just a sockaddr_in in unixdom_get_my_addr()
via 580b51c s4-lib/socket: Allocate a the larger sockaddr_un and not just a sockaddr_in in unixdom_get_peer_addr()
via 4bbb4c8 docs-xml: Remove obsolete swat manpage and references.
via f65b92c pam_winbind: update documentation for "DIR" krb5ccname pragma.
via 2978a06 s3-winbindd: support the DIR pragma for raw kerberos user pam authentication.
via 60be5a7 wbinfo: allow to define a custom krb5ccname for kerberized pam auth.
via eb3b931 s3-waf: Rename regedit to samba-regedit.
via 2e6fdd7 lib/param: sync debug related options with source3/param
via 348cb51 lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10
via e92be34 lib/ldb-samba: make use of DBGC_LDB
via 65fadd4 lib/util: add 'ldb' debug class
via 2c8bd5b s3-winbind: Do not delete an existing valid credential cache.
via 4e74c61 smbd: Fix a 100% loop at shutdown time
via 54ee31e s3-smbstatus: display [u|g]id of -1 as "-1" in connection list
via d07b694 s3-lib: hide incomplete smbXsrv_tcon_global records
via 38841bb s3-lib: fix segf while reading incomplete session info (bug #10003)
via d95ed7f VERSION: Bump version number up to 4.1.0rc2...
from ae2e0a6 VERSION: Disable git snapshots for the 4.1.0rc1 release.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-stable
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 69 +++-
docs-xml/manpages/pam_winbind.conf.5.xml | 39 +-
docs-xml/manpages/samba.7.xml | 8 -
docs-xml/manpages/smb.conf.5.xml | 5 +-
docs-xml/manpages/swat.8.xml | 237 --------
docs-xml/smbdotconf/base/bindinterfacesonly.xml | 15 +-
docs-xml/wscript_build | 1 -
examples/pam_winbind/pam_winbind.conf | 3 +-
file_server/file_server.c | 9 +
lib/ldb-samba/ldb_wrap.c | 4 +-
lib/param/loadparm.c | 18 +-
lib/util/debug.c | 1 +
lib/util/debug.h | 3 +-
libcli/util/errormap.c | 1 +
librpc/idl/security.idl | 3 +
nsswitch/wbinfo.c | 10 +-
python/samba/dbchecker.py | 2 +-
selftest/flapping | 1 -
selftest/knownfail | 2 +-
selftest/target/Samba4.pm | 22 +-
source3/include/proto.h | 2 +
source3/lib/conn_tdb.c | 22 +-
source3/lib/filename_util.c | 34 ++
source3/lib/sessionid_tdb.c | 15 +-
source3/modules/nfs4_acls.c | 15 +-
source3/modules/vfs_gpfs.c | 6 +
source3/smbd/blocking.c | 2 +-
source3/smbd/close.c | 7 +-
source3/smbd/nttrans.c | 107 +++--
source3/smbd/oplock_linux.c | 33 +-
source3/smbd/proto.h | 1 +
source3/smbd/smb2_create.c | 5 +
source3/smbd/trans2.c | 86 +++-
source3/utils/status.c | 24 +-
source3/winbindd/winbindd_pam.c | 31 ++
source3/wscript_build | 2 +-
source4/dsdb/repl/drepl_fsmo.c | 7 +-
source4/dsdb/samdb/cracknames.c | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 33 ++-
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 4 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 568 +++++++++++++++-----
source4/dsdb/samdb/ldb_modules/ridalloc.c | 56 ++-
source4/dsdb/samdb/ldb_modules/subtree_rename.c | 201 ++++----
.../dsdb/samdb/ldb_modules/wscript_build_server | 2 +-
source4/lib/socket/socket_unix.c | 8 +-
source4/libcli/raw/raweas.c | 7 +-
source4/rpc_server/dcerpc_server.c | 55 ++-
source4/rpc_server/dcerpc_server.h | 8 +-
source4/rpc_server/drsuapi/getncchanges.c | 7 +-
source4/smbd/server.c | 7 +
source4/smbd/service_stream.c | 6 +-
source4/torture/drs/python/delete_object.py | 280 +++++++++-
source4/torture/raw/eas.c | 114 ++++
source4/winbind/wb_samba3_protocol.c | 5 +
source4/winbind/wb_server.c | 51 ++-
source4/winbind/wb_server.h | 10 +-
57 files changed, 1600 insertions(+), 678 deletions(-)
delete mode 100644 docs-xml/manpages/swat.8.xml
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 83a32b3..07ce7cd 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=2
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e49a781..c176388 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
Release Announcements
=====================
-This is the first release candidate of Samba 4.1. This is *not*
+This is the second release candidate of Samba 4.1. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -76,6 +76,14 @@ smb.conf changes
use ntdb New No
+RUNNING Samba 4.1 as an AD DC
+=============================
+
+A short guide to setting up Samba 4 as an AD DC can be found on the wiki:
+
+ http://wiki.samba.org/index.php/Samba4/HOWTO
+
+
COMMIT HIGHLIGHTS
=================
@@ -85,12 +93,63 @@ o David Disseldorp <ddiss at samba.org>
SMB2 FSCTL_SRV_COPYCHUNK request.
-RUNNING Samba 4.1 as an AD DC
-=============================
+CHANGES SINCE 4.1.0rc1
+======================
-A short guide to setting up Samba 4 as an AD DC can be found on the wiki:
+o Jeremy Allison <jra at samba.org>
+ * BUG 9992: Windows error 0x800700FE when copying files with xattr names
+ containing ":".
+ * BUG 10010: Missing integer wrap protection in EA list reading can cause
+ server to loop with DOS (CVE-2013-4124).
+ * BUG 10064: Linux kernel oplock breaks can miss signals.
- http://wiki.samba.org/index.php/Samba4/HOWTO
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 9029: Fix replication with --domain-crictical-only to fill in
+ backlinks.
+ * BUG 9820: Fix crash of winbind after "ls -l
+ /usr/local/samba/var/locks/sysvol".
+ * BUG 10056: dsdb improvements.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 10003: Fix segfault while reading incomplete session info.
+
+
+o Gregor Beck <gbeck at sernet.de>
+ * BUG 9678: Windows 8 Roaming profiles fail.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 10043: Allow to change the default location for Kerberos credential
+ caches.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 10013: Fix a 100% loop at shutdown time (smbd).
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 9820: Fix crash of winbind after "ls -l
+ /usr/local/samba/var/locks/sysvol".
+ * BUG 10015: Fix/improve debug options.
+ * BUG 10042: Fix crashes in socket_get_local_addr().
+ * BUG 10056: dsdb improvements.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9994: Do not delete an existing valid credential cache (s3-winbind).
+ * BUG 10040: Rename regedit to samba-regedit.
+ * BUG 10041: Remove obsolete swat manpage and references.
+ * BUG 10048: nsswitch: Add OPT_KRB5CCNAME to avoid an error message.
+
+
+o Alexander Werth <alexander.werth at de.ibm.com>
+ * BUG 10045: Remove a redundant inlined substitution of ACLs.
+
+
+o Ralph Wuerthner <ralphw at de.ibm.com>
+ * BUG 10064: Linux kernel oplock breaks can miss signals.
#######################################
diff --git a/docs-xml/manpages/pam_winbind.conf.5.xml b/docs-xml/manpages/pam_winbind.conf.5.xml
index 7098ff4..be7f684 100644
--- a/docs-xml/manpages/pam_winbind.conf.5.xml
+++ b/docs-xml/manpages/pam_winbind.conf.5.xml
@@ -106,16 +106,35 @@
<term>krb5_ccache_type = [type]</term>
<listitem><para>
- When pam_winbind is configured to try kerberos authentication
- by enabling the <parameter>krb5_auth</parameter> option, it can
- store the retrieved Ticket Granting Ticket (TGT) in a
- credential cache. The type of credential cache can be set with
- this option. Currently the only supported value is:
- <parameter>FILE</parameter>. In that case a credential cache in
- the form of /tmp/krb5cc_UID will be created, where UID is
- replaced with the numeric user id. Leave empty to just do
- kerberos authentication without having a ticket cache after the
- logon has succeeded. This setting is empty by default.
+ When pam_winbind is configured to try kerberos authentication by
+ enabling the <parameter>krb5_auth</parameter> option, it can
+ store the retrieved Ticket Granting Ticket (TGT) in a credential
+ cache. The type of credential cache can be controlled with this
+ option. The supported values are: <parameter>FILE</parameter>
+ and <parameter>DIR</parameter> (when the DIR type is supported
+ by the system's Kerberos library). In case of FILE a credential
+ cache in the form of /tmp/krb5cc_UID will be created - in case
+ of DIR it will be located under the /run/user/UID/krb5cc
+ directory. UID is replaced with the numeric user id.</para>
+
+ <para>It is also possible to define custom filepaths and use the "%u"
+ pattern in order to substitue the numeric user id.
+ Examples:</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>krb5_ccache_type = DIR:/run/user/%u/krb5cc</term>
+ <listitem><para>This will create a credential cache file in the specified directory.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>krb5_ccache_type = FILE:/tmp/krb5cc_%u</term>
+ <listitem><para>This will create a credential cache file.</para></listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para> Leave empty to just do kerberos authentication without
+ having a ticket cache after the logon has succeeded.
+ This setting is empty by default.
</para></listitem>
</varlistentry>
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index 9299660..fd9297f 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -202,14 +202,6 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>swat</command> is a web-based
- interface to configuring <filename>smb.conf</filename>.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><citerefentry><refentrytitle>wbinfo</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>wbinfo</command> is a utility
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index dd4f858..750eef8 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -21,10 +21,8 @@
<para>
The <filename moreinfo="none">smb.conf</filename> file is a configuration file for the Samba suite. <filename
moreinfo="none">smb.conf</filename> contains runtime configuration information for the Samba programs. The
- <filename moreinfo="none">smb.conf</filename> file is designed to be configured and administered by the
- <citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> program. The
complete description of the file format and possible parameters held within are here for reference purposes.
- </para>
+ </para>
</refsect1>
<refsect1 id="FILEFORMATSECT">
@@ -800,7 +798,6 @@ chmod 1770 /usr/local/samba/lib/usershares
<para>
<citerefentry><refentrytitle>samba</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbpasswd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>swat</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>nmbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>winbindd</refentrytitle>
diff --git a/docs-xml/manpages/swat.8.xml b/docs-xml/manpages/swat.8.xml
deleted file mode 100644
index 7438938..0000000
--- a/docs-xml/manpages/swat.8.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<refentry id="swat.8">
-
-<refmeta>
- <refentrytitle>swat</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="source">Samba</refmiscinfo>
- <refmiscinfo class="manual">System Administration tools</refmiscinfo>
- <refmiscinfo class="version">4.0</refmiscinfo>
-</refmeta>
-
-
-<refnamediv>
- <refname>swat</refname>
- <refpurpose>Samba Web Administration Tool</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
- <cmdsynopsis>
- <command>swat</command>
- <arg choice="opt">-s <smb config file></arg>
- <arg choice="opt">-a</arg>
- <arg choice="opt">-P</arg>
- </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsect1>
- <title>DESCRIPTION</title>
-
- <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
- <manvolnum>7</manvolnum></citerefentry> suite.</para>
-
-
- <para><command>swat</command> allows a Samba administrator to
- configure the complex <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry> file via a Web browser. In addition,
- a <command>swat</command> configuration page has help links
- to all the configurable options in the <filename>smb.conf</filename> file allowing an
- administrator to easily look up the effects of any change. </para>
-
- <para><command>swat</command> is run from <command>inetd</command> </para>
-</refsect1>
-
-
-<refsect1>
- <title>OPTIONS</title>
-
- <variablelist>
- <varlistentry>
- <term>-s smb configuration file</term>
- <listitem><para>The default configuration file path is
- determined at compile time. The file specified contains
- the configuration details required by the <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> server. This is the file
- that <command>swat</command> will modify.
- The information in this file includes server-specific
- information such as what printcap file to use, as well as
- descriptions of all the services that the server is to provide.
- See <filename>smb.conf</filename> for more information.
- </para></listitem>
- </varlistentry>
-
-
- <varlistentry>
- <term>-a</term>
- <listitem><para>This option disables authentication and
- places <command>swat</command> in demo mode. In that mode anyone will be able to modify
- the <filename>smb.conf</filename> file. </para>
-
- <para><emphasis>WARNING: Do NOT enable this option on a production
- server. </emphasis></para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term>-P</term>
- <listitem><para>This option restricts read-only users to the password
- management page. <command>swat</command> can then be used to change
- user passwords without users seeing the "View" and "Status" menu
- buttons.</para></listitem>
- </varlistentry>
-
- &stdarg.server.debug;
- &popt.common.samba;
- &stdarg.help;
-
- </variablelist>
-
-</refsect1>
-
-<refsect1>
-
- <title>INSTALLATION</title>
-
- <para>Swat is included as binary package with most distributions. The
- package manager in this case takes care of the installation and
- configuration. This section is only for those who have compiled
- swat from scratch.
- </para>
-
- <para>After you compile SWAT you need to run <command>make install
- </command> to install the <command>swat</command> binary
- and the various help files and images. A default install would put
- these in: </para>
-
- <itemizedlist>
- <listitem><para>/usr/local/samba/sbin/swat</para></listitem>
- <listitem><para>/usr/local/samba/swat/images/*</para></listitem>
- <listitem><para>/usr/local/samba/swat/help/*</para></listitem>
- </itemizedlist>
-
- <refsect2>
- <title>Inetd Installation</title>
-
- <para>You need to edit your <filename>/etc/inetd.conf
- </filename> and <filename>/etc/services</filename>
- to enable SWAT to be launched via <command>inetd</command>.</para>
-
- <para>In <filename>/etc/services</filename> you need to
- add a line like this: </para>
-
- <para><command>swat 901/tcp</command></para>
-
- <para>Note for NIS/YP and LDAP users - you may need to rebuild the
- NIS service maps rather than alter your local <filename>
- /etc/services</filename> file. </para>
-
- <para>the choice of port number isn't really important
- except that it should be less than 1024 and not currently
- used (using a number above 1024 presents an obscure security
- hole depending on the implementation details of your
- <command>inetd</command> daemon). </para>
-
- <para>In <filename>/etc/inetd.conf</filename> you should
- add a line like this: </para>
-
- <para><command>swat stream tcp nowait.400 root
- /usr/local/samba/sbin/swat swat</command></para>
-
- <para>Once you have edited <filename>/etc/services</filename>
- and <filename>/etc/inetd.conf</filename> you need to send a
- HUP signal to inetd. To do this use <command>kill -1 PID
- </command> where PID is the process ID of the inetd daemon. </para>
-
- </refsect2>
-
-
-
-</refsect1>
-
-<refsect1>
- <title>LAUNCHING</title>
-
- <para>To launch SWAT just run your favorite web browser and
- point it at "http://localhost:901/".</para>
-
- <para>Note that you can attach to SWAT from any IP connected
- machine but connecting from a remote machine leaves your
- connection open to password sniffing as passwords will be sent
- in the clear over the wire. </para>
-</refsect1>
-
-<refsect1>
- <title>FILES</title>
-
- <variablelist>
- <varlistentry>
- <term><filename>/etc/inetd.conf</filename></term>
- <listitem><para>This file must contain suitable startup
- information for the meta-daemon.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><filename>/etc/services</filename></term>
- <listitem><para>This file must contain a mapping of service name
- (e.g., swat) to service port (e.g., 901) and protocol type
- (e.g., tcp). </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><filename>/usr/local/samba/lib/smb.conf</filename></term>
- <listitem><para>This is the default location of the <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> server configuration file that swat edits. Other
- common places that systems install this file are <filename>
- /usr/samba/lib/smb.conf</filename> and <filename>/etc/smb.conf
- </filename>. This file describes all the services the server
- is to make available to clients. </para></listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
-
-<refsect1>
- <title>WARNINGS</title>
-
- <para><command>swat</command> will rewrite your <citerefentry>
- <refentrytitle>smb.conf</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> file. It will rearrange the entries and delete all
- comments, <parameter>include=</parameter> and <parameter>copy=
- </parameter> options. If you have a carefully crafted <filename>
- smb.conf</filename> then back it up or don't use swat! </para>
-</refsect1>
-
-
-<refsect1>
- <title>VERSION</title>
-
- <para>This man page is correct for version 3 of the Samba suite.</para>
-</refsect1>
-
-<refsect1>
- <title>SEE ALSO</title>
- <para><command>inetd(5)</command>, <citerefentry>
- <refentrytitle>smbd</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>, <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
-</refsect1>
-
-<refsect1>
- <title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
- were created by Andrew Tridgell. Samba is now developed
- by the Samba Team as an Open Source project similar
- to the way the Linux kernel is developed.</para>
-
- <para>The original Samba man pages were written by Karl Auer.
- The man page sources were converted to YODL format (another
- excellent piece of Open Source software, available at <ulink url="ftp://ftp.icce.rug.nl/pub/unix/">
- ftp://ftp.icce.rug.nl/pub/unix/</ulink>) and updated for the Samba 2.0
- release by Jeremy Allison. The conversion to DocBook for
- Samba 2.2 was done by Gerald Carter. The conversion to DocBook XML 4.2 for
- Samba 3.0 was done by Alexander Bokovoy.</para>
-</refsect1>
-
-</refentry>
diff --git a/docs-xml/smbdotconf/base/bindinterfacesonly.xml b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
index 6e8321b..b9b420d 100644
--- a/docs-xml/smbdotconf/base/bindinterfacesonly.xml
+++ b/docs-xml/smbdotconf/base/bindinterfacesonly.xml
@@ -37,9 +37,8 @@
<para>
If <smbconfoption name="bind interfaces only"/> is set and the network address
<emphasis>127.0.0.1</emphasis> is not added to the <smbconfoption name="interfaces"/> parameter list
- <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> and
- <citerefentry><refentrytitle>swat</refentrytitle> <manvolnum>8</manvolnum></citerefentry> may not work as
- expected due to the reasons covered below.
+ <citerefentry><refentrytitle>smbpasswd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> may not
+ work as expected due to the reasons covered below.
</para>
<para>
@@ -54,16 +53,6 @@
machine</replaceable> set to the IP name of the primary interface of the local host.
</para>
- <para>
- The <command moreinfo="none">swat</command> status page tries to connect with <command
- moreinfo="none">smbd</command> and <command moreinfo="none">nmbd</command> at the address
- <emphasis>127.0.0.1</emphasis> to determine if they are running. Not adding <emphasis>127.0.0.1</emphasis>
- will cause <command moreinfo="none"> smbd</command> and <command moreinfo="none">nmbd</command> to always show
- "not running" even if they really are. This can prevent <command moreinfo="none"> swat</command>
- from starting/stopping/restarting <command moreinfo="none">smbd</command> and <command
- moreinfo="none">nmbd</command>.
- </para>
-
</description>
<value type="default">no</value>
</samba:parameter>
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index a75ae05..588b0b9 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -41,7 +41,6 @@ manpages='''
manpages/smbta-util.8
manpages/smbtar.1
manpages/smbtree.1
- manpages/swat.8
manpages/testparm.1
manpages/vfs_acl_tdb.8
manpages/vfs_acl_xattr.8
diff --git a/examples/pam_winbind/pam_winbind.conf b/examples/pam_winbind/pam_winbind.conf
index dd0b112..87bc388 100644
--- a/examples/pam_winbind/pam_winbind.conf
+++ b/examples/pam_winbind/pam_winbind.conf
@@ -3,6 +3,7 @@
#
# /etc/security/pam_winbind.conf
#
+# For more details see man pam_winbind.conf(5)
--
Samba Shared Repository
More information about the samba-cvs
mailing list