[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Mon Dec 3 14:33:03 MST 2012
The branch, v4-0-test has been updated
via e0e7437 docs: Fix typo in the howto collection.
via fabb2fd docs: Update man 7 samba.
via 05fa60f docs: Merge both samba.8 manpages.
via 2888d32 docs: Add samba.8 and samba-tool manpage to waf build.
via 1f92994 lib/talloc: Move manpage to man/.
via 83fb3ee lib/tdb: Rename manpages/ to man/.
via af88aeb s3-net: Fix DEBUG() location.
via 9032ddf s3-net: give more control how to update/register DNS entries.
via 64047e3 s3-net: pass down a flags field to DoDNSUpdate().
via d2f5c83 s3-net: move out some prototypes to net_dns.h.
via 95e91cb s3-net: pass down struct net_context to the dns update calls.
via fb7e960 s3:passdb: fix building pdb_ldap as shared module
from f86b276 WHATSNEW: Update changes since rc5.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit e0e7437dc1471a5aa8494906ce27406b4e423845
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Dec 3 09:08:47 2012 +0100
docs: Fix typo in the howto collection.
Thanks to Hermann Gausterer <git-samba-2012 at mrq1.org> for reporting!
Karolin
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Mon Dec 3 12:36:14 CET 2012 on sn-devel-104
(cherry picked from commit 42a23653237bfc89ba90d83d91942746825e3ee9)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Mon Dec 3 22:32:02 CET 2012 on sn-devel-104
commit fabb2fda91d6b5ea50911d3ac69927990b55901c
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 30 11:37:33 2012 +0100
docs: Update man 7 samba.
Update man 7 samba. Still incomplete, but at least a bit more up to date.
Karolin
Fix bug #9445 - samba.7 outdated.
commit 05fa60feb506b820431f54c61339fb1f02b0e42b
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 30 11:33:04 2012 +0100
docs: Merge both samba.8 manpages.
Remove source4/smbd/samba.8.xml and add the additional content to
docs-xml/samba.8.xml to be able to build this manpage with the autoconf build
also.
Karolin
Fix bug #9444 - samba.8 not built with autoconf.
commit 2888d32981ce6bc7bcb098f75897e94b26cf9727
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 30 10:39:06 2012 +0100
docs: Add samba.8 and samba-tool manpage to waf build.
Karolin
commit 1f92994784d4ae0e071894fd9ac54618109459d7
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 30 09:43:33 2012 +0100
lib/talloc: Move manpage to man/.
Trying to be more consistent.
Karolin
The last 2 patches address bug #9443 - Manpages of the libraries are located in
different subdirectories.
commit 83fb3ee0af6b5ad395a7915161a40d3845a661f5
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Nov 30 09:39:22 2012 +0100
lib/tdb: Rename manpages/ to man/.
Trying to be more consistent.
Karolin
commit af88aebd5ec1e810461a13bea677d77b62116cc5
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 1 16:19:28 2012 +0200
s3-net: Fix DEBUG() location.
Guenther
Autobuild-User(master): Günther Deschner <gd at samba.org>
Autobuild-Date(master): Tue Oct 2 18:06:17 CEST 2012 on sn-devel-104
Signed-off-by: Günther Deschner <gd at samba.org>
The last 5 patches address bug #9451 - Allow to force DNS updates using net.
commit 9032ddf51373fcf0eb75b5502c9935500801f36f
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 25 11:09:45 2012 +0200
s3-net: give more control how to update/register DNS entries.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
commit 64047e3c486c9b301f582ce8424aea638ace4a36
Author: Günther Deschner <gd at samba.org>
Date: Tue Sep 25 11:08:48 2012 +0200
s3-net: pass down a flags field to DoDNSUpdate().
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
commit d2f5c835406c116dd09ba610803b08e1abb09911
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 19 15:35:15 2012 +0200
s3-net: move out some prototypes to net_dns.h.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
commit 95e91cb0a9615db9d919fbaeb6a67ec64627fede
Author: Günther Deschner <gd at samba.org>
Date: Wed Sep 19 15:31:57 2012 +0200
s3-net: pass down struct net_context to the dns update calls.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
commit fb7e960e478152f5b11f21d354b31efcda4d6239
Author: Michael Adam <obnox at samba.org>
Date: Mon Dec 3 16:52:12 2012 +0100
s3:passdb: fix building pdb_ldap as shared module
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Dec 3 19:12:29 CET 2012 on sn-devel-104
(cherry picked from commit 61e8b80c85bf114da7f1d3dadfc2207564f5fbaa)
Fix bug #9453 - pdb_ldap fails to build as shared module.
-----------------------------------------------------------------------
Summary of changes:
docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml | 2 +-
docs-xml/manpages/samba.7.xml | 195 ++++++++++++++++------------
docs-xml/manpages/samba.8.xml | 108 ++++++++++++++-
docs-xml/wscript_build | 2 +
lib/talloc/{ => man}/talloc.3.xml | 24 ++--
lib/talloc/wscript | 2 +-
lib/tdb/{manpages => man}/tdbbackup.8.xml | 6 +-
lib/tdb/{manpages => man}/tdbdump.8.xml | 8 +-
lib/tdb/{manpages => man}/tdbrestore.8.xml | 0
lib/tdb/{manpages => man}/tdbtool.8.xml | 2 +-
lib/tdb/wscript | 8 +-
source3/passdb/ABI/pdb-0.sigs | 1 +
source3/passdb/pdb_interface.c | 4 +-
source3/utils/net_ads.c | 44 ++++---
source3/utils/net_dns.c | 96 ++++++++------
source3/utils/net_dns.h | 43 ++++++
source4/smbd/samba.8.xml | 181 --------------------------
source4/smbd/wscript_build | 1 -
18 files changed, 366 insertions(+), 361 deletions(-)
rename lib/talloc/{ => man}/talloc.3.xml (99%)
rename lib/tdb/{manpages => man}/tdbbackup.8.xml (97%)
rename lib/tdb/{manpages => man}/tdbdump.8.xml (97%)
rename lib/tdb/{manpages => man}/tdbrestore.8.xml (100%)
rename lib/tdb/{manpages => man}/tdbtool.8.xml (99%)
create mode 100644 source3/utils/net_dns.h
delete mode 100644 source4/smbd/samba.8.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index f2f3a30..2b12e11 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -309,7 +309,7 @@ Ideally, the implementation of SSO should reduce complexity and reduce administa
The initial goal of many network administrators is often to create and use a centralized identity management
system. It is often assumed that such a centralized system will use a single authentication infrastructure
that can be used by all information systems. The Microsoft Windows NT4 security domain architecture and the
-Micrsoft active directory service are often put forward as the ideal foundation for such a system. It is
+Microsoft active directory service are often put forward as the ideal foundation for such a system. It is
conceptually simple to install an external authentication agent on each of the disparate infromation systems
that can then use the Microsoft (NT4 domain or ads service) for user authentication and access control. The
wonderful dream of a single centralized authentication service is commonly broken when realities are realized.
diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml
index aa7684b..9299660 100644
--- a/docs-xml/manpages/samba.7.xml
+++ b/docs-xml/manpages/samba.7.xml
@@ -13,7 +13,7 @@
<refnamediv>
<refname>samba</refname>
- <refpurpose>A Windows SMB/CIFS fileserver for UNIX</refpurpose>
+ <refpurpose>A Windows AD and SMB/CIFS fileserver for UNIX</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -22,51 +22,80 @@
<refsect1>
<title>DESCRIPTION</title>
-
- <para>The Samba software suite is a collection of programs
- that implements the Server Message Block (commonly abbreviated
- as SMB) protocol for UNIX systems. This protocol is sometimes
- also referred to as the Common Internet File System (CIFS). For a
- more thorough description, see <ulink url="http://www.ubiqx.org/cifs/">
+
+ <para>The Samba software suite is a collection of programs
+ that implements the Server Message Block (commonly abbreviated
+ as SMB) protocol for UNIX systems and provides Active Directory
+ services. This protocol is sometimes also referred to as the
+ Common Internet File System (CIFS). For a more thorough description,
+ see <ulink url="http://www.ubiqx.org/cifs/">
http://www.ubiqx.org/cifs/</ulink>. Samba also implements the NetBIOS
protocol in nmbd.</para>
-
+
<variablelist>
<varlistentry>
+ <term><citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para>The <command>samba</command> daemon provides the
+ Active Directory services and file and print services to
+ SMB clients. The configuration file
+ for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>smbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbd</command> daemon provides the file and print services to
- SMB clients, such as Windows 95/98, Windows NT, Windows
- for Workgroups or LanManager. The configuration file
+ <listitem><para>The <command>smbd</command> daemon provides the file and print services to
+ SMB clients, such as Windows 95/98, Windows NT, Windows
+ for Workgroups or LanManager. The configuration file
for this daemon is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry>
+ <manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><citerefentry><refentrytitle>nmbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
<listitem><para>The <command>nmbd</command>
daemon provides NetBIOS nameservice and browsing
- support. The configuration file for this daemon
+ support. The configuration file for this daemon
is described in <citerefentry><refentrytitle>smb.conf</refentrytitle>
- <manvolnum>5</manvolnum></citerefentry></para>
+ <manvolnum>5</manvolnum></citerefentry>.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term><citerefentry><refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para><command>winbindd</command> is a daemon
+ that is used for integrating authentication and
+ the user database into unix.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>smbclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>smbclient</command>
- program implements a simple ftp-like client. This
+ program implements a simple ftp-like client. This
is useful for accessing SMB shares on other compatible
- servers (such as Windows NT), and can also be used
- to allow a UNIX box to print to a printer attached to
+ servers (such as Windows NT), and can also be used
+ to allow a UNIX box to print to a printer attached to
any SMB server (such as a PC running Windows NT).</para>
</listitem>
</varlistentry>
<varlistentry>
+ <term><citerefentry><refentrytitle>samba-tool</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry></term>
+ <listitem><para>The <command>samba-tool</command>
+ is the main Samba Administration tool regarding
+ Acitive Directory services.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><citerefentry><refentrytitle>testparm</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>testparm</command>
@@ -79,7 +108,7 @@
<term><citerefentry><refentrytitle>smbstatus</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>smbstatus</command>
- tool provides access to information about the
+ tool provides access to information about the
current connections to <command>smbd</command>.</para>
</listitem>
</varlistentry>
@@ -88,7 +117,7 @@
<term><citerefentry><refentrytitle>nmblookup</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para>The <command>nmblookup</command>
- tools allows NetBIOS name queries to be made
+ tools allows NetBIOS name queries to be made
from a UNIX host.</para>
</listitem>
</varlistentry>
@@ -97,7 +126,7 @@
<term><citerefentry><refentrytitle>smbpasswd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
<listitem><para>The <command>smbpasswd</command>
- command is a tool for changing LanMan and Windows NT
+ command is a tool for changing LanMan and Windows NT
password hashes on Samba and Windows NT servers.</para>
</listitem>
</varlistentry>
@@ -105,7 +134,7 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbcacls</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbcacls</command> command is
+ <listitem><para>The <command>smbcacls</command> command is
a tool to set ACL's on remote CIFS servers. </para>
</listitem>
</varlistentry>
@@ -113,22 +142,22 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbtree</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtree</command> command
+ <listitem><para>The <command>smbtree</command> command
is a text-based network neighborhood tool.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>smbtar</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>smbtar</command> can make
+ <listitem><para>The <command>smbtar</command> can make
backups of data on CIFS/SMB servers.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>smbspool</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>smbspool</command> is a
- helper utility for printing on printers connected
+ <listitem><para><command>smbspool</command> is a
+ helper utility for printing on printers connected
to CIFS servers. </para></listitem>
</varlistentry>
@@ -136,7 +165,9 @@
<term><citerefentry><refentrytitle>smbcontrol</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>smbcontrol</command> is a utility
- that can change the behaviour of running samba daemons.
+ that can change the behaviour of running
+ <command>smbd</command>, <command>nmbd</command> and
+ <command>winbindd</command> daemons.
</para></listitem>
</varlistentry>
@@ -144,28 +175,28 @@
<term><citerefentry><refentrytitle>rpcclient</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
<listitem><para><command>rpcclient</command> is a utility
- that can be used to execute RPC commands on remote
+ that can be used to execute RPC commands on remote
CIFS servers.</para></listitem>
</varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>pdbedit</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>pdbedit</command> command
- can be used to maintain the local user database on
+ <listitem><para>The <command>pdbedit</command> command
+ can be used to maintain the local user database on
a samba server.</para></listitem></varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>findsmb</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para>The <command>findsmb</command> command
+ <listitem><para>The <command>findsmb</command> command
can be used to find SMB servers on the local network.
</para></listitem></varlistentry>
<varlistentry>
<term><citerefentry><refentrytitle>net</refentrytitle>
<manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para>The <command>net</command> command
+ <listitem><para>The <command>net</command> command
is supposed to work similar to the DOS/Windows
NET.EXE command.</para></listitem>
</varlistentry>
@@ -179,17 +210,9 @@
</varlistentry>
<varlistentry>
- <term><citerefentry><refentrytitle>winbindd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry></term>
- <listitem><para><command>winbindd</command> is a daemon
- that is used for integrating authentication and
- the user database into unix.</para></listitem>
- </varlistentry>
-
- <varlistentry>
<term><citerefentry><refentrytitle>wbinfo</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>wbinfo</command> is a utility
+ <listitem><para><command>wbinfo</command> is a utility
that retrieves and stores information related to winbind.
</para></listitem>
</varlistentry>
@@ -206,8 +229,8 @@
<varlistentry>
<term><citerefentry><refentrytitle>log2pcap</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>log2pcap</command> is a utility
- for generating pcap trace files from Samba log
+ <listitem><para><command>log2pcap</command> is a utility
+ for generating pcap trace files from Samba log
files.</para></listitem>
</varlistentry>
@@ -228,7 +251,7 @@
<varlistentry>
<term><citerefentry><refentrytitle>smbcquotas</refentrytitle>
<manvolnum>1</manvolnum></citerefentry></term>
- <listitem><para><command>smbcquotas</command> is a tool that
+ <listitem><para><command>smbcquotas</command> is a tool that
can set remote QUOTA's on server with NTFS 5. </para>
</listitem>
</varlistentry>
@@ -237,11 +260,11 @@
<refsect1>
<title>COMPONENTS</title>
-
- <para>The Samba suite is made up of several components. Each
- component is described in a separate manual page. It is strongly
- recommended that you read the documentation that comes with Samba
- and the manual pages of those components that you use. If the
+
+ <para>The Samba suite is made up of several components. Each
+ component is described in a separate manual page. It is strongly
+ recommended that you read the documentation that comes with Samba
+ and the manual pages of those components that you use. If the
manual pages and documents aren't clear enough then please visit
<ulink url="http://devel.samba.org/">http://devel.samba.org</ulink>
for information on how to file a bug report or submit a patch.</para>
@@ -254,79 +277,79 @@
<refsect1>
<title>AVAILABILITY</title>
-
- <para>The Samba software suite is licensed under the
- GNU Public License(GPL). A copy of that license should
- have come with the package in the file COPYING. You are
- encouraged to distribute copies of the Samba suite, but
+
+ <para>The Samba software suite is licensed under the
+ GNU Public License(GPL). A copy of that license should
+ have come with the package in the file COPYING. You are
+ encouraged to distribute copies of the Samba suite, but
please obey the terms of this license.</para>
- <para>The latest version of the Samba suite can be
+ <para>The latest version of the Samba suite can be
obtained via anonymous ftp from samba.org in the
- directory pub/samba/. It is also available on several
+ directory pub/samba/. It is also available on several
mirror sites worldwide.</para>
-
- <para>You may also find useful information about Samba
+
+ <para>You may also find useful information about Samba
on the newsgroup <ulink url="news:comp.protocols.smb">
- comp.protocol.smb</ulink> and the Samba mailing
- list. Details on how to join the mailing list are given in
+ comp.protocol.smb</ulink> and the Samba mailing
+ list. Details on how to join the mailing list are given in
the README file that comes with Samba.</para>
-
+
<para>If you have access to a WWW viewer (such as Mozilla
- or Konqueror) then you will also find lots of useful information,
+ or Konqueror) then you will also find lots of useful information,
including back issues of the Samba mailing list, at
<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.</para>
</refsect1>
<refsect1>
<title>VERSION</title>
-
- <para>This man page is correct for version 3 of the
+
+ <para>This man page is correct for version 4 of the
Samba suite. </para>
</refsect1>
<refsect1>
<title>CONTRIBUTIONS</title>
-
- <para>If you wish to contribute to the Samba project,
- then I suggest you join the Samba mailing list at
+
+ <para>If you wish to contribute to the Samba project,
+ then I suggest you join the Samba mailing list at
<ulink url="http://lists.samba.org/">http://lists.samba.org</ulink>.
</para>
<para>If you have patches to submit, visit
<ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>
- for information on how to do it properly. We prefer patches
- in <command>diff -u</command> format.</para>
+ for information on how to do it properly. We prefer patches
+ in <command>git format-patch</command> format.</para>
</refsect1>
<refsect1>
<title>CONTRIBUTORS</title>
-
- <para>Contributors to the project are now too numerous
- to mention here but all deserve the thanks of all Samba
+
+ <para>Contributors to the project are now too numerous
+ to mention here but all deserve the thanks of all Samba
users. To see a full list, look at the
- <filename>change-log</filename> in the source package
- for the pre-CVS changes and at <ulink
- url="http://cvs.samba.org/">
- http://cvs.samba.org/</ulink>
- for the contributors to Samba post-CVS. CVS is the Open Source
- source code control system used by the Samba Team to develop
+ <filename>change-log</filename> in the source package
+ for the pre-CVS changes and at <ulink
+ url="http://git.samba.org/">
+ http://git.samba.org/</ulink>
+ for the contributors to Samba post-GIT. GIT is the Open Source
+ source code control system used by the Samba Team to develop
Samba. The project would have been unmanageable without it.</para>
</refsect1>
<refsect1>
<title>AUTHOR</title>
-
- <para>The original Samba software and related utilities
+
+ <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
+ 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
+
+ <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
+ 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>
diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml
index 229e941..9ce65c8 100644
--- a/docs-xml/manpages/samba.8.xml
+++ b/docs-xml/manpages/samba.8.xml
@@ -44,6 +44,29 @@
<para><command>samba</command> is the server daemon that
provides Active Directory, filesharing and printing services to clients.
+ The server provides filespace and directory services to
+ clients using the SMB (or CIFS) protocol and other
+ related protocols such as DCE/RPC, LDAP and Kerberos.
+ </para>
+
+ <para>
+ Clients supported include MSCLIENT 3.0 for DOS, Windows for
+ Workgroups, Windows 95/98/ME, Windows NT, Windows 2000/XP/2003,
+ OS/2, DAVE for Macintosh, and cifsfs for Linux.</para>
+
+ <para>An extensive description of the services that the
+ server can provide is given in the man page for the
+ configuration file controlling the attributes of those
+ services (see <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry>. This man page will not describe the
+ services, but will concentrate on the administrative aspects
+ of running the server.
+ </para>
+
+ <para>Please note that there are significant security
+ implications to running this server, and the <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry> manual page should be regarded as mandatory reading before
+ proceeding with installation.
</para>
</refsect1>
@@ -71,13 +94,21 @@
server to run "interactively", not as a daemon, even if the
server is executed on the command line of a shell. Setting this
parameter negates the implicit daemon mode when run from the
- command line.
+ command line. <command>samba</command> also logs to standard
+ output, as if the <command>-S</command> parameter had been
+ given.
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-M|--model</term>
- <listitem><para>Select process model.
+ <term>-M model</term>
+ <listitem><para>This parameter can be used to specify the
+ "process model" samba should use. This determines
+ how concurrent clients are handled. Available process
+ models include <emphasis>single</emphasis> (everything in
+ a single process), <emphasis>standard</emphasis> (similar
+ behaviour to that of Samba 3), <emphasis>thread</emphasis>
+ (single process, different threads.
</para></listitem>
</varlistentry>
@@ -147,11 +178,67 @@
<term>-V|--version</term>
<listitem><para>Print version.</para></listitem>
</varlistentry>
+ </variablelist>
+</refsect1>
+<refsect1>
+ <title>FILES</title>
+
+ <variablelist>
+ <varlistentry>
+ <term><filename>/etc/rc</filename></term>
+ <listitem><para>or whatever initialization script your
+ system uses).</para>
+
+ <para>If running the server as a daemon at startup,
+ this file will need to contain an appropriate startup
+ sequence for the server. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><filename>/etc/services</filename></term>
+ <listitem><para>If running the server via the
+ meta-daemon <command>inetd</command>, this file
+ must contain a mapping of service name (e.g., netbios-ssn)
+ to service port (e.g., 139) 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. Other common places that systems
+ install this file are <filename>/usr/samba/lib/smb.conf</filename>
+ and <filename>/etc/samba/smb.conf</filename>.</para>
--
Samba Shared Repository
More information about the samba-cvs
mailing list