summaryrefslogtreecommitdiff
path: root/docs/docbook/manpages
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docbook/manpages')
-rw-r--r--docs/docbook/manpages/nmbd.8.sgml85
-rw-r--r--docs/docbook/manpages/smb.conf.5.sgml142
-rw-r--r--docs/docbook/manpages/smbclient.1.sgml89
-rw-r--r--docs/docbook/manpages/smbcontrol.1.sgml21
-rw-r--r--docs/docbook/manpages/smbd.8.sgml4
-rw-r--r--docs/docbook/manpages/smbmount.8.sgml2
-rw-r--r--docs/docbook/manpages/smbsh.1.sgml130
-rw-r--r--docs/docbook/manpages/wbinfo.1.sgml45
-rw-r--r--docs/docbook/manpages/winbindd.8.sgml15
9 files changed, 438 insertions, 95 deletions
diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml
index 46f36834df..d5c89064e7 100644
--- a/docs/docbook/manpages/nmbd.8.sgml
+++ b/docs/docbook/manpages/nmbd.8.sgml
@@ -177,13 +177,14 @@
<listitem><para>The -l parameter specifies a directory
into which the "log.nmbd" log file will be created
for operational data from the running
- <command>nmbd</command> server.</para>
-
- <para>The default log directory is compiled into Samba
+ <command>nmbd</command> server. The default log directory is compiled into Samba
as part of the build process. Common defaults are <filename>
/usr/local/samba/var/log.nmb</filename>, <filename>
/usr/samba/var/log.nmb</filename> or
- <filename>/var/log/log.nmb</filename>.</para></listitem>
+ <filename>/var/log/log.nmb</filename>. <emphasis>Beware:</emphasis>
+ If the directory specified does not exist, <command>nmbd</command>
+ will log to the default debug log location defined at compile time.
+ </para></listitem>
</varlistentry>
@@ -198,25 +199,25 @@
<filename>smb.conf</filename>.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term>-p &lt;UDP port number&gt;</term>
<listitem><para>UDP port number is a positive integer value.
- This option changes the default UDP port number (normally 137)
- that <command>nmbd</command> responds to name queries on. Don't
- use this option unless you are an expert, in which case you
+ This option changes the default UDP port number (normally 137)
+ that <command>nmbd</command> responds to name queries on. Don't
+ use this option unless you are an expert, in which case you
won't need help!</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term>-s &lt;configuration file&gt;</term>
- <listitem><para>The default configuration file name
+ <listitem><para>The default configuration file name
is set at build time, typically as <filename>
/usr/local/samba/lib/smb.conf</filename>, but
this may be changed when Samba is autoconfigured.</para>
- <para>The file specified contains the configuration details
- required by the server. See <ulink url="smb.conf.5.html">
+ <para>The file specified contains the configuration details
+ required by the server. See <ulink url="smb.conf.5.html">
<filename>smb.conf(5)</filename></ulink> for more information.
</para></listitem>
</varlistentry>
@@ -229,55 +230,55 @@
<variablelist>
<varlistentry>
<term><filename>/etc/inetd.conf</filename></term>
- <listitem><para>If the server is to be run by the
- <command>inetd</command> meta-daemon, this file
- must contain suitable startup information for the
+ <listitem><para>If the server is to be run by the
+ <command>inetd</command> meta-daemon, this file
+ must contain suitable startup information for the
meta-daemon. See the <ulink
url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
for details.
</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><filename>/etc/rc</filename></term>
- <listitem><para>or whatever initialization script your
+ <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
+ <para>If running the server as a daemon at startup,
+ this file will need to contain an appropriate startup
sequence for the server. See the <ulink
url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink> document
for details.</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).
+ <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).
See the <ulink url="UNIX_INSTALL.html">UNIX_INSTALL.html</ulink>
document for details.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term><filename>/usr/local/samba/lib/smb.conf</filename></term>
- <listitem><para>This is the default location of the
+ <listitem><para>This is the default location of the
<ulink url="smb.conf.5.html"><filename>smb.conf</filename></ulink>
- server configuration file. Other common places that systems
- install this file are <filename>/usr/samba/lib/smb.conf</filename>
+ server configuration file. Other common places that systems
+ install this file are <filename>/usr/samba/lib/smb.conf</filename>
and <filename>/etc/smb.conf</filename>.</para>
-
- <para>When run as a WINS server (see the
+
+ <para>When run as a WINS server (see the
<ulink url="smb.conf.5.html#WINSSUPPORT">wins support</ulink>
parameter in the <filename>smb.conf(5)</filename> man page),
<command>nmbd</command>
- will store the WINS database in the file <filename>wins.dat</filename>
- in the <filename>var/locks</filename> directory configured under
+ will store the WINS database in the file <filename>wins.dat</filename>
+ in the <filename>var/locks</filename> directory configured under
wherever Samba was configured to install itself.</para>
<para>If <command>nmbd</command> is acting as a <emphasis>
- browse master</emphasis> (see the <ulink
+ browse master</emphasis> (see the <ulink
url="smb.conf.5.html#LOCALMASTER">local master</ulink>
parameter in the <filename>smb.conf(5)</filename> man page,
<command>nmbd</command>
@@ -292,20 +293,20 @@
<refsect1>
<title>SIGNALS</title>
- <para>To shut down an <command>nmbd</command> process it is recommended
- that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last
- resort, as this may leave the name database in an inconsistent state.
- The correct way to terminate <command>nmbd</command> is to send it
+ <para>To shut down an <command>nmbd</command> process it is recommended
+ that SIGKILL (-9) <emphasis>NOT</emphasis> be used, except as a last
+ resort, as this may leave the name database in an inconsistent state.
+ The correct way to terminate <command>nmbd</command> is to send it
a SIGTERM (-15) signal and wait for it to die on its own.</para>
- <para><command>nmbd</command> will accept SIGHUP, which will cause
+ <para><command>nmbd</command> will accept SIGHUP, which will cause
it to dump out its namelists into the file <filename>namelist.debug
- </filename> in the <filename>/usr/local/samba/var/locks</filename>
- directory (or the <filename>var/locks</filename> directory configured
- under wherever Samba was configured to install itself). This will also
+ </filename> in the <filename>/usr/local/samba/var/locks</filename>
+ directory (or the <filename>var/locks</filename> directory configured
+ under wherever Samba was configured to install itself). This will also
cause <command>nmbd</command> to dump out its server database in
the <filename>log.nmb</filename> file.</para>
-
+
<para>The debug log level of nmbd may be raised or lowered using
<ulink url="smbcontrol.1.html"><command>smbcontrol(1)</command>
</ulink> (SIGUSR[1|2] signals are no longer used in Samba 2.2). This is
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 4a6de97f92..e8846e4b26 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -542,8 +542,10 @@
steps fail, then the connection request is rejected. However, if one of the
steps succeeds, then the following steps are not checked.</para>
- <para>If the service is marked "guest only = yes" then
- steps 1 to 5 are skipped.</para>
+ <para>If the service is marked "guest only = yes" and the
+ server is running with share-level security ("security = share")
+ then steps 1 to 5 are skipped.</para>
+
<orderedlist numeration="Arabic">
<listitem><para>If the client has passed a username/password
@@ -653,6 +655,9 @@
<listitem><para><link linkend="LOCALMASTER"><parameter>local master</parameter></link></para></listitem>
<listitem><para><link linkend="LOCKDIR"><parameter>lock dir</parameter></link></para></listitem>
<listitem><para><link linkend="LOCKDIRECTORY"><parameter>lock directory</parameter></link></para></listitem>
+ <listitem><para><link linkend="LOCKSPINCOUNT"><parameter>lock spin count</parameter></link></para></listitem>
+ <listitem><para><link linkend="LOCKSPINTIME"><parameter>lock spin time</parameter></link></para></listitem>
+ <listitem><para><link linkend="PIDDIRECTORY"><parameter>pid directory</parameter></link></para></listitem>
<listitem><para><link linkend="LOGFILE"><parameter>log file</parameter></link></para></listitem>
<listitem><para><link linkend="LOGLEVEL"><parameter>log level</parameter></link></para></listitem>
<listitem><para><link linkend="LOGONDRIVE"><parameter>logon drive</parameter></link></para></listitem>
@@ -833,6 +838,7 @@
<listitem><para><link linkend="HOSTSALLOW"><parameter>hosts allow</parameter></link></para></listitem>
<listitem><para><link linkend="HOSTSDENY"><parameter>hosts deny</parameter></link></para></listitem>
<listitem><para><link linkend="INCLUDE"><parameter>include</parameter></link></para></listitem>
+ <listitem><para><link linkend="INHERITACLS"><parameter>inherit acls</parameter></link></para></listitem>
<listitem><para><link linkend="INHERITPERMISSIONS"><parameter>inherit permissions</parameter></link></para></listitem>
<listitem><para><link linkend="INVALIDUSERS"><parameter>invalid users</parameter></link></para></listitem>
<listitem><para><link linkend="LEVEL2OPLOCKS"><parameter>level2 oplocks</parameter></link></para></listitem>
@@ -3094,6 +3100,24 @@
<varlistentry>
+ <term><anchor id="INHERITACLS">inherit acls (S)</term>
+ <listitem><para>This parameter can be used to ensure
+ that if default acls exist on parent directories,
+ they are always honored when creating a subdirectory.
+ The default behavior is to use the mode specified
+ when creating the directory. Enabling this option
+ sets the mode to 0777, thus guaranteeing that
+ default directory acls are propagated.
+ </para>
+
+ <para>Default: <command>inherit acls = no</command>
+ </para></listitem>
+ </varlistentry>
+
+
+
+
+ <varlistentry>
<term><anchor id="INHERITPERMISSIONS">inherit permissions (S)</term>
<listitem><para>The permissions on new files and directories
are normally governed by <link linkend="CREATEMASK"><parameter>
@@ -3601,6 +3625,39 @@
<varlistentry>
+ <term><anchor id="LOCKSPINCOUNT">lock spin count (G)</term>
+ <listitem><para>This parameter controls the number of times
+ that smbd should attempt to gain a byte range lock on the
+ behalf of a client request. Experiments have shown that
+ Windows 2k servers do not reply with a failure if the lock
+ could not be immediately granted, but try a few more times
+ in case the lock could later be aquired. This behavior
+ is used to support PC database formats such as MS Access
+ and FoxPro.
+ </para>
+
+ <para>Default: <command>lock spin count = 2</command>
+ </para></listitem>
+ </varlistentry>
+
+
+
+
+ <varlistentry>
+ <term><anchor id="LOCKSPINTIME">lock spin time (G)</term>
+ <listitem><para>The time in microseconds that smbd should
+ pause before attempting to gain a failed lock. See
+ <link linkend="LOCKSPINCOUNT"><parameter>lock spin
+ count</parameter></link> for more details.
+ </para>
+
+ <para>Default: <command>lock spin time = 10</command>
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
<term><anchor id="LOCKING">locking (S)</term>
<listitem><para>This controls whether or not locking will be
performed by the server in response to lock requests from the
@@ -3889,8 +3946,8 @@
takes a printer name as its only parameter and outputs printer
status information.</para>
- <para>Currently eight styles of printer status information
- are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX and SOFTQ.
+ <para>Currently nine styles of printer status information
+ are supported; BSD, AIX, LPRNG, PLP, SYSV, HPUX, QNX, CUPS, and SOFTQ.
This covers most UNIX systems. You control which type is expected
using the <parameter>printing =</parameter> option.</para>
@@ -3906,7 +3963,10 @@
<para>Note that it is good practice to include the absolute path
in the <parameter>lpq command</parameter> as the <envar>$PATH
- </envar> may not be available to the server.</para>
+ </envar> may not be available to the server. When compiled with
+ the CUPS libraries, no <parameter>lpq command</parameter> is
+ needed because smbd will make a library call to obtain the
+ print queue listing.</para>
<para>See also the <link linkend="PRINTING"><parameter>printing
</parameter></link> parameter.</para>
@@ -5479,6 +5539,18 @@
<varlistentry>
+ <term><anchor id="PIDDIRECTORY">pid directory (G)</term>
+ <listitem><para>This option specifies the directory where pid
+ files will be placed. </para>
+
+ <para>Default: <command>pid directory = ${prefix}/var/locks</command></para>
+ <para>Example: <command>pid directory = /var/run/</command>
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
<term><anchor id="POSIXLOCKING">posix locking (S)</term>
<listitem><para>The <ulink url="smbd.8.html"><command>smbd(8)</command></ulink>
daemon maintains an database of file locks obtained by SMB clients.
@@ -5657,14 +5729,23 @@
manually remove old spool files.</para>
<para>The print command is simply a text string. It will be used
- verbatim, with two exceptions: All occurrences of <parameter>%s
- </parameter> and <parameter>%f</parameter> will be replaced by the
- appropriate spool file name, and all occurrences of <parameter>%p
- </parameter> will be replaced by the appropriate printer name. The
- spool file name is generated automatically by the server. The
- <parameter>%J</parameter> macro can be used to access the job
+ verbatim after macro substitutions have been made:</para>
+
+ <para>s, %p - the path to the spool
+ file name</para>
+
+ <para>%p - the appropriate printer
+ name</para>
+
+ <para>%J - the job
name as transmitted by the client.</para>
+ <para>%c - The number of printed pages
+ of the spooled job (if known).</para>
+
+ <para>%z - the size of the spooled
+ print job (in bytes)</para>
+
<para>The print command <emphasis>MUST</emphasis> contain at least
one occurrence of <parameter>%s</parameter> or <parameter>%f
</parameter> - the <parameter>%p</parameter> is optional. At the time
@@ -5708,6 +5789,17 @@
<para>For <command>printing = SOFTQ :</command></para>
<para><command>print command = lp -d%p -s %s; rm %s</command></para>
+ <para>For printing = CUPS : If SAMBA is compiled against
+ libcups, then <link linkend="PRINTING">printcap = cups</link>
+ uses the CUPS API to
+ submit jobs, etc. Otherwise it maps to the System V
+ commands with the -oraw option for printing, i.e. it
+ uses <command>lp -c -d%p -oraw; rm %s</command>.
+ With <command>printing = cups</command>,
+ and if SAMBA is compiled against libcups, any manually
+ set print command will be ignored.</para>
+
+
<para>Example: <command>print command = /usr/local/samba/bin/myprintscript
%p %s</command></para>
</listitem>
@@ -5762,7 +5854,13 @@
why you might want to do this.</para>
<para>To use the CUPS printing interface set <command>printcap name = cups
- </command>.</para>
+ </command>. This should be supplemented by an addtional setting
+ <link linkend="PRINTING">printing = cups</link> in the [global]
+ section. <command>printcap name = cups</command> will use the
+ "dummy" printcap created by CUPS, as specified in your CUPS
+ configuration file.
+ </para>
+
<para>On System V systems that use <command>lpstat</command> to
list available printers you can use <command>printcap name = lpstat
</command> to automatically obtain lists of available printers. This
@@ -8089,7 +8187,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDCACHETIME">winbind cache time</term>
+ <term><anchor id="WINBINDCACHETIME">winbind cache time (G)</term>
<listitem><para>This parameter specifies the number of seconds the
<ulink url="winbindd.8.html">winbindd(8)</ulink> daemon will cache
user and group information before querying a Windows NT server
@@ -8101,8 +8199,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDENUMUSERS">winbind enum
- users</term> <listitem><para>On large installations using
+ <term><anchor id="WINBINDENUMUSERS">winbind enum users (G)</term>
+ <listitem><para>On large installations using
<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
necessary to suppress the enumeration of users through the
<command> setpwent()</command>,
@@ -8123,8 +8221,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
</varlistentry>
<varlistentry>
- <term><anchor id="WINBINDENUMGROUPS">winbind enum
- groups</term> <listitem><para>On large installations using
+ <term><anchor id="WINBINDENUMGROUPS">winbind enum groups (G)</term>
+ <listitem><para>On large installations using
<ulink url="winbindd.8.html">winbindd(8)</ulink> it may be
necessary to suppress the enumeration of groups through the
<command> setgrent()</command>,
@@ -8144,7 +8242,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDGID">winbind gid</term>
+ <term><anchor id="WINBINDGID">winbind gid (G)</term>
<listitem><para>The winbind gid parameter specifies the range of group
ids that are allocated by the <ulink url="winbindd.8.html">
winbindd(8)</ulink> daemon. This range of group ids should have no
@@ -8160,7 +8258,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDSEPARATOR">winbind separator</term>
+ <term><anchor id="WINBINDSEPARATOR">winbind separator (G)</term>
<listitem><para>This parameter allows an admin to define the character
used when listing a username of the form of <replaceable>DOMAIN
</replaceable>\<replaceable>user</replaceable>. This parameter
@@ -8172,8 +8270,8 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
with group membership at least on glibc systems, as the character +
is used as a special character for NIS in /etc/group.</para>
- <para>Example: <command>winbind separator = \\</command></para>
- <para>Example: <command>winbind separator = /</command></para>
+ <para>Default: <command>winbind separator = '\'</command></para>
+ <para>Example: <command>winbind separator = +</command></para>
</listitem>
</varlistentry>
@@ -8181,7 +8279,7 @@ veto files = /.AppleDouble/.bin/.AppleDesktop/Network Trash Folder/
<varlistentry>
- <term><anchor id="WINBINDUID">winbind uid</term>
+ <term><anchor id="WINBINDUID">winbind uid (G)</term>
<listitem><para>The winbind gid parameter specifies the range of group
ids that are allocated by the <ulink url="winbindd.8.html">
winbindd(8)</ulink> daemon. This range of ids should have no
diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml
index 4f36de1576..31031dafc4 100644
--- a/docs/docbook/manpages/smbclient.1.sgml
+++ b/docs/docbook/manpages/smbclient.1.sgml
@@ -434,9 +434,9 @@ domain = &lt;value&gt;
<varlistentry>
<term>-W WORKGROUP</term>
- <listitem><para>Override the default workgroup specified in the
- workgroup parameter of the <filename>smb.conf</filename> file
- for this connection. This may be needed to connect to some
+ <listitem><para>Override the default workgroup (domain) specified
+ in the workgroup parameter of the <filename>smb.conf</filename>
+ file for this connection. This may be needed to connect to some
servers. </para></listitem>
</varlistentry>
@@ -634,6 +634,44 @@ domain = &lt;value&gt;
</varlistentry>
+ <varlistentry>
+ <term>altname file</term>
+ <listitem><para>The client will request that the server return
+ the "alternate" name (the 8.3 name) for a file or directory.
+ </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>cancel jobid0 [jobid1] ... [jobidN]</term>
+ <listitem><para>The client will request that the server cancel
+ the printjobs identified by the given numeric print job ids.
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term>chmod file mode in octal</term>
+ <listitem><para>This command depends on the server supporting the CIFS
+ UNIX extensions and will fail if the server does not. The client requests that the server
+ change the UNIX permissions to the given octal mode, in standard UNIX format.
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term>chown file uid gid</term>
+ <listitem><para>This command depends on the server supporting the CIFS
+ UNIX extensions and will fail if the server does not. The client requests that the server
+ change the UNIX user and group ownership to the given decimal values. Note there is
+ currently no way to remotely look up the UNIX uid and gid values for a given name.
+ This may be addressed in future versions of the CIFS UNIX extensions.
+ </para></listitem>
+ </varlistentry>
+
+
<varlistentry>
<term>cd [directory name]</term>
@@ -701,6 +739,17 @@ domain = &lt;value&gt;
<varlistentry>
+ <term>link source destination</term>
+ <listitem><para>This command depends on the server supporting the CIFS
+ UNIX extensions and will fail if the server does not. The client requests that the server
+ create a hard link between the source and destination files. The source file
+ must not exist.
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
<term>lowercase</term>
<listitem><para>Toggle lowercasing of filenames for the get and
mget commands. </para>
@@ -878,6 +927,30 @@ domain = &lt;value&gt;
<varlistentry>
+ <term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
+ <listitem><para>A version of the DOS attrib command to set
+ file permissions. For example: </para>
+
+ <para><command>setmode myfile +r </command></para>
+
+ <para>would make myfile read only. </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
+ <term>symlink source destination</term>
+ <listitem><para>This command depends on the server supporting the CIFS
+ UNIX extensions and will fail if the server does not. The client requests that the server
+ create a symbolic hard link between the source and destination files. The source file
+ must not exist. Note that the server will not create a link to any path that lies
+ outside the currently connected share. This is enforced by the Samba server.
+ </para></listitem>
+ </varlistentry>
+
+
+
+ <varlistentry>
<term>tar &lt;c|x&gt;[IXbgNa]</term>
<listitem><para>Performs a tar operation - see the <parameter>-T
</parameter> command line option above. Behavior may be affected
@@ -907,16 +980,6 @@ domain = &lt;value&gt;
</varlistentry>
- <varlistentry>
- <term>setmode &lt;filename&gt; &lt;perm=[+|\-]rsha&gt;</term>
- <listitem><para>A version of the DOS attrib command to set
- file permissions. For example: </para>
-
- <para><command>setmode myfile +r </command></para>
-
- <para>would make myfile read only. </para></listitem>
- </varlistentry>
-
</variablelist>
</refsect1>
diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml
index 05e05f4a6a..517e2ca41f 100644
--- a/docs/docbook/manpages/smbcontrol.1.sgml
+++ b/docs/docbook/manpages/smbcontrol.1.sgml
@@ -9,7 +9,7 @@
<refnamediv>
<refname>smbcontrol</refname>
- <refpurpose>send messages to smbd or nmbd processes</refpurpose>
+ <refpurpose>send messages to smbd, nmbd or winbindd processes</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -33,9 +33,10 @@
Samba</ulink> suite.</para>
<para><command>smbcontrol</command> is a very small program, which
- sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink> or
- an <ulink url="nmbd.8.html">nmbd(8)</ulink> daemon running on the
- system.</para>
+ sends messages to an <ulink url="smbd.8.html">smbd(8)</ulink>,
+ an <ulink url="nmbd.8.html">nmbd(8)</ulink>
+ or a <ulink url="winbindd.8.html">winbindd(8)</ulink>
+ daemon running on the system.</para>
</refsect1>
@@ -81,8 +82,9 @@
message to smbd which will then close the client connections to
the named share. Note that this doesn't affect client connections
to any other shares. This message-type takes an argument of the
- share name for which client connections will be close, or the
+ share name for which client connections will be closed, or the
"*" character which will close all currently open shares.
+ This may be useful if you made changes to the access controls on the share.
This message can only be sent to <constant>smbd</constant>.</para>
<para>The <constant>debug</constant> message-type allows
@@ -105,7 +107,7 @@
collection, "off" to turn off profile stats collection, "count"
to enable only collection of count stats (time stats are
disabled), and "flush" to zero the current profile stats. This can
- be sent to any of the destinations.</para>
+ be sent to any smbd or nmbd destinations.</para>
<para>The <constant>debuglevel</constant> message-type sends
a "request debug level" message. The current debug level setting
@@ -115,18 +117,13 @@
<para>The <constant>profilelevel</constant> message-type sends
a "request profile level" message. The current profile level
setting is returned by a "profilelevel" message. This can be sent
- to any of the destinations.</para>
+ to any smbd or nmbd destinations.</para>
<para>The <constant>printer-notify</constant> message-type sends a
message to smbd which in turn sends a printer notify message to
any Windows NT clients connected to a printer. This message-type
takes an argument of the printer name to send notify messages to.
This message can only be sent to <constant>smbd</constant>.</para>
-
- <para>The <constant>close-share</constant> message-type sends a
- message to smbd which forces smbd to close the share that was
- specified as an argument. This may be useful if you made changes
- to the access controls on the share. </para>
</listitem>
</varlistentry>
diff --git a/docs/docbook/manpages/smbd.8.sgml b/docs/docbook/manpages/smbd.8.sgml
index 824ae20241..509007c4bc 100644
--- a/docs/docbook/manpages/smbd.8.sgml
+++ b/docs/docbook/manpages/smbd.8.sgml
@@ -176,7 +176,9 @@
its size may be controlled by the <ulink
url="smb.conf.5.html#maxlogsize">max log size</ulink>
option in the <ulink url="smb.conf.5.html"><filename>
- smb.conf(5)</filename></ulink> file.
+ smb.conf(5)</filename></ulink> file. <emphasis>Beware:</emphasis>
+ If the directory specified does not exist, <command>smbd</command>
+ will log to the default debug log location defined at compile time.
</para>
<para>The default log directory is specified at
diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml
index b4a77e51c9..ec4dbbaff1 100644
--- a/docs/docbook/manpages/smbmount.8.sgml
+++ b/docs/docbook/manpages/smbmount.8.sgml
@@ -14,7 +14,7 @@
<refsynopsisdiv>
<cmdsynopsis>
- <command>smbumount</command>
+ <command>smbmount</command>
<arg choice="req">service</arg>
<arg choice="req">mount-point</arg>
<arg choice="opt">-o options</arg>
diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml
index 46adac6b79..82efb334ba 100644
--- a/docs/docbook/manpages/smbsh.1.sgml
+++ b/docs/docbook/manpages/smbsh.1.sgml
@@ -16,6 +16,13 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>smbsh</command>
+ <arg choice="opt">-W workgroup</arg>
+ <arg choice="opt">-U username</arg>
+ <arg choice="opt">-P prefix</arg>
+ <arg choice="opt">-R &lt;name resolve order&gt;</arg>
+ <arg choice="opt">-d &lt;debug level&gt;</arg>
+ <arg choice="opt">-l logfile</arg>
+ <arg choice="opt">-L libdir</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -30,6 +37,129 @@
egrep</command>, and <command>rcp</command>. You must use a
shell that is dynamically linked in order for <command>smbsh</command>
to work correctly.</para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+
+ <variablelist>
+ <varlistentry>
+ <term>-W WORKGROUP</term>
+ <listitem><para>Override the default workgroup specified in the
+ workgroup parameter of the <filename>smb.conf</filename> file
+ for this session. This may be needed to connect to some
+ servers. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-U username[%pass]</term>
+ <listitem><para>Sets the SMB username or username and password.
+ If this option is not specified, the user will be prompted for
+ both the username and the password. If %pass is not specified,
+ the user will be prompted for the password.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-P prefix</term><listitem><para>This option allows
+ the user to set the directory prefix for SMB access. The
+ default value if this option is not specified is
+ <emphasis>smb</emphasis>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-R &lt;name resolve order&gt;</term>
+ <listitem><para>This option is used to determine what naming
+ services and in what order to resolve
+ host names to IP addresses. The option takes a space-separated
+ string of different name resolution options.</para>
+
+ <para>The options are :"lmhosts", "host", "wins" and "bcast".
+ They cause names to be resolved as follows :</para>
+
+ <itemizedlist>
+ <listitem><para><constant>lmhosts</constant> :
+ Lookup an IP address in the Samba lmhosts file. If the
+ line in lmhosts has no name type attached to the
+ NetBIOS name
+ (see the <ulink url="lmhosts.5.html">lmhosts(5)</ulink>
+ for details) then any name type matches for lookup.
+ </para></listitem>
+
+ <listitem><para><constant>host</constant> :
+ Do a standard host name to IP address resolution, using
+ the system <filename>/etc/hosts</filename>, NIS, or DNS
+ lookups. This method of name resolution is operating
+ system dependent, for instance on IRIX or Solaris this
+ may be controlled by the <filename>/etc/nsswitch.conf
+ </filename> file). Note that this method is only used
+ if the NetBIOS name type being queried is the 0x20
+ (server) name type, otherwise it is ignored.
+ </para></listitem>
+
+ <listitem><para><constant>wins</constant> :
+ Query a name with the IP address listed in the
+ <parameter>wins server</parameter> parameter. If no
+ WINS server has been specified this method will be
+ ignored.
+ </para></listitem>
+
+ <listitem><para><constant>bcast</constant> :
+ Do a broadcast on each of the known local interfaces
+ listed in the <parameter>interfaces</parameter>
+ parameter. This is the least reliable of the name
+ resolution methods as it depends on the target host
+ being on a locally connected subnet.
+ </para></listitem>
+ </itemizedlist>
+
+ <para>If this parameter is not set then the name resolve order
+ defined in the <filename>smb.conf</filename> file parameter
+ (name resolve order) will be used. </para>
+
+ <para>The default order is lmhosts, host, wins, bcast. Without
+ this parameter or any entry in the <parameter>name resolve order
+ </parameter> parameter of the <filename>smb.conf</filename>
+ file, the name resolution methods will be attempted in this
+ order. </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-d &lt;debug level&gt;</term>
+ <listitem><para>debug level is an integer from 0 to 10.</para>
+
+ <para>The default value if this parameter is not specified
+ is zero.</para>
+
+ <para>The higher this value, the more detail will be logged
+ about the activities of <command>nmblookup</command>. At level
+ 0, only critical errors and serious warnings will be logged.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-l logfilename</term>
+ <listitem><para>If specified causes all debug messages to be
+ written to the file specified by <replaceable>logfilename
+ </replaceable>. If not specified then all messages will be
+ written to<replaceable>stderr</replaceable>.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-L libdir</term>
+ <listitem><para>This parameter specifies the location of the
+ shared libraries used by <command>smbsh</command>. The default
+ value is specified at compile time.
+ </para></listitem>
+ </varlistentry>
+
+ </variablelist>
+</refsect1>
+
+<refsect1>
+ <title>EXAMPLES</title>
<para>To use the <command>smbsh</command> command, execute <command>
smbsh</command> from the prompt and enter the username and password
diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml
index 7f2c4624a9..f1461b07b9 100644
--- a/docs/docbook/manpages/wbinfo.1.sgml
+++ b/docs/docbook/manpages/wbinfo.1.sgml
@@ -17,6 +17,8 @@
<command>wbinfo</command>
<arg choice="opt">-u</arg>
<arg choice="opt">-g</arg>
+ <arg choice="opt">-h name</arg>
+ <arg choice="opt">-i ip</arg>
<arg choice="opt">-n name</arg>
<arg choice="opt">-s sid</arg>
<arg choice="opt">-U uid</arg>
@@ -25,8 +27,9 @@
<arg choice="opt">-Y sid</arg>
<arg choice="opt">-t</arg>
<arg choice="opt">-m</arg>
+ <arg choice="opt">-r user</arg>
<arg choice="opt">-a user%password</arg>
- <arg choice="opt">-p</arg>
+ <arg choice="opt">-A user%password</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -71,6 +74,26 @@
<varlistentry>
+ <term>-h name</term>
+ <listitem><para>The <parameter>-h</parameter> option
+ queries <command>winbindd(8)</command> to query the WINS
+ server for the IP address associated with the NetBIOS name
+ specified by the <parameter>name</parameter> parameter.
+ </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
+ <term>-i ip</term>
+ <listitem><para>The <parameter>-i</parameter> option
+ queries <command>winbindd(8)</command> to send a node status
+ request to get the NetBIOS name associated with the IP address
+ specified by the <parameter>ip</parameter> parameter.
+ </para></listitem>
+ </varlistentry>
+
+
+ <varlistentry>
<term>-n name</term>
<listitem><para>The <parameter>-n</parameter> option
queries <command>winbindd(8)</command> for the SID
@@ -143,6 +166,16 @@
</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>-r username</term>
+ <listitem><para>Try to obtain the list of UNIX group ids
+ to which the user belongs. This only works for users
+ defined on a Domain Controller.
+ </para></listitem>
+ </varlistentry>
+
+
<varlistentry>
<term>-a username%password</term>
<listitem><para>Attempt to authenticate a user via winbindd.
@@ -150,10 +183,14 @@
</para></listitem>
</varlistentry>
+
<varlistentry>
- <term>-p</term>
- <listitem><para>Attempt a simple 'ping' check that the winbindd
- is indeed alive.
+ <term>-A username%password</term>
+ <listitem><para>Store username and password used by winbindd
+ during session setup to a domain controller. This enables
+ winbindd to operate in a Windows 2000 domain with Restrict
+ Anonymous turned on (a.k.a. Permissions compatiable with
+ Windows 2000 servers only).
</para></listitem>
</varlistentry>
</variablelist>
diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml
index bd1dafa07e..0325f9bfe1 100644
--- a/docs/docbook/manpages/winbindd.8.sgml
+++ b/docs/docbook/manpages/winbindd.8.sgml
@@ -57,6 +57,15 @@
<variablelist>
<varlistentry>
+ <term>hosts</term>
+ <listitem><para>User information traditionally stored in
+ the <filename>hosts(5)</filename> file and used by
+ <command>gethostbyname(3)</command> functions. Names are
+ resolved through the WINS server or by broadcast.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>passwd</term>
<listitem><para>User information traditionally stored in
the <filename>passwd(5)</filename> file and used by
@@ -81,6 +90,12 @@
passwd: files winbind
group: files winbind
</programlisting></para>
+
+ <para>The following simple configuration in the
+ <filename>/etc/nsswitch.conf</filename> file can be used to initially
+ resolve hostnames from <filename>/etc/hosts</filename> and then from the
+ WINS server.</para>
+
</refsect1>