[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Dec 3 08:29:02 MST 2012
The branch, master has been updated
via d913fb1 docs: Merge both samba.8 manpages.
via 0e69a7b docs: Add samba.8 and samba-tool manpage to waf build.
via b7f66b4 docs: Update man 7 samba.
via 4af921f lib/talloc: Move manpage to man/.
via ede2aae lib/tdb: Rename manpages/ to man/.
via 5323508 replace: Remove deprecated getpass() support.
via ce29ecf ntlm_auth4: Use new samba_getpass() function.
via 7cc108c cmdline: Use new samba_getpass() function.
via de1288e smbget: Use new samba_getpass() function.
via 353e83e util: Use new samba_getpass() function for passwd util.
via 7f4af3d ntlm_auth: Use new samba_getpass() function.
via 270d721 net: Use samba_getpass() function in net util.
via 0d5f542 net: Use new samba_getpass() function for 'net rpc'.
via bed6012 net: Use new samba_getpass() function for 'net ads'.
via 1ded99c torture: Use new samba_getpass() in masktest.
via 531af0a torture: Use new samba_getpass() in smbtorture3.
via 17bcdb5 torture: Use new samba_getpass() in locktest2.
via 3c79f85 util: Use new samba_getpass() function.
via 85b1b84 smbclient: Use new samba_getpass() function.
via 04c0d48 wbinfo: Use new samba_getpass() function.
via 27a1327 util: Add a UNIX platform independent samba_getpass().
from 42a2365 docs: Fix typo in the howto collection.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d913fb1304378bdc8aac2543144d39ffa486f862
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
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Mon Dec 3 16:28:32 CET 2012 on sn-devel-104
commit 0e69a7ba114ed5e0ad94e4ed7bb41d7eb0294b16
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
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b7f66b43c512932e5265b974012e48d5631767b0
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
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4af921fe882b59d8ad16b2b906e74c28b1b36c20
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
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ede2aaef281048123cacab9ae879f5c546787080
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
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 532350877322cd3446cfa65459e82a45d5cef76c
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:58:38 2012 +0100
replace: Remove deprecated getpass() support.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit ce29ecfd44613e4f3bae98418add1cc4d0ed59ab
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:55:48 2012 +0100
ntlm_auth4: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 7cc108c93cd10ac592c28605f2c1e366a7e507b2
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:48:00 2012 +0100
cmdline: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit de1288e13eb132768d22ae8c2f34a5e99bddcb33
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:38:14 2012 +0100
smbget: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 353e83e4ee21e5d7955b79e3d1da046f3d1c96e1
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:34:39 2012 +0100
util: Use new samba_getpass() function for passwd util.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 7f4af3d1fb0827714c8637ecc780ef9d88604bc4
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 14:29:38 2012 +0100
ntlm_auth: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 270d721d36890a13ec9a393a09925d1ca27a337f
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 13:17:13 2012 +0100
net: Use samba_getpass() function in net util.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 0d5f5424b4b86c16d51a5793fa93c3bfe3cdb11a
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 23 15:05:51 2012 +0100
net: Use new samba_getpass() function for 'net rpc'.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit bed60120d49f3285070db130974fa385b9b57b37
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:51:33 2012 +0100
net: Use new samba_getpass() function for 'net ads'.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 1ded99cd1447b674a7af6e738a492a597425b6ba
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:46:20 2012 +0100
torture: Use new samba_getpass() in masktest.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 531af0af1a178fbae82ae2d84598e44d8a750fae
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:46:06 2012 +0100
torture: Use new samba_getpass() in smbtorture3.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 17bcdb52001f4625439c0c6fea2cfe174b63ce08
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:39:34 2012 +0100
torture: Use new samba_getpass() in locktest2.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 3c79f85b6ec8e99bd58e615b692bbef1284fef03
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:34:06 2012 +0100
util: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 85b1b840cbed92a5657e20407fe22dc9e8591af5
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:33:52 2012 +0100
smbclient: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 04c0d4878e3bb28b8ba8116abb0de4527eb96bd6
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:33:10 2012 +0100
wbinfo: Use new samba_getpass() function.
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 27a1327b49210e342741cf8fb11576983cbcc36d
Author: Andreas Schneider <asn at samba.org>
Date: Thu Nov 22 15:22:40 2012 +0100
util: Add a UNIX platform independent samba_getpass().
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/samba.7.xml | 195 ++++++++++++++-----------
docs-xml/manpages/samba.8.xml | 108 ++++++++++++-
docs-xml/wscript_build | 2 +
lib/replace/README | 1 -
lib/replace/getpass.c | 218 ---------------------------
lib/replace/getpass.m4 | 24 ---
lib/replace/libreplace.m4 | 1 -
lib/replace/replace.h | 11 --
lib/replace/system/passwd.h | 11 --
lib/replace/test/testsuite.c | 7 -
lib/replace/wscript | 12 --
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 +-
lib/util/getpass.c | 224 ++++++++++++++++++++++++++++
lib/util/samba_util.h | 40 +++++
lib/util/wscript_build | 2 +-
nsswitch/wbinfo.c | 15 ++-
source3/Makefile.in | 2 +-
source3/client/client.c | 9 +-
source3/lib/util_cmdline.c | 9 +-
source3/torture/locktest2.c | 9 +-
source3/torture/masktest.c | 7 +-
source3/torture/torture.c | 9 +-
source3/utils/net_ads.c | 10 +-
source3/utils/net_rpc.c | 9 +-
source3/utils/net_util.c | 10 +-
source3/utils/ntlm_auth.c | 8 +-
source3/utils/passwd_util.c | 9 +-
source3/utils/smbget.c | 5 +-
source4/lib/cmdline/credentials.c | 14 +-
source4/smbd/samba.8.xml | 181 ----------------------
source4/smbd/wscript_build | 1 -
source4/utils/ntlm_auth.c | 8 +-
38 files changed, 598 insertions(+), 623 deletions(-)
delete mode 100644 lib/replace/getpass.c
delete mode 100644 lib/replace/getpass.m4
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 (98%)
rename lib/tdb/{manpages => man}/tdbrestore.8.xml (100%)
rename lib/tdb/{manpages => man}/tdbtool.8.xml (99%)
create mode 100644 lib/util/getpass.c
delete mode 100644 source4/smbd/samba.8.xml
Changeset truncated at 500 lines:
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>
+
+ <para>This file describes all the services the server
+ is to make available to clients. See <citerefentry><refentrytitle>smb.conf</refentrytitle>
+ <manvolnum>5</manvolnum></citerefentry> for more information.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
<refsect1>
+ <title>DIAGNOSTICS</title>
+
+ <para>Most diagnostics issued by the server are logged
--
Samba Shared Repository
More information about the samba-cvs
mailing list