diff options
Diffstat (limited to 'docs/docbook/manpages')
| -rw-r--r-- | docs/docbook/manpages/make_unicodemap.1.sgml | 2 | ||||
| -rw-r--r-- | docs/docbook/manpages/nmbd.8.sgml | 19 | ||||
| -rw-r--r-- | docs/docbook/manpages/nmblookup.1.sgml | 2 | ||||
| -rw-r--r-- | docs/docbook/manpages/rpcclient.1.sgml | 10 | ||||
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 645 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbcacls.1.sgml | 20 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbclient.1.sgml | 104 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbcontrol.1.sgml | 5 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbd.8.sgml | 74 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbmnt.8.sgml | 15 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbmount.8.sgml | 70 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbpasswd.5.sgml | 14 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbpasswd.8.sgml | 108 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbsh.1.sgml | 12 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbspool.8.sgml | 6 | ||||
| -rw-r--r-- | docs/docbook/manpages/smbumount.8.sgml | 2 | ||||
| -rw-r--r-- | docs/docbook/manpages/swat.8.sgml | 16 | ||||
| -rw-r--r-- | docs/docbook/manpages/testparm.1.sgml | 6 | ||||
| -rw-r--r-- | docs/docbook/manpages/wbinfo.1.sgml | 7 | ||||
| -rw-r--r-- | docs/docbook/manpages/winbindd.8.sgml | 53 |
20 files changed, 689 insertions, 501 deletions
diff --git a/docs/docbook/manpages/make_unicodemap.1.sgml b/docs/docbook/manpages/make_unicodemap.1.sgml index 50a5446d60..5e7292341b 100644 --- a/docs/docbook/manpages/make_unicodemap.1.sgml +++ b/docs/docbook/manpages/make_unicodemap.1.sgml @@ -33,7 +33,7 @@ <para> <command>make_unicodemap</command> compiles text unicode map - files into binary unicodef map files for use with the + files into binary unicode map files for use with the internationalization features of Samba 2.2. </para> </refsect1> diff --git a/docs/docbook/manpages/nmbd.8.sgml b/docs/docbook/manpages/nmbd.8.sgml index 8db2749bfa..2d873a1e40 100644 --- a/docs/docbook/manpages/nmbd.8.sgml +++ b/docs/docbook/manpages/nmbd.8.sgml @@ -15,7 +15,7 @@ <refsynopsisdiv> <cmdsynopsis> - <command>smbd</command> + <command>nmbd</command> <arg choice="opt">-D</arg> <arg choice="opt">-a</arg> <arg choice="opt">-o</arg> @@ -287,17 +287,18 @@ a SIGTERM (-15) signal and wait for it to die on its own.</para> <para><command>nmbd</command> will accept SIGHUP, which will cause - it to dump out it's namelists into the file <filename>namelist.debug + 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 - cause <command>nmbd</command> to dump out it's server database in - the <filename>log.nmb</filename> file. In addition, the debug log level - of nmbd may be raised by sending it a SIGUSR1 (<command>kill -USR1 - <nmbd-pid></command>) and lowered by sending it a - SIGUSR2 (<command>kill -USR2 <nmbd-pid></command>). This is to - allow transient problems to be diagnosed, whilst still running at a - normally low log level.</para> + 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 + to allow transient problems to be diagnosed, whilst still running + at a normally low log level.</para> </refsect1> diff --git a/docs/docbook/manpages/nmblookup.1.sgml b/docs/docbook/manpages/nmblookup.1.sgml index 6fcf5cf70c..67efac5634 100644 --- a/docs/docbook/manpages/nmblookup.1.sgml +++ b/docs/docbook/manpages/nmblookup.1.sgml @@ -84,7 +84,7 @@ datagrams. The reason for this option is a bug in Windows 95 where it ignores the source port of the requesting packet and only replies to UDP port 137. Unfortunately, on most UNIX - systems root privilage is needed to bind to this port, and + systems root privilege is needed to bind to this port, and in addition, if the <ulink url="nmbd.8.html">nmbd(8)</ulink> daemon is running on this machine it also binds to this port. </para></listitem> diff --git a/docs/docbook/manpages/rpcclient.1.sgml b/docs/docbook/manpages/rpcclient.1.sgml index 0d45a5dc20..6093d6dc42 100644 --- a/docs/docbook/manpages/rpcclient.1.sgml +++ b/docs/docbook/manpages/rpcclient.1.sgml @@ -89,7 +89,7 @@ <term>-d debuglevel</term> <listitem><para>set the debuglevel. Debug level 0 is the lowest and 100 being the highest. This should be set to 100 if you are - planning on submitting a bug report to the Samba team (see BUGS.txt). + planning on submitting a bug report to the Samba team (see <filename>BUGS.txt</filename>). </para></listitem> </varlistentry> @@ -108,7 +108,7 @@ <varlistentry> <term>-l logbasename</term> <listitem><para>File name for log/debug files. The extension - '.client' will be appended. The log file is never removed + <constant>'.client'</constant> will be appended. The log file is never removed by the client. </para></listitem> </varlistentry> @@ -137,7 +137,7 @@ <para>If %password is not specified, The user will be prompted. The client will first check the <envar>USER</envar> environment variable, then the - <envar>LOGNAME</envar> variable and if either exist, the + <envar>LOGNAME</envar> variable and if either exists, the string is uppercased. If these environmental variables are not found, the username <constant>GUEST</constant> is used. </para> @@ -384,7 +384,7 @@ available from the original creators (Microsoft) on how MSRPC over SMB works, or how the individual MSRPC services work. Microsoft's implementation of these services has been demonstrated (and reported) - to be... a bit flakey in places. </para> + to be... a bit flaky in places. </para> <para>The development of Samba's implementation is also a bit rough, and as more of the services are understood, it can even result in @@ -412,7 +412,7 @@ to the way the Linux kernel is developed.</para> <para>The original rpcclient man page was written by Matthew - Geddes, Luke Kenneth Casson, and rewriten by Gerald Carter. + Geddes, Luke Kenneth Casson Leighton, and rewritten by Gerald Carter. The conversion to DocBook for Samba 2.2 was done by Gerald Carter.</para> </refsect1> diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index ff56260f2b..3ee2a3b8bd 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -519,7 +519,7 @@ upper case, or if they are forced to be the "default" case. This option can be use with "preserve case = yes" to permit long filenames to retain their case, while short names - are lowered. Default <emphasis>yes</emphasis>.</para></listitem> + are lowercased. Default <emphasis>yes</emphasis>.</para></listitem> </varlistentry> </variablelist> @@ -552,7 +552,7 @@ with the system and now supplies a correct password for that username then the connection is allowed.</para></listitem> - <listitem><para>The client's netbios name and any previously + <listitem><para>The client's NetBIOS name and any previously used user names are checked against the supplied password, if they match then the connection is allowed as the corresponding user.</para></listitem> @@ -586,6 +586,7 @@ each parameter for details. Note that some are synonyms.</para> <itemizedlist> + <listitem><para><link linkend="ABORTSHUTDOWNSCRIPT"><parameter>abort shutdown script</parameter></link></para></listitem> <listitem><para><link linkend="ADDPRINTERCOMMAND"><parameter>add printer command</parameter></link></para></listitem> <listitem><para><link linkend="ADDSHARECOMMAND"><parameter>add share command</parameter></link></para></listitem> <listitem><para><link linkend="ADDUSERSCRIPT"><parameter>add user script</parameter></link></para></listitem> @@ -615,6 +616,7 @@ <listitem><para><link linkend="DELETESHARECOMMAND"><parameter>delete share command</parameter></link></para></listitem> <listitem><para><link linkend="DELETEUSERSCRIPT"><parameter>delete user script</parameter></link></para></listitem> <listitem><para><link linkend="DFREECOMMAND"><parameter>dfree command</parameter></link></para></listitem> + <listitem><para><link linkend="DISABLESPOOLSS"><parameter>disable spoolss</parameter></link></para></listitem> <listitem><para><link linkend="DNSPROXY"><parameter>dns proxy</parameter></link></para></listitem> <listitem><para><link linkend="DOMAINADMINGROUP"><parameter>domain admin group</parameter></link></para></listitem> <listitem><para><link linkend="DOMAINGUESTGROUP"><parameter>domain guest group</parameter></link></para></listitem> @@ -625,6 +627,7 @@ <listitem><para><link linkend="ENUMPORTSCOMMAND"><parameter>enumports command</parameter></link></para></listitem> <listitem><para><link linkend="GETWDCACHE"><parameter>getwd cache</parameter></link></para></listitem> <listitem><para><link linkend="HIDELOCALUSERS"><parameter>hide local users</parameter></link></para></listitem> + <listitem><para><link linkend="HIDEUNREADABLE"><parameter>hide unreadable</parameter></link></para></listitem> <listitem><para><link linkend="HOMEDIRMAP"><parameter>homedir map</parameter></link></para></listitem> <listitem><para><link linkend="HOSTMSDFS"><parameter>host msdfs</parameter></link></para></listitem> <listitem><para><link linkend="HOSTSEQUIV"><parameter>hosts equiv</parameter></link></para></listitem> @@ -632,6 +635,7 @@ <listitem><para><link linkend="KEEPALIVE"><parameter>keepalive</parameter></link></para></listitem> <listitem><para><link linkend="KERNELOPLOCKS"><parameter>kernel oplocks</parameter></link></para></listitem> <listitem><para><link linkend="LANMANAUTH"><parameter>lanman auth</parameter></link></para></listitem> + <listitem><para><link linkend="LARGEREADWRITE"><parameter>large readwrite</parameter></link></para></listitem> <listitem><para><link linkend="LMANNOUNCE"><parameter>lm announce</parameter></link></para></listitem> <listitem><para><link linkend="LMINTERVAL"><parameter>lm interval</parameter></link></para></listitem> <listitem><para><link linkend="LOADPRINTERS"><parameter>load printers</parameter></link></para></listitem> @@ -701,6 +705,7 @@ <listitem><para><link linkend="SECURITY"><parameter>security</parameter></link></para></listitem> <listitem><para><link linkend="SERVERSTRING"><parameter>server string</parameter></link></para></listitem> <listitem><para><link linkend="SHOWADDPRINTERWIZARD"><parameter>show add printer wizard</parameter></link></para></listitem> + <listitem><para><link linkend="SHUTDOWNSCRIPT"><parameter>shutdown script</parameter></link></para></listitem> <listitem><para><link linkend="SMBPASSWDFILE"><parameter>smb passwd file</parameter></link></para></listitem> <listitem><para><link linkend="SOCKETADDRESS"><parameter>socket address</parameter></link></para></listitem> <listitem><para><link linkend="SOCKETOPTIONS"><parameter>socket options</parameter></link></para></listitem> @@ -735,9 +740,12 @@ <listitem><para><link linkend="USERHOSTS"><parameter>use rhosts</parameter></link></para></listitem> <listitem><para><link linkend="USERNAMELEVEL"><parameter>username level</parameter></link></para></listitem> <listitem><para><link linkend="USERNAMEMAP"><parameter>username map</parameter></link></para></listitem> + <listitem><para><link linkend="UTMP"><parameter>utmp</parameter></link></para></listitem> <listitem><para><link linkend="UTMPDIRECTORY"><parameter>utmp directory</parameter></link></para></listitem> <listitem><para><link linkend="VALIDCHARS"><parameter>valid chars</parameter></link></para></listitem> <listitem><para><link linkend="WINBINDCACHETIME"><parameter>winbind cache time</parameter></link></para></listitem> + <listitem><para><link linkend="WINBINDENUMUSERS"><parameter>winbind enum users</parameter></link></para></listitem> + <listitem><para><link linkend="WINBINDENUMGROUPS"><parameter>winbind enum groups</parameter></link></para></listitem> <listitem><para><link linkend="WINBINDGID"><parameter>winbind gid</parameter></link></para></listitem> <listitem><para><link linkend="WINBINDSEPARATOR"><parameter>winbind separator</parameter></link></para></listitem> <listitem><para><link linkend="WINBINDUID"><parameter>winbind uid</parameter></link></para></listitem> @@ -853,16 +861,15 @@ <listitem><para><link linkend="ROOTPREEXECCLOSE"><parameter>root preexec close</parameter></link></para></listitem> <listitem><para><link linkend="SECURITYMASK"><parameter>security mask</parameter></link></para></listitem> <listitem><para><link linkend="SETDIRECTORY"><parameter>set directory</parameter></link></para></listitem> - <listitem><para><link linkend="SHAREMODES"><parameter>share modes</parameter></link></para></listitem> <listitem><para><link linkend="SHORTPRESERVECASE"><parameter>short preserve case</parameter></link></para></listitem> <listitem><para><link linkend="STATUS"><parameter>status</parameter></link></para></listitem> <listitem><para><link linkend="STRICTLOCKING"><parameter>strict locking</parameter></link></para></listitem> <listitem><para><link linkend="STRICTSYNC"><parameter>strict sync</parameter></link></para></listitem> <listitem><para><link linkend="SYNCALWAYS"><parameter>sync always</parameter></link></para></listitem> + <listitem><para><link linkend="USECLIENTDRIVER"><parameter>use client driver</parameter></link></para></listitem> <listitem><para><link linkend="USER"><parameter>user</parameter></link></para></listitem> <listitem><para><link linkend="USERNAME"><parameter>username</parameter></link></para></listitem> <listitem><para><link linkend="USERS"><parameter>users</parameter></link></para></listitem> - <listitem><para><link linkend="UTMP"><parameter>utmp</parameter></link></para></listitem> <listitem><para><link linkend="VALIDUSERS"><parameter>valid users</parameter></link></para></listitem> <listitem><para><link linkend="VETOFILES"><parameter>veto files</parameter></link></para></listitem> <listitem><para><link linkend="VETOOPLOCKFILES"><parameter>veto oplock files</parameter></link></para></listitem> @@ -883,7 +890,22 @@ <title>EXPLANATION OF EACH PARAMETER</title> <variablelist> - + + <varlistentry> + <term><anchor id="ABORTSHUTDOWNSCRIPT">abort shutdown script (G)</term> + <listitem><para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis> + This a full path name to a script called by + <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> that + should stop a shutdown procedure issued by the <link + linkend="SHUTDOWNSCRIPT"><parameter>shutdown script</parameter></link>.</para> + + <para>This command will be run as user.</para> + + <para>Default: <emphasis>None</emphasis>.</para> + <para>Example: <command>abort shutdown script = /sbin/shutdown -c</command></para> + </listitem> + </varlistentry> + <varlistentry> <term><anchor id="ADDPRINTERCOMMAND">add printer command (G)</term> @@ -895,7 +917,7 @@ NT/2000 print server.</para> <para>For a Samba host this means that the printer must be - physically added to underlying printing system. The <parameter>add + physically added to the underlying printing system. The <parameter>add printer command</parameter> defines a script to be run which will perform the necessary operations for adding the printer to the print system and to add the appropriate service definition @@ -1000,14 +1022,14 @@ <varlistentry> <term><anchor id="ADDMACHINESCRIPT">add machine script (G)</term> <listitem><para>This is the full pathname to a script that will - be run by <ulink url="smbd.8.html">smbd(8)</ulink> when a machine is added + be run by <ulink url="smbd.8.html">smbd(8)</ulink> when a machine is added to it's domain using the administrator username and password method. </para> - <para>This option is only required when using sam backends tied to the - unix uid method of RID calculation such as smbpasswd. This option is only - avaliable in Samba 3.0.</para> + <para>This option is only required when using sam back-ends tied to the + Unix uid method of RID calculation such as smbpasswd. This option is only + available in Samba 3.0.</para> - <para>Default: <command>add user script = <empty string> + <para>Default: <command>add machine script = <empty string> </command></para> <para>Example: <command>add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u @@ -1101,7 +1123,7 @@ linkend="SECURITY"><parameter>security</parameter></link> option is set to <constant>server</constant> or <constant>domain</constant>. If it is set to no, then attempts to connect to a resource from - a domain or workgroup other than the one which smbd is running + a domain or workgroup other than the one which <ulink url="smbd.8.html">smbd</ulink> is running in will fail, even if that domain is trusted by the remote server doing the authentication.</para> @@ -1144,13 +1166,13 @@ <varlistentry> - <term><anchor id="ANNOUNCEVERSION">annouce version (G)</term> + <term><anchor id="ANNOUNCEVERSION">announce version (G)</term> <listitem><para>This specifies the major and minor version numbers that nmbd will use when announcing itself as a server. The default is 4.2. Do not change this parameter unless you have a specific need to set a Samba server to be a downlevel server.</para> - <para>Default: <command>announce version = 4.2</command></para> + <para>Default: <command>announce version = 4.5</command></para> <para>Example: <command>announce version = 2.0</command></para> </listitem> @@ -1184,7 +1206,7 @@ <varlistentry> <term><anchor id="BINDINTERFACESONLY">bind interfaces only (G)</term> <listitem><para>This global parameter allows the Samba admin - to limit what interfaces on a machine will serve smb requests. If + to limit what interfaces on a machine will serve SMB requests. If affects file service <ulink url="smbd.8.html">smbd(8)</ulink> and name service <ulink url="nmbd.8.html">nmbd(8)</ulink> in slightly different ways.</para> @@ -1263,7 +1285,7 @@ queue the lock request, and periodically attempt to obtain the lock until the timeout period expires.</para> - <para>If this parameter is set to <constant>False</constant>, then + <para>If this parameter is set to <constant>false</constant>, then Samba 2.2 will behave as previous versions of Samba would and will fail the lock request immediately if the lock range cannot be obtained.</para> @@ -1399,7 +1421,7 @@ <varlistentry> <term><anchor id="CHARACTERSET">character set (G)</term> - <listitem><para>This allows a smbd to map incoming filenames + <listitem><para>This allows <ulink url="smbd.8.html">smbd</ulink> to map incoming filenames from a DOS Code page (see the <link linkend="CLIENTCODEPAGE">client code page</link> parameter) to several built in UNIX character sets. The built in code page translations are:</para> @@ -1540,7 +1562,7 @@ <varlistentry> - <term><anchor id="CODINGSYSTEM">codingsystem (G)</term> + <term><anchor id="CODINGSYSTEM">coding system (G)</term> <listitem><para>This parameter is used to determine how incoming Shift-JIS Japanese characters are mapped from the incoming <link linkend="CLIENTCODEPAGE"><parameter>client code page</parameter> @@ -1741,7 +1763,7 @@ <varlistentry> <term><anchor id="DEBUGPID">debug pid (G)</term> <listitem><para>When using only one log file for more then one - forked smbd-process there may be hard to follow which process + forked <ulink url="smbd.8.html">smbd</ulink>-process there may be hard to follow which process outputs which message. This boolean parameter is adds the process-id to the timestamp message headers in the logfile when turned on.</para> @@ -1940,9 +1962,9 @@ </para> <para> - See also <link linkend="ADDSHARECOMMAND"><parameter>delete share + See also <link linkend="ADDSHARECOMMAND"><parameter>add share command</parameter></link>, <link linkend="CHANGESHARECOMMAND"><parameter>change - share</parameter></link>. + share command</parameter></link>. </para> <para>Default: <emphasis>none</emphasis></para> @@ -2022,11 +2044,11 @@ <listitem><para>This option is used when Samba is attempting to delete a directory that contains one or more vetoed directories (see the <link linkend="VETOFILES"><parameter>veto files</parameter></link> - option). If this option is set to False (the default) then if a vetoed + option). If this option is set to <constant>false</constant> (the default) then if a vetoed directory contains any non-vetoed files or directories then the directory delete will fail. This is usually what you want.</para> - <para>If this option is set to <constant>True</constant>, then Samba + <para>If this option is set to <constant>true</constant>, then Samba will attempt to recursively delete any files and directories within the vetoed directory. This can be useful for integration with file serving systems such as NetAtalk which create meta-files within @@ -2194,7 +2216,7 @@ Samba server through other means can easily bypass this restriction, so it is primarily useful for standalone "appliance" systems. Administrators of most normal systems will probably want to leave - it as the default of 0777.</para> + it as the default of <constant>0777</constant>.</para> <para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE"><parameter> force directory security mode</parameter></link>, <link @@ -2206,6 +2228,29 @@ <para>Example: <command>directory security mask = 0700</command></para> </listitem> </varlistentry> + + + + <varlistentry> + <term><anchor id="DISABLESPOOLSS">disable spoolss (G)</term> + <listitem><para>Enabling this parameter will disables Samba's support + for the SPOOLSS set of MS-RPC's and will yield identical behavior + as Samba 2.0.x. Windows NT/2000 clients will downgrade to using + Lanman style printing commands. Windows 9x/ME will be uneffected by + the parameter. However, this will also disable the ability to upload + printer drivers to a Samba server via the Windows NT Add Printer + Wizard or by using the NT printer properties dialog window. It will + also disable the capability of Windows NT/2000 clients to download + print drivers from the Samba host upon demand. + <emphasis>Be very careful about enabling this parameter.</emphasis> + </para> + + <para>See also <link linkend="USECLIENTDRIVER">use client driver</link> + </para> + + <para>Default : <command>disable spoolss = no</command></para> + </listitem> + </varlistentry> @@ -2281,7 +2326,7 @@ <varlistentry> <term><anchor id="DOMAINLOGONS">domain logons (G)</term> - <listitem><para>If set to true, the Samba server will serve + <listitem><para>If set to <constant>true</constant>, the Samba server will serve Windows 95/98 Domain logons for the <link linkend="WORKGROUP"> <parameter>workgroup</parameter></link> it is in. Samba 2.2 also has limited capability to act as a domain controller for Windows @@ -2356,7 +2401,7 @@ <varlistentry> <term><anchor id="DOSFILEMODE">dos filemode (S)</term> <listitem><para> The default behavior in Samba is to provide - UNIX-like behavor where only the owner of a file/directory is + UNIX-like behavior where only the owner of a file/directory is able to change the permissions on it. However, this behavior is often confusing to DOS/Windows users. Enabling this parameter allows a user who has write access to the file (by whatever @@ -2406,7 +2451,7 @@ default, Samba runs with POSIX semantics and refuses to change the timestamp on a file if the user <command>smbd</command> is acting on behalf of is not the file owner. Setting this option to <constant> - True</constant> allows DOS semantics and smbd will change the file + true</constant> allows DOS semantics and <ulink url="smbd.8.html">smbd</ulink> will change the file timestamp as DOS requires.</para> <para>Default: <command>dos filetimes = no</command></para></listitem> @@ -2440,16 +2485,15 @@ <varlistentry> <term><anchor id="ENHANCEDBROWSING">enhanced browsing (G)</term> <listitem><para>This option enables a couple of enhancements to - cross-subnet browse propogation that have been added in Samba + cross-subnet browse propagation that have been added in Samba but which are not standard in Microsoft implementations. - <emphasis>These enhancements are currently only available in - the HEAD Samba CVS tree (not Samba 2.2.x).</emphasis></para> + </para> - <para>The first enhancement to browse propogation consists of a regular + <para>The first enhancement to browse propagation consists of a regular wildcard query to a Samba WINS server for all Domain Master Browsers, - followed by a browse synchronisation with each of the returned + followed by a browse synchronization with each of the returned DMBs. The second enhancement consists of a regular randomised browse - synchronisation with all currently known DMBs.</para> + synchronization with all currently known DMBs.</para> <para>You may wish to disable this option if you have a problem with empty workgroups not disappearing from browse lists. Due to the restrictions @@ -2457,7 +2501,7 @@ to stay around forever which can be annoying.</para> <para>In general you should leave this option enabled as it makes - cross-subnet browse propogation much more reliable.</para> + cross-subnet browse propagation much more reliable.</para> <para>Default: <command>enhanced browsing = yes</command></para> </listitem> @@ -2517,7 +2561,7 @@ reported by Samba will be updated whenever a file is created or or deleted in the directory. NMAKE finds all object files in the object directory. The timestamp of the last one built is then - compared to the timestamp of the object dircetory. If the + compared to the timestamp of the object directory. If the directory's timestamp if newer, then all object files will be rebuilt. Enabling this option ensures directories always predate their contents and an NMAKE build @@ -2596,7 +2640,7 @@ set by Windows NT/2000 ACL editors. If the administrator wishes to enforce this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with - mask</parameter></link> to true.</para> + mask</parameter></link> to <constant>true</constant>.</para> <para>See also the parameter <link linkend="CREATEMASK"><parameter>create mask</parameter></link> for details on masking mode bits on files.</para> @@ -2630,7 +2674,7 @@ set by Windows NT/2000 ACL editors. If the administrator wishes to enforce this mask on access control lists also, they need to set the <link linkend="RESTRICTACLWITHMASK"><parameter>restrict acl with - mask</parameter></link> to true.</para> + mask</parameter></link> to <constant>true</constant>.</para> <para>See also the parameter <link linkend="DIRECTORYMASK"><parameter> directory mask</parameter></link> for details on masking mode bits @@ -2812,7 +2856,7 @@ caching algorithm will be used to reduce the time taken for getwd() calls. This can have a significant impact on performance, especially when the <link linkend="WIDELINKS"><parameter>wide links</parameter> - </link>parameter is set to <constant>False</constant>.</para> + </link>parameter is set to <constant>false</constant>.</para> <para>Default: <command>getwd cache = yes</command></para> </listitem> @@ -2945,9 +2989,19 @@ <varlistentry> + <term><anchor id="HIDEUNREADABLE">hide unreadable (S)</term> + <listitem><para>This parameter prevents clients from seeing the + existance of files that cannot be read. Defaults to off.</para> + + <para>Default: <command>hide unreadable = no</command></para></listitem> + </varlistentry> + + + + <varlistentry> <term><anchor id="HOMEDIRMAP">homedir map (G)</term> <listitem><para>If<link linkend="NISHOMEDIR"><parameter>nis homedir - </parameter></link> is <constant>True</constant>, and <ulink + </parameter></link> is <constant>true</constant>, and <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> is also acting as a Win95/98 <parameter>logon server</parameter> then this parameter specifies the NIS (or YP) map from which the server for the user's @@ -3088,7 +3142,7 @@ <parameter>hosts allow</parameter></link> which is about hosts access to services and is more useful for guest services. <parameter> hosts equiv</parameter> may be useful for NT clients which will - not supply passwords to samba.</para> + not supply passwords to Samba.</para> <para><emphasis>NOTE :</emphasis> The use of <parameter>hosts equiv </parameter> can be a major security hole. This is because you are @@ -3148,7 +3202,7 @@ inheritance (the code explicitly prohibits this).</para> <para>This can be particularly useful on large systems with - many users, perhaps several thousand,to allow a single [homes] + many users, perhaps several thousand, to allow a single [homes] share to be used flexibly by each user.</para> <para>See also <link linkend="CREATEMASK"><parameter>create mask @@ -3234,7 +3288,7 @@ '+' and '&' may be used at the start of the name in either order so the value <parameter>+&group</parameter> means check the UNIX group database, followed by the NIS netgroup database, and - the value <parameter>&+group"</parameter> means check the NIS + the value <parameter>&+group</parameter> means check the NIS netgroup database, followed by the UNIX group database (the same as the '@' prefix).</para> @@ -3286,9 +3340,9 @@ SMB/CIFS, NFS and local file access (and is a <emphasis>very</emphasis> cool feature :-).</para> - <para>This parameter defaults to <constant>on</constant> on systems - that have the support, and <constant>off</constant> on systems that - don't. You should never need to touch this parameter.</para> + <para>This parameter defaults to <constant>on</constant>, but is translated + to a no-op on systems that no not have the necessary kernel support. + You should never need to touch this parameter.</para> <para>See also the <link linkend="OPLOCKS"><parameter>oplocks</parameter> </link> and <link linkend="LEVEL2OPLOCKS"><parameter>level2 oplocks @@ -3303,8 +3357,8 @@ <varlistentry> <term><anchor id="LANMANAUTH">lanman auth (G)</term> - <listitem><para>This parameter determines whether or not smbd will - attempt to authentication users using the LANMAN password hash. + <listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink> will + attempt to authenticate users using the LANMAN password hash. If disabled, only clients which support NT password hashes (e.g. Windows NT/2000 clients, smbclient, etc... but not Windows 95/98 or the MS DOS network client) will be able to connect to the Samba host.</para> @@ -3314,7 +3368,27 @@ </varlistentry> + + + + <varlistentry> + <term><anchor id="LARGEREADWRITE">large readwrite (G)</term> + <listitem><para>This parameter determines whether or not <ulink url="smbd.8.html">smbd</ulink> + supports the new 64k streaming read and write varient SMB requests introduced + with Windows 2000. Note that due to Windows 2000 client redirector bugs + this requires Samba to be running on a 64-bit capable operating system such + as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with + Windows 2000 clients. Defaults to off. Not as tested as some other Samba + code paths. + </para> + <para>Default : <command>large readwrite = no</command></para> + </listitem> + </varlistentry> + + + + <varlistentry> <term><anchor id="LEVEL2OPLOCKS">level2 oplocks (S)</term> @@ -3345,7 +3419,7 @@ oplocks</parameter></link> are supported then level2 oplocks are not granted (even if this parameter is set to <constant>yes</constant>). Note also, the <link linkend="OPLOCKS"><parameter>oplocks</parameter> - </link> parameter must be set to "true" on this share in order for + </link> parameter must be set to <constant>true</constant> on this share in order for this parameter to have any effect.</para> <para>See also the <link linkend="OPLOCKS"><parameter>oplocks</parameter> @@ -3424,15 +3498,15 @@ <term><anchor id="LOCALMASTER">local master (G)</term> <listitem><para>This option allows <ulink url="nmbd.8.html"><command> nmbd(8)</command></ulink> to try and become a local master browser - on a subnet. If set to <constant>False</constant> then <command> + on a subnet. If set to <constant>false</constant> then <command> nmbd</command> will not attempt to become a local master browser on a subnet and will also lose in all browsing elections. By - default this value is set to true. Setting this value to true doesn't + default this value is set to <constant>true</constant>. Setting this value to <constant>true</constant> doesn't mean that Samba will <emphasis>become</emphasis> the local master browser on a subnet, just that <command>nmbd</command> will <emphasis> participate</emphasis> in elections for local master browser.</para> - <para>Setting this value to False will cause <command>nmbd</command> + <para>Setting this value to <constant>false</constant> will cause <command>nmbd</command> <emphasis>never</emphasis> to become a local master browser.</para> <para>Default: <command>local master = yes</command></para> @@ -3478,7 +3552,7 @@ <para>This option <emphasis>may</emphasis> be useful for read-only filesystems which <emphasis>may</emphasis> not need locking (such as - cdrom drives), although setting this parameter of <constant>no</constant> + CDROM drives), although setting this parameter of <constant>no</constant> is not really recommended even in this case.</para> <para>Be careful about disabling locking either globally or in a @@ -3560,7 +3634,7 @@ <para>This tells Samba to return the above string, with substitutions made when a client requests the info, generally in a NetUserGetInfo request. Win9X clients truncate the info to - \\server\share when a user does <command>net use /home"</command> + \\server\share when a user does <command>net use /home</command> but use the whole string when dealing with profiles.</para> <para>Note that in prior versions of Samba, the <link linkend="LOGONPATH"> @@ -3598,7 +3672,7 @@ <para>The share and the path must be readable by the user for the preferences and directories to be loaded onto the Windows NT - client. The share must be writeable when the logs in for the first + client. The share must be writeable when the user logs in for the first time, in order that the Windows NT client can create the NTuser.dat and other directories.</para> @@ -3632,7 +3706,7 @@ <listitem><para>This parameter specifies the batch file (.bat) or NT command file (.cmd) to be downloaded and run on a machine when a user successfully logs in. The file must contain the DOS - style cr/lf line endings. Using a DOS-style editor to create the + style CR/LF line endings. Using a DOS-style editor to create the file is recommended.</para> <para>The script must be a relative path to the [netlogon] @@ -3643,7 +3717,7 @@ <para><filename>/usr/local/samba/netlogon/STARTUP.BAT</filename></para> - <para>The contents of the batch file is entirely your choice. A + <para>The contents of the batch file are entirely your choice. A suggested command would be to add <command>NET TIME \\SERVER /SET /YES</command>, to force every machine to synchronize clocks with the same time server. Another use would be to add <command>NET USE @@ -3680,9 +3754,9 @@ of implementing this is by using job priorities, where jobs having a too low priority won't be sent to the printer.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. A <parameter>%j</parameter> is replaced with - the job number (an integer). On HPUX (see <parameter>printing = hpux + the job number (an integer). On HPUX (see <parameter>printing=hpux </parameter>), if the <parameter>-p%p</parameter> option is added to the lpq command, the job will show up with the correct status, i.e. if the job priority is lower than the set fence priority it will @@ -3763,7 +3837,7 @@ server reports on the first printer service connected to by the client. This only happens if the connection number sent is invalid.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. Otherwise it is placed at the end of the command.</para> @@ -3794,7 +3868,7 @@ also the <link linkend="LPPAUSECOMMAND"><parameter>lppause command </parameter></link> parameter.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. A <parameter>%j</parameter> is replaced with the job number (an integer).</para> @@ -3831,7 +3905,7 @@ <para>This command should be a program or script which takes a printer name and job number, and deletes the print job.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. A <parameter>%j</parameter> is replaced with the job number (an integer).</para> @@ -3855,7 +3929,7 @@ <varlistentry> <term><anchor id="MACHINEPASSWORDTIMEOUT">machine password timeout (G)</term> - <listitem><para>If a Samba server is a member of an Windows + <listitem><para>If a Samba server is a member of a Windows NT Domain (see the <link linkend="SECURITYEQUALSDOMAIN">security = domain</link>) parameter) then periodically a running <ulink url="smbd.8.html"> smbd(8)</ulink> process will try and change the MACHINE ACCOUNT @@ -3901,8 +3975,8 @@ executed on behalf of the connected user.</para> <para>Scripts executed in this way will be deleted upon - completion assuming that the user has the appripriate level - of priviledge and the ile permissions allow the deletion.</para> + completion assuming that the user has the appropriate level + of privilege and the file permissions allow the deletion.</para> <para>If the script generates output, output will be sent to the file specified by the <link linkend="MAGICOUTPUT"><parameter> @@ -3937,7 +4011,7 @@ <varlistentry> <term><anchor id="MANGLEDMAP">mangled map (S)</term> <listitem><para>This is for those who want to directly map UNIX - file names which can not be represented on Windows/DOS. The mangling + file names which cannot be represented on Windows/DOS. The mangling of names is not always what is needed. In particular you may have documents with file extensions that differ between DOS and UNIX. For example, under UNIX it is common to use <filename>.html</filename> @@ -3950,7 +4024,7 @@ <para><command>mangled map = (*.html *.htm)</command></para> <para>One very useful case is to remove the annoying <filename>;1 - </filename> off the ends of filenames on some CDROMS (only visible + </filename> off the ends of filenames on some CDROMs (only visible under some UNIXes). To do this use a map of (*;1 *;).</para> <para>Default: <emphasis>no mangled map</emphasis></para> @@ -4032,12 +4106,12 @@ <para>The larger this value, the more likely it is that mangled names can be successfully converted to correct long UNIX names. - However, large stack sizes will slow most directory access. Smaller + However, large stack sizes will slow most directory accesses. Smaller stacks save memory in the server (each stack element costs 256 bytes). </para> <para>It is not possible to absolutely guarantee correct long - file names, so be prepared for some surprises!</para> + filenames, so be prepared for some surprises!</para> <para>Default: <command>mangled stack = 50</command></para> <para>Example: <command>mangled stack = 100</command></para> @@ -4235,7 +4309,7 @@ <varlistentry> <term><anchor id="MAXMUX">max mux (G)</term> <listitem><para>This option controls the maximum number of - outstanding simultaneous SMB operations that samba tells the client + outstanding simultaneous SMB operations that Samba tells the client it will allow. You should never need to set this parameter.</para> <para>Default: <command>max mux = 50</command></para> @@ -4321,10 +4395,10 @@ <listitem><para>This parameter limits the maximum number of <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> processes concurrently running on a system and is intended - as a stop gap to prevent degrading service to clients in the event + as a stopgap to prevent degrading service to clients in the event that the server has insufficient resources to handle more than this number of connections. Remember that under normal operating - conditions, each user will have an smbd associated with him or her + conditions, each user will have an <ulink url="smbd.8.html">smbd</ulink> associated with him or her to handle connections to all shares from a given host. </para> @@ -4402,7 +4476,7 @@ THAT THIS COMMAND RETURN IMMEDIATELY</emphasis>. That's why I have the '&' on the end. If it doesn't return immediately then your PCs may freeze when sending messages (they should recover - after 30secs, hopefully).</para> + after 30 seconds, hopefully).</para> <para>All messages are delivered as the global guest user. The command takes the standard substitutions, although <parameter> @@ -4597,7 +4671,7 @@ connected subnet.</para></listitem> </itemizedlist> - <para>Default: <command>name resolve order = lmhosts wins host bcast + <para>Default: <command>name resolve order = lmhosts host wins bcast </command></para> <para>Example: <command>name resolve order = lmhosts bcast host </command></para> @@ -4756,7 +4830,7 @@ <varlistentry> <term><anchor id="OBEYPAMRESTRICTIONS">obey pam restrictions (G)</term> - <listitem><para>When Samba 2.2 is configure to enable PAM support + <listitem><para>When Samba 2.2 is configured to enable PAM support (i.e. --with-pam), this parameter will control whether or not Samba should obey PAM's account and session management directives. The default behavior is to use PAM for clear text authentication only @@ -4837,7 +4911,7 @@ improve the efficiency of the granting of oplocks under multiple client contention for the same file.</para> - <para>In brief it specifies a number, which causes smbd not to + <para>In brief it specifies a number, which causes <ulink url="smbd.8.html">smbd</ulink> not to grant an oplock even when requested if the approximate number of clients contending for an oplock on the same file goes over this limit. This causes <command>smbd</command> to behave in a similar @@ -4856,7 +4930,7 @@ <varlistentry> <term><anchor id="OPLOCKS">oplocks (S)</term> - <listitem><para>This boolean option tells smbd whether to + <listitem><para>This boolean option tells <command>smbd</command> whether to issue oplocks (opportunistic locks) to file open requests on this share. The oplock code can dramatically (approx. 30% or more) improve the speed of access to files on Samba servers. It allows the clients @@ -4917,7 +4991,7 @@ name>.<device name></para> <para>For example, a valid entry using the HP LaserJet 5 - printer driver woudl appear as <command>HP LaserJet 5L = LASERJET.HP + printer driver would appear as <command>HP LaserJet 5L = LASERJET.HP LaserJet 5L</command>.</para> <para>The need for the file is due to the printer driver namespace @@ -4934,13 +5008,15 @@ <varlistentry> <term><anchor id="PAMPASSWORDCHANGE">pam password change (G)</term> - <listitem><para>With the addition of better PAM support in Samba 2.2, - this parameter, it is possible to use PAM's password change control - flag for Samba. If enabled, then PAM will be used for password - changes when requested by an SMB client, and the <link - linkend="PASSWDCHAT"><parameter>passwd chat</parameter></link> must be - be changed to work with the pam prompts. - </para> + <listitem><para>With the addition of better PAM support in Samba 2.2, + this parameter, it is possible to use PAM's password change control + flag for Samba. If enabled, then PAM will be used for password + changes when requested by an SMB client instead of the program listed in + <link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter></link>. + It should be possible to enable this without changing your + <link linkend="PASSWDCHAT"><parameter>passwd chat</parameter></link> + parameter for most setups. + </para> <para>Default: <command>pam password change = no</command></para> @@ -4967,7 +5043,7 @@ <listitem><para>This string controls the <emphasis>"chat"</emphasis> conversation that takes places between <ulink url="smbd.8.html">smbd</ulink> and the local password changing - program to change the users password. The string describes a + program to change the user's password. The string describes a sequence of response-receive pairs that <ulink url="smbd.8.html"> smbd(8)</ulink> uses to determine what to send to the <link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter> @@ -4977,40 +5053,36 @@ <para>This chat sequence is often quite site specific, depending on what local methods are used for password control (such as NIS etc).</para> + <para>Note that this parameter only is only used if the <link + linkend="UNIXPASSWORDSYNC"><parameter>unix + password sync</parameter></link> parameter is set to <constant>yes</constant>. This + sequence is then called <emphasis>AS ROOT</emphasis> when the SMB password + in the smbpasswd file is being changed, without access to the old + password cleartext. This means that root must be able to reset the user's password + without knowing the text of the previous password. In the presence of NIS/YP, + this means that the <link linkend="PASSWDPROGRAM">passwd program</link> must be + executed on the NIS master. + </para> - <para>The string can contain the macros <parameter>%o</parameter> - and <parameter>%n</parameter> which are substituted for the old - and new passwords respectively. It can also contain the standard - macros <constant>\n</constant>, <constant>\r</constant>, <constant> - \t</constant> and <constant>%s</constant> to give line-feed, - carriage-return, tab and space.</para> - - <para>The string can also contain a '*' which matches - any sequence of characters.</para> - <para>Double quotes can be used to collect strings with spaces + <para>The string can contain the macro <parameter>%n</parameter> which is substituted + for the new password. The chat sequence can also contain the standard + macros <constant>\n</constant>, <constant>\r</constant>, <constant> + \t</constant> and <constant>\s</constant> to give line-feed, + carriage-return, tab and space. The chat sequence string can also contain + a '*' which matches any sequence of characters. + Double quotes can be used to collect strings with spaces in them into a single string.</para> <para>If the send string in any part of the chat sequence - is a fullstop ".", then no string is sent. Similarly, - if the expect string is a fullstop then no string is expected.</para> + is a full stop ".", then no string is sent. Similarly, + if the expect string is a full stop then no string is expected.</para> - <para>Note that if the <link linkend="UNIXPASSWORDSYNC"><parameter>unix - password sync</parameter></link> parameter is set to true, then this - sequence is called <emphasis>AS ROOT</emphasis> when the SMB password - in the smbpasswd file is being changed, without access to the old - password cleartext. In this case the old password cleartext is set - to "" (the empty string).</para> - - <para>Also, if the <link linkend="PAMPASSWORDCHANGE"><parameter>pam - password change</parameter></link> parameter is set to true, then the - chat sequence should consist of three elements. The first element should - match the pam prompt for the old password, the second element should match - the pam prompt for the first request for the new password, and the final - element should match the pam prompt for the second request for the new password. - These matches are done case insentively. Under most conditions this change - is done as root so the prompt for the old password will never be matched. - </para> + <para>If the <link linkend="PAMPASSWORDCHANGE"><parameter>pam + password change</parameter></link> parameter is set to true, the chat pairs + may be matched in any order, and sucess is determined by the PAM result, + not any particular output. The \n macro is ignored for PAM conversions. + </para> <para>See also <link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link>, <link linkend="PASSWDPROGRAM"><parameter> @@ -5039,12 +5111,15 @@ to be seen in the <command>smbd</command> log. It is available to help Samba admins debug their <parameter>passwd chat</parameter> scripts when calling the <parameter>passwd program</parameter> and should - be turned off after this has been done. This parameter is off by - default.</para> + be turned off after this has been done. This option has no effect if the + <link linkend="PAMPASSWORDCHANGE"><parameter>pam password change</parameter></link> + paramter is set. This parameter is off by default.</para> + - <para>See also <<link linkend="PASSWDCHAT"><parameter>passwd chat</parameter> - </link>, <link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter> - </link>.</para> + <para>See also <link linkend="PASSWDCHAT"><parameter>passwd chat</parameter> + </link>, <link linkend="PAMPASSWORDCHANGE"><parameter>pam password change</parameter> + </link>, <link linkend="PASSWDPROGRAM"><parameter>passwd program</parameter> + </link>.</para> <para>Default: <command>passwd chat debug = no</command></para> </listitem> @@ -5066,7 +5141,7 @@ it.</para> <para><emphasis>Note</emphasis> that if the <parameter>unix - password sync</parameter> parameter is set to <constant>True + password sync</parameter> parameter is set to <constant>true </constant> then this program is called <emphasis>AS ROOT</emphasis> before the SMB password in the <ulink url="smbpasswd.5.html">smbpasswd(5) </ulink> file is changed. If this UNIX password change fails, then @@ -5077,7 +5152,7 @@ is set this parameter <emphasis>MUST USE ABSOLUTE PATHS</emphasis> for <emphasis>ALL</emphasis> programs called, and must be examined for security implications. Note that by default <parameter>unix - password sync</parameter> is set to <constant>False</constant>.</para> + password sync</parameter> is set to <constant>false</constant>.</para> <para>See also <link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link>.</para> @@ -5277,7 +5352,7 @@ substitutions. The command may be run as the root on some systems.</para> - <para>An interesting example may be do unmount server + <para>An interesting example may be to unmount server resources:</para> <para><command>postexec = /etc/umount /cdrom</command></para> @@ -5298,7 +5373,7 @@ <varlistentry> <term><anchor id="POSTSCRIPT">postscript (S)</term> <listitem><para>This parameter forces a printer to interpret - the print files as postscript. This is done by adding a <constant>%! + the print files as PostScript. This is done by adding a <constant>%! </constant> to the start of print output.</para> <para>This is most useful when you have lots of PCs that persist @@ -5354,7 +5429,7 @@ url="nmbd.8.html">nmbd(8)</ulink> is a preferred master browser for its workgroup.</para> - <para>If this is set to true, on startup, <command>nmbd</command> + <para>If this is set to <constant>true</constant>, on startup, <command>nmbd</command> will force an election, and it will have a slight advantage in winning the election. It is recommended that this parameter is used in conjunction with <command><link linkend="DOMAINMASTER"><parameter> @@ -5591,11 +5666,11 @@ <varlistentry> <term><anchor id="PRINTERDRIVER">printer driver (S)</term> - <listitem><para><emphasis>Note :</emphasis>This is a depreciated + <listitem><para><emphasis>Note :</emphasis>This is a deprecated parameter and will be removed in the next major release following version 2.2. Please see the instructions in - <filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs - </filename> of the Samba distribution for more information + the <ulink url="printer_driver2.html">Samba 2.2. Printing + HOWTO</ulink> for more information on the new method of loading printer drivers onto a Samba server. </para> @@ -5624,11 +5699,11 @@ <varlistentry> <term><anchor id="PRINTERDRIVERFILE">printer driver file (G)</term> - <listitem><para><emphasis>Note :</emphasis>This is a depreciated + <listitem><para><emphasis>Note :</emphasis>This is a deprecated parameter and will be removed in the next major release following version 2.2. Please see the instructions in - <filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs - </filename> of the Samba distribution for more information + the <ulink url="printer_driver2.html">Samba 2.2. Printing + HOWTO</ulink> for more information on the new method of loading printer drivers onto a Samba server. </para> @@ -5642,7 +5717,7 @@ <para>This file is created from Windows 95 <filename>msprint.inf </filename> files found on the Windows 95 client system. For more details on setting up serving of printer drivers to Windows 95 - clients, see the documentation file in the <filename>docs/</filename> + clients, see the outdated documentation file in the <filename>docs/</filename> directory, <filename>PRINTER_DRIVER.txt</filename>.</para> <para>See also <link linkend="PRINTERDRIVERLOCATION"><parameter> @@ -5660,11 +5735,11 @@ <varlistentry> <term><anchor id="PRINTERDRIVERLOCATION">printer driver location (S)</term> - <listitem><para><emphasis>Note :</emphasis>This is a depreciated + <listitem><para><emphasis>Note :</emphasis>This is a deprecated parameter and will be removed in the next major release following version 2.2. Please see the instructions in - <filename>PRINTER_DRIVER2.txt</filename> in the <filename>docs - </filename> of the Samba distribution for more information + the <ulink url="printer_driver2.html">Samba 2.2. Printing + HOWTO</ulink> for more information on the new method of loading printer drivers onto a Samba server. </para> @@ -5677,7 +5752,7 @@ <para>Where MACHINE is the NetBIOS name of your Samba server, and PRINTER$ is a share you set up for serving printer driver - files. For more details on setting this up see the documentation + files. For more details on setting this up see the outdated documentation file in the <filename>docs/</filename> directory, <filename> PRINTER_DRIVER.txt</filename>.</para> @@ -5726,7 +5801,7 @@ <parameter>lpq command</parameter>, <parameter>lppause command </parameter>, <parameter>lpresume command</parameter>, and <parameter>lprm command</parameter> if specified in the - [global]f> section.</para> + [global] section.</para> <para>Currently eight printing styles are supported. They are <constant>BSD</constant>, <constant>AIX</constant>, @@ -5770,17 +5845,17 @@ <varlistentry> <term><anchor id="QUEUEPAUSECOMMAND">queuepause command (S)</term> <listitem><para>This parameter specifies the command to be - executed on the server host in order to pause the printerqueue.</para> + executed on the server host in order to pause the printer queue.</para> <para>This command should be a program or script which takes - a printer name as its only parameter and stops the printerqueue, + a printer name as its only parameter and stops the printer queue, such that no longer jobs are submitted to the printer.</para> <para>This command is not supported by Windows for Workgroups, - but can be issued from the Printer's window under Windows 95 + but can be issued from the Printers window under Windows 95 and NT.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. Otherwise it is placed at the end of the command. </para> @@ -5799,20 +5874,20 @@ <varlistentry> <term><anchor id="QUEUERESUMECOMMAND">queueresume command (S)</term> <listitem><para>This parameter specifies the command to be - executed on the server host in order to resume the printerqueue. It + executed on the server host in order to resume the printer queue. It is the command to undo the behavior that is caused by the previous parameter (<link linkend="QUEUEPAUSECOMMAND"><parameter> queuepause command</parameter></link>).</para> <para>This command should be a program or script which takes - a printer name as its only parameter and resumes the printerqueue, + a printer name as its only parameter and resumes the printer queue, such that queued jobs are resubmitted to the printer.</para> <para>This command is not supported by Windows for Workgroups, - but can be issued from the Printer's window under Windows 95 + but can be issued from the Printers window under Windows 95 and NT.</para> - <para>If a <parameter>%p</parameter> is given then the printername + <para>If a <parameter>%p</parameter> is given then the printer name is put in its place. Otherwise it is placed at the end of the command.</para> @@ -5944,7 +6019,7 @@ <para><command>remote announce = 192.168.2.255/SERVERS 192.168.4.255/STAFF</command></para> - <para>the above line would cause nmbd to announce itself + <para>the above line would cause <command>nmbd</command> to announce itself to the two given IP addresses using the given workgroup names. If you leave out the workgroup name then the one given in the <link linkend="WORKGROUP"><parameter>workgroup</parameter></link> @@ -5968,10 +6043,10 @@ <term><anchor id="REMOTEBROWSESYNC">remote browse sync (G)</term> <listitem><para>This option allows you to setup <ulink url="nmbd.8.html">nmbd(8)</ulink> to periodically request - synchronization of browse lists with the master browser of a samba + synchronization of browse lists with the master browser of a Samba server that is on a remote segment. This option will allow you to gain browse lists for multiple workgroups across routed networks. This - is done in a manner that does not work with any non-samba servers.</para> + is done in a manner that does not work with any non-Samba servers.</para> <para>This is useful if you want your Samba server and all local clients to appear in a remote workgroup for which the normal browse @@ -5992,7 +6067,7 @@ of known browse masters if your network config is that stable. If a machine IP address is given Samba makes NO attempt to validate that the remote machine is available, is listening, nor that it - is in fact the browse master on it's segment.</para> + is in fact the browse master on its segment.</para> <para>Default: <command>remote browse sync = <empty string> </command></para> @@ -6003,12 +6078,12 @@ <varlistentry> <term><anchor id="RESTRICTACLWITHMASK">restrict acl with mask (S)</term> - <listitem><para>This is a boolean parameter. If set to false (default), then - Creation of files with access control lists (ACLS) and modification of ACLs + <listitem><para>This is a boolean parameter. If set to <constant>false</constant> (default), then + creation of files with access control lists (ACLS) and modification of ACLs using the Windows NT/2000 ACL editor will be applied directly to the file or directory.</para> - <para>If set to True, then all requests to set an ACL on a file will have the + <para>If set to <constant>true</constant>, then all requests to set an ACL on a file will have the parameters <link linkend="CREATEMASK"><parameter>create mask</parameter></link>, <link linkend="FORCECREATEMODE"><parameter>force create mode</parameter></link> applied before setting the ACL, and all requests to set an ACL on a directory will @@ -6032,10 +6107,10 @@ <varlistentry> <term><anchor id="RESTRICTANONYMOUS">restrict anonymous (G)</term> - <listitem><para>This is a boolean parameter. If it is true, then + <listitem><para>This is a boolean parameter. If it is <constant>true</constant>, then anonymous access to the server will be restricted, namely in the case where the server is expecting the client to send a username, - but it doesn't. Setting it to true will force these anonymous + but it doesn't. Setting it to <constant>true</constant> will force these anonymous connections to be denied, and the client will be required to always supply a username and password when connecting. Use of this parameter is only recommended for homogeneous NT client environments.</para> @@ -6045,10 +6120,10 @@ likes to use anonymous connections when refreshing the share list, and this is a way to work around that.</para> - <para>When restrict anonymous is true, all anonymous connections + <para>When restrict anonymous is <constant>true</constant>, all anonymous connections are denied no matter what they are for. This can effect the ability - of a machine to access the samba Primary Domain Controller to revalidate - it's machine account after someone else has logged on the client + of a machine to access the Samba Primary Domain Controller to revalidate + its machine account after someone else has logged on the client interactively. The NT client will display a message saying that the machine's account in the domain doesn't exist or the password is bad. The best way to deal with this is to reboot NT client machines @@ -6081,7 +6156,7 @@ <varlistentry> <term><anchor id="ROOTDIRECTORY">root directory (G)</term> <listitem><para>The server will <command>chroot()</command> (i.e. - Change it's root directory) to this directory on startup. This is + Change its root directory) to this directory on startup. This is not strictly necessary for secure operation. Even without it the server will deny access to files not in one of the service entries. It may also check for, and deny access to, soft links to other @@ -6115,7 +6190,7 @@ <listitem><para>This is the same as the <parameter>postexec</parameter> parameter except that the command is run as root. This is useful for unmounting filesystems - (such as cdroms) after a connection is closed.</para> + (such as CDROMs) after a connection is closed.</para> <para>See also <link linkend="POSTEXEC"><parameter> postexec</parameter></link>.</para> @@ -6129,8 +6204,8 @@ <term><anchor id="ROOTPREEXEC">root preexec (S)</term> <listitem><para>This is the same as the <parameter>preexec</parameter> parameter except that the command is run as root. This - is useful for mounting filesystems (such as cdroms) after a - connection is closed.</para> + is useful for mounting filesystems (such as CDROMs) when a + connection is opened.</para> <para>See also <link linkend="PREEXEC"><parameter> preexec</parameter></link> and <link linkend="PREEXECCLOSE"> @@ -6213,7 +6288,7 @@ <para><anchor id="SECURITYEQUALSSHARE"><emphasis>SECURITY = SHARE </emphasis></para> - <para>When clients connect to a share level security server then + <para>When clients connect to a share level security server they need not log onto the server with a valid username and password before attempting to connect to a shared resource (although modern clients such as Windows 95/98 and Windows NT will send a logon request with @@ -6279,7 +6354,7 @@ <para>See also the section <link linkend="VALIDATIONSECT"> NOTE ABOUT USERNAME/PASSWORD VALIDATION</link>.</para> - <para><anchor id="SECURITYEQUALSUSER"><emphasis>SECURIYT = USER + <para><anchor id="SECURITYEQUALSUSER"><emphasis>SECURITY = USER </emphasis></para> <para>This is the default security setting in Samba 2.2. @@ -6319,7 +6394,7 @@ <filename>ENCRYPTION.txt</filename> for details on how to set this up.</para> - <para><emphasis>Note</emphasis> that from the clients point of + <para><emphasis>Note</emphasis> that from the client's point of view <command>security = server</command> is the same as <command> security = user</command>. It only affects how the server deals with the authentication, it does not in any way affect what the @@ -6358,7 +6433,7 @@ exist as well as the account on the Domain Controller to allow Samba to have a valid UNIX account to map file access to.</para> - <para><emphasis>Note</emphasis> that from the clients point + <para><emphasis>Note</emphasis> that from the client's point of view <command>security = domain</command> is the same as <command>security = user </command>. It only affects how the server deals with the authentication, it does not in any way affect what the client sees.</para> @@ -6416,7 +6491,7 @@ Samba server through other means can easily bypass this restriction, so it is primarily useful for standalone "appliance" systems. Administrators of most normal systems will - probably want to leave it set to 0777.</para> + probably want to leave it set to <constant>0777</constant>.</para> <para>See also the <link linkend="FORCEDIRECTORYSECURITYMODE"> <parameter>force directory security mode</parameter></link>, @@ -6472,35 +6547,6 @@ - <varlistentry> - <term><anchor id="SHAREMODES">share modes (S)</term> - <listitem><para>This enables or disables the honoring of - the <parameter>share modes</parameter> during a file open. These - modes are used by clients to gain exclusive read or write access - to a file.</para> - - <para>These open modes are not directly supported by UNIX, so - they are simulated using shared memory, or lock files if your - UNIX doesn't support shared memory (almost all do).</para> - - <para>The share modes that are enabled by this option are - <constant>DENY_DOS</constant>, <constant>DENY_ALL</constant>, - <constant>DENY_READ</constant>, <constant>DENY_WRITE</constant>, - <constant>DENY_NONE</constant> and <constant>DENY_FCB</constant>. - </para> - - <para>This option gives full share compatibility and enabled - by default.</para> - - <para>You should <emphasis>NEVER</emphasis> turn this parameter - off as many Windows applications will break if you do so.</para> - - <para>Default: <command>share modes = yes</command></para> - </listitem> - </varlistentry> - - - <varlistentry> <term><anchor id="SHORTPRESERVECASE">short preserve case (S)</term> @@ -6536,7 +6582,7 @@ Administrator privileges. If the user does not have administrative access on the print server (i.e is not root or a member of the <parameter>printer admin</parameter> group), the OpenPrinterEx() - call fails and the clients another open call with a request for + call fails and the client makes another open call with a request for a lower privilege level. This should succeed, however the APW icon will not be displayed.</para> @@ -6557,6 +6603,49 @@ + <varlistentry> + <term><anchor id="SHUTDOWNSCRIPT">shutdown script (G)</term> + <listitem><para><emphasis>This parameter only exists in the HEAD cvs branch</emphasis> + This a full path name to a script called by + <ulink url="smbd.8.html"><command>smbd(8)</command></ulink> that + should start a shutdown procedure.</para> + + <para>This command will be run as the user connected to the + server.</para> + + <para>%m %t %r %f parameters are expanded</para> + <para><parameter>%m</parameter> will be substituted with the + shutdown message sent to the server.</para> + <para><parameter>%t</parameter> will be substituted with the + number of seconds to wait before effectively starting the + shutdown procedure.</para> + <para><parameter>%r</parameter> will be substituted with the + switch <emphasis>-r</emphasis>. It means reboot after shutdown + for NT. + </para> + <para><parameter>%f</parameter> will be substituted with the + switch <emphasis>-f</emphasis>. It means force the shutdown + even if applications do not respond for NT.</para> + + <para>Default: <emphasis>None</emphasis>.</para> + <para>Example: <command>abort shutdown script = /usr/local/samba/sbin/shutdown %m %t %r %f</command></para> + <para>Shutdown script example: + <programlisting> + #!/bin/bash + + $time=0 + let "time/60" + let "time++" + + /sbin/shutdown $3 $4 +$time $1 & + </programlisting> + Shutdown does not return so we need to launch it in background. + </para> + + <para>See also <link linkend="ABORTSHUTDOWNSCRIPT"><parameter>abort shutdown script</parameter></link>.</para> + </listitem> + </varlistentry> + <varlistentry> <term><anchor id="SMBPASSWDFILE">smb passwd file (G)</term> @@ -6582,7 +6671,7 @@ support multiple virtual interfaces on the one server, each with a different configuration.</para> - <para>By default samba will accept connections on any + <para>By default Samba will accept connections on any address.</para> <para>Example: <command>socket address = 192.168.2.20</command> @@ -6703,8 +6792,8 @@ current binary version of Samba.</para> <para>This variable enables or disables the entire SSL mode. If - it is set to <constant>no</constant>, the SSL enabled samba behaves - exactly like the non-SSL samba. If set to <constant>yes</constant>, + it is set to <constant>no</constant>, the SSL-enabled Samba behaves + exactly like the non-SSL Samba. If set to <constant>yes</constant>, it depends on the variables <link linkend="SSLHOSTS"><parameter> ssl hosts</parameter></link> and <link linkend="SSLHOSTSRESIGN"> <parameter>ssl hosts resign</parameter></link> whether an SSL @@ -6729,7 +6818,7 @@ <para>This variable defines where to look up the Certification Authorities. The given directory should contain one file for - each CA that samba will trust. The file name must be the hash + each CA that Samba will trust. The file name must be the hash value over the "Distinguished Name" of the CA. How this directory is set up is explained later in this document. All files within the directory that don't fit into this naming scheme are ignored. You @@ -6871,14 +6960,14 @@ this code is <emphasis>NOT</emphasis> enabled by default in any current binary version of Samba.</para> - <para>These two variables define whether samba will go - into SSL mode or not. If none of them is defined, samba will + <para>These two variables define whether Samba will go + into SSL mode or not. If none of them is defined, Samba will allow only SSL connections. If the <link linkend="SSLHOSTS"> <parameter>ssl hosts</parameter></link> variable lists hosts (by IP-address, IP-address range, net group or name), only these hosts will be forced into SSL mode. If the <parameter> ssl hosts resign</parameter> variable lists hosts, only these - hosts will NOT be forced into SSL mode. The syntax for these two + hosts will <emphasis>NOT</emphasis> be forced into SSL mode. The syntax for these two variables is the same as for the <link linkend="HOSTSALLOW"><parameter> hosts allow</parameter></link> and <link linkend="HOSTSDENY"> <parameter>hosts deny</parameter></link> pair of variables, only @@ -7070,7 +7159,7 @@ <para>When strict locking is <constant>no</constant> the server does file lock checks only when the client explicitly asks for them.</para> - <para>Well behaved clients always ask for lock checks when it + <para>Well-behaved clients always ask for lock checks when it is important, so in the vast majority of cases <command>strict locking = no</command> is preferable.</para> @@ -7089,7 +7178,7 @@ all outstanding data in kernel disk buffers has been safely stored onto stable storage. This is very slow and should only be done rarely. Setting this parameter to <constant>no</constant> (the - default) means that smbd ignores the Windows applications requests for + default) means that <ulink url="smbd.8.html">smbd</ulink> ignores the Windows applications requests for a sync call. There is only a possibility of losing data if the operating system itself that Samba is running on crashes, so there is little danger in this default setting. In addition, this fixes many @@ -7120,10 +7209,10 @@ <term><anchor id="SYNCALWAYS">sync always (S)</term> <listitem><para>This is a boolean parameter that controls whether writes will always be written to stable storage before - the write call returns. If this is false then the server will be + the write call returns. If this is <constant>false</constant> then the server will be guided by the client's request in each write call (clients can set a bit indicating that a particular write should be synchronous). - If this is true then every write will be followed by a <command>fsync() + If this is <constant>true</constant> then every write will be followed by a <command>fsync() </command> call to ensure the data is written to disk. Note that the <parameter>strict sync</parameter> parameter must be set to <constant>yes</constant> in order for this parameter to have @@ -7172,10 +7261,7 @@ <varlistentry> <term><anchor id="TEMPLATEHOMEDIR">template homedir (G)</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is - only available in Samba 3.0.</para> - - <para>When filling out the user information for a Windows NT + <listitem><para>When filling out the user information for a Windows NT user, the <ulink url="winbindd.8.html">winbindd(8)</ulink> daemon uses this parameter to fill in the home directory for that user. If the string <parameter>%D</parameter> is present it is substituted @@ -7191,10 +7277,7 @@ <varlistentry> <term><anchor id="TEMPLATESHELL">template shell (G)</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is - only available in Samba 3.0.</para> - - <para>When filling out the user information for a Windows NT + <listitem><para>When filling out the user information for a Windows NT user, the <ulink url="winbindd.8.html">winbindd(8)</ulink> daemon uses this parameter to fill in the login shell for that user.</para> @@ -7245,7 +7328,7 @@ <listitem><para>This parameter accepts an integer value which defines a limit on the maximum number of print jobs that will be accepted system wide at any given time. If a print job is submitted - by a client which will exceed this number, then smbd will return an + by a client which will exceed this number, then <ulink url="smbd.8.html">smbd</ulink> will return an error indicating that no space is available on the server. The default value of 0 means that no such limit exists. This parameter can be used to prevent a server from exceeding its capacity and is @@ -7266,10 +7349,10 @@ <listitem><para>This boolean parameter controls whether Samba attempts to synchronize the UNIX password with the SMB password when the encrypted SMB password in the smbpasswd file is changed. - If this is set to true the program specified in the <parameter>passwd + If this is set to <constant>true</constant> the program specified in the <parameter>passwd program</parameter>parameter is called <emphasis>AS ROOT</emphasis> - to allow the new UNIX password to be set without access to the - old UNIX password (as the SMB password has change code has no + old UNIX password (as the SMB password change code has no access to the old password cleartext, only the new).</para> <para>See also <link linkend="PASSWDPROGRAM"><parameter>passwd @@ -7313,11 +7396,48 @@ </varlistentry> + <varlistentry> + <term><anchor id="USECLIENTDRIVER">use client driver (S)</term> + <listitem><para>This parameter applies only to Windows NT/2000 + clients. It has no affect on Windows 95/98/ME clients. When + serving a printer to Windows NT/2000 clients without first installing + a valid printer driver on the Samba host, the client will be required + to install a local printer driver. From this point on, the client + will treat the print as a local printer and not a network printer + connection. This is much the same behavior that will occur + when <command>disable spoolss = yes</command>. </para> + + <para>The differentiating + factor is that under normal circumstances, the NT/2000 client will + attempt to open the network printer using MS-RPC. The problem is that + because the client considers the printer to be local, it will attempt + to issue the OpenPrinterEx() call requesting access rights associated + with the logged on user. If the user possesses local administator rights + but not root privilegde on the Samba host (often the case), the OpenPrinterEx() + call will fail. The result is that the client will now display an "Access + Denied; Unable to connect" message in the printer queue window (even though + jobs may successfully be printed). </para> + + <para>If this parameter is enabled for a printer, then any attempt + to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped + to PRINTER_ACCESS_USE instead. Thus allowing the OpenPrinterEx() + call to succeed. <emphasis>This parameter MUST not be able enabled + on a print share which has valid print driver installed on the Samba + server.</emphasis></para> + + <para>See also <link linkend="DISABLESPOOLSS">disable spoolss</link> + </para> + + <para>Default: <command>use client driver = no</command></para> + </listitem> + </varlistentry> + + <varlistentry> <term><anchor id="USERHOSTS">use rhosts (G)</term> - <listitem><para>If this global parameter is a true, it specifies - that the UNIX users <filename>.rhosts</filename> file in their home directory + <listitem><para>If this global parameter is <constant>true</constant>, it specifies + that the UNIX user's <filename>.rhosts</filename> file in their home directory will be read to find the names of hosts and users who will be allowed access without specifying a password.</para> @@ -7384,7 +7504,7 @@ </parameter></link> parameter.</para> <para>If any of the usernames begin with a '@' then the name - will be looked up first in the yp netgroups list (if Samba + will be looked up first in the NIS netgroups list (if Samba is compiled with netgroup support), followed by a lookup in the UNIX groups database and will expand to a list of all users in the group of that name.</para> @@ -7394,7 +7514,7 @@ expand to a list of all users in the group of that name.</para> <para>If any of the usernames begin with a '&'then the name - will be looked up only in the yp netgroups database (if Samba + will be looked up only in the NIS netgroups database (if Samba is compiled with netgroup support) and will expand to a list of all users in the netgroup group of that name.</para> @@ -7533,10 +7653,10 @@ <varlistentry> - <term><anchor id="UTMP">utmp (S)</term> + <term><anchor id="UTMP">utmp (G)</term> <listitem><para>This boolean parameter is only available if Samba has been configured and compiled with the option <command> - --with-utmp</command>. If set to True then Samba will attempt + --with-utmp</command>. If set to <constant>true</constant> then Samba will attempt to add utmp or utmpx records (depending on the UNIX system) whenever a connection is made to a Samba server. Sites may use this to record the user connecting to a Samba share.</para> @@ -7678,7 +7798,7 @@ to be deleted contains nothing but veto files this deletion will <emphasis>fail</emphasis> unless you also set the <parameter>delete veto files</parameter> parameter to - <parameter>yes</parameter>. + <parameter>yes</parameter>.</para> <para>Setting this parameter will affect the performance of Samba, as it will be forced to check all files and directories @@ -7751,7 +7871,7 @@ <varlistentry> <term><anchor id="VFSOPTIONS">vfs options (S)</term> <listitem><para>This parameter allows parameters to be passed - to the vfs layer at initialisation time. The Samba VFS layer + to the vfs layer at initialization time. The Samba VFS layer is new to Samba 2.2 and must be enabled at compile time with --with-vfs. See also <link linkend="VFSOBJECT"><parameter> vfs object</parameter></link>.</para> @@ -7795,10 +7915,7 @@ <varlistentry> <term><anchor id="WINBINDCACHETIME">winbind cache time</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is only - available in Samba 3.0.</para> - - <para>This parameter specifies the number of seconds the + <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 again.</para> @@ -7808,17 +7925,55 @@ </varlistentry> + <varlistentry> + <term><anchor id="WINBINDENUMUSERS">winbind enum + users</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>, + <command>getpwent()</command> and + <command>endpwent()</command> group of system calls. If + the <parameter>winbind enum users</parameter> parameter is + false, calls to the <command>getpwent</command> system call + will not return any data. </para> + + <para><emphasis>Warning:</emphasis> Turning off user + enumeration may cause some programs to behave oddly. For + example, the finger program relies on having access to the + full user list when searching for matching + usernames. </para> + + <para>Default: <command>winbind enum users = yes </command></para> + </listitem> + </varlistentry> + + <varlistentry> + <term><anchor id="WINBINDENUMGROUPS">winbind enum + groups</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>, + <command>getgrent()</command> and + <command>endgrent()</command> group of system calls. If + the <parameter>winbind enum groups</parameter> parameter is + false, calls to the <command>getgrent()</command> system + call will not return any data. </para> + + <para><emphasis>Warning:</emphasis> Turning off group + enumeration may cause some programs to behave oddly. + </para> + + <para>Default: <command>winbind enum groups = no </command> + </para></listitem> + </varlistentry> <varlistentry> <term><anchor id="WINBINDGID">winbind gid</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is only - available in Samba 3.0.</para> - - <para>The winbind gid parameter specifies the range of group + <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 - existing local or nis groups within it as strange conflicts can + existing local or NIS groups within it as strange conflicts can occur otherwise.</para> <para>Default: <command>winbind gid = <empty string> @@ -7831,10 +7986,7 @@ <varlistentry> <term><anchor id="WINBINDSEPARATOR">winbind separator</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is only - available in Samba 3.0.</para> - - <para>This parameter allows an admin to define the character + <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 is only applicable when using the <filename>pam_winbind.so</filename> @@ -7851,13 +8003,10 @@ <varlistentry> <term><anchor id="WINBINDUID">winbind uid</term> - <listitem><para><emphasis>NOTE:</emphasis> this parameter is only - available in Samba 3.0.</para> - - <para>The winbind gid parameter specifies the range of group + <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 - existing local or nis users within it as strange conflicts can + existing local or NIS users within it as strange conflicts can occur otherwise.</para> <para>Default: <command>winbind uid = <empty string> @@ -7893,12 +8042,12 @@ name has not previously been added, in that case it should be treated as an add.</para></listitem> - <listitem><para>The second argument is the netbios name. If the + <listitem><para>The second argument is the NetBIOS name. If the name is not a legal name then the wins hook is not called. Legal names contain only letters, digits, hyphens, underscores and periods.</para></listitem> - <listitem><para>The third argument is the netbios name + <listitem><para>The third argument is the NetBIOS name type as a 2 digit hexadecimal number. </para></listitem> <listitem><para>The fourth argument is the TTL (time to live) @@ -7961,9 +8110,9 @@ <term><anchor id="WINSSUPPORT">wins support (G)</term> <listitem><para>This boolean controls if the <ulink url="nmbd.8.html"> nmbd(8)</ulink> process in Samba will act as a WINS server. You should - not set this to true unless you have a multi-subnetted network and + not set this to <constant>true</constant> unless you have a multi-subnetted network and you wish a particular <command>nmbd</command> to be your WINS server. - Note that you should <emphasis>NEVER</emphasis> set this to true + Note that you should <emphasis>NEVER</emphasis> set this to <constant>true</constant> on more than one machine in your network.</para> <para>Default: <command>wins support = no</command></para> @@ -8010,7 +8159,7 @@ within it.</para> <para>This cache allows Samba to batch client writes into a more - efficient write size for RAID disks (ie. writes may be tuned to + efficient write size for RAID disks (i.e. writes may be tuned to be the RAID stripe size) and can improve performance on systems where the disk subsystem is a bottleneck but there is free memory for userspace programs.</para> @@ -8068,7 +8217,7 @@ <varlistentry> <term><anchor id="WRITERAW">write raw (G)</term> <listitem><para>This parameter controls whether or not the server - will support raw writes SMB's when transferring data from clients. + will support raw write SMB's when transferring data from clients. You should never need to change this parameter.</para> <para>Default: <command>write raw = yes</command></para> diff --git a/docs/docbook/manpages/smbcacls.1.sgml b/docs/docbook/manpages/smbcacls.1.sgml index 997af68331..69aa967492 100644 --- a/docs/docbook/manpages/smbcacls.1.sgml +++ b/docs/docbook/manpages/smbcacls.1.sgml @@ -26,7 +26,6 @@ <arg choice="opt">-G name</arg> <arg choice="opt">-n</arg> <arg choice="opt">-h</arg> - <arg choice="opt">-d</arg> </cmdsynopsis> </refsynopsisdiv> @@ -36,7 +35,7 @@ <para>This tool is part of the <ulink url="samba.7.html"> Samba</ulink> suite.</para> - <para>The smbcacls program manipulates NT Access Control Lists + <para>The <command>smbcacls</command> program manipulates NT Access Control Lists (ACLs) on SMB file shares. </para> </refsect1> @@ -44,7 +43,7 @@ <refsect1> <title>OPTIONS</title> - <para>The following options are available to the smbcacls program. + <para>The following options are available to the <command>smbcacls</command> program. The format of ACLs is described in the section ACL FORMAT </para> @@ -69,7 +68,7 @@ <varlistentry> <term>-D acls</term> - <listitem><para>Delete any ACLs specfied on the command line. + <listitem><para>Delete any ACLs specified on the command line. An error will be printed for each ACL specified that was not already present in the ACL list. </para></listitem> </varlistentry> @@ -138,15 +137,6 @@ <listitem><para>Print usage information on the <command>smbcacls </command> program.</para></listitem> </varlistentry> - - - - <varlistentry> - <term>-d debuglevel</term> - <listitem><para>Sets the debug level to the value given - rather than use the value from the - <filename>smb.conf</filename> file.</para></listitem> - </varlistentry> </variablelist> </refsect1> @@ -233,8 +223,8 @@ ACL:<sid or name>:<type>/<flags>/<mask> depending on the success or otherwise of the operations performed. The exit status may be one of the following values. </para> - <para>If the operation succeded, smbcacls returns and exit - status of 0. If smbcacls couldn't connect to the specified server, + <para>If the operation succeeded, smbcacls returns and exit + status of 0. If <command>smbcacls</command> couldn't connect to the specified server, or there was an error getting or setting the ACLs, an exit status of 1 is returned. If there was an error parsing any command line arguments, an exit status of 2 is returned. </para> diff --git a/docs/docbook/manpages/smbclient.1.sgml b/docs/docbook/manpages/smbclient.1.sgml index f82d59d29c..6cc7be654a 100644 --- a/docs/docbook/manpages/smbclient.1.sgml +++ b/docs/docbook/manpages/smbclient.1.sgml @@ -21,7 +21,6 @@ <arg choice="opt">-b <buffer size></arg> <arg choice="opt">-d debuglevel</arg> <arg choice="opt">-D Directory</arg> - <arg choice="opt">-S server</arg> <arg choice="opt">-U username</arg> <arg choice="opt">-W workgroup</arg> <arg choice="opt">-M <netbios name></arg> @@ -81,8 +80,8 @@ </para> <para>The server name is looked up according to either - the <parameter>-R</parameter> parameter to smbclient or - using the name resolve order parameter in the smb.conf file, + the <parameter>-R</parameter> parameter to <command>smbclient</command> or + using the name resolve order parameter in the <filename>smb.conf</filename> file, allowing an administrator to change the order and methods by which server names are looked up. </para></listitem> </varlistentry> @@ -131,7 +130,7 @@ <term>-R <name resolve order></term> <listitem><para>This option is used by the programs in the Samba suite to determine what naming services and in what order to resolve - host names to IP addresses. The option takes a space separated + 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 @@ -147,7 +146,7 @@ <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 depended for instance on IRIX or Solaris this + 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 @@ -172,7 +171,7 @@ <para>The default order is lmhosts, host, wins, bcast and without this parameter or any entry in the <parameter>name resolve order - </parameter> parameter of the smb.conf file the name resolution + </parameter> parameter of the <filename>smb.conf</filename> file the name resolution methods will be attempted in this order. </para></listitem> </varlistentry> @@ -216,7 +215,8 @@ <term>-i scope</term> <listitem><para>This specifies a NetBIOS scope that smbclient will use to communicate with when generating NetBIOS names. For details - on the use of NetBIOS scopes, see rfc1001.txt and rfc1002.txt. + on the use of NetBIOS scopes, see <filename>rfc1001.txt</filename> + and <filename>rfc1002.txt</filename>. NetBIOS scopes are <emphasis>very</emphasis> rarely used, only set this parameter if you are the system administrator in charge of all the NetBIOS systems you communicate with. </para></listitem> @@ -247,7 +247,7 @@ <varlistentry> <term>-d debuglevel</term> - <listitem><para>debuglevel is an integer from 0 to 10, or + <listitem><para><replaceable>debuglevel</replaceable> is an integer from 0 to 10, or the letter 'A'. </para> <para>The default value if this parameter is not specified @@ -264,13 +264,13 @@ data, and should only be used when investigating a problem. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely - cryptic. If debuglevel is set to the letter 'A', then <emphasis>all + cryptic. If <replaceable>debuglevel</replaceable> is set to the letter 'A', then <emphasis>all </emphasis> debug messages will be printed. This setting is for developers only (and people who <emphasis>really</emphasis> want to know how the code works internally). </para> <para>Note that specifying this parameter here will override - the log level parameter in the <command>smb.conf (5)</command> + the log level parameter in the <filename>smb.conf (5)</filename> file. </para></listitem> </varlistentry> @@ -286,7 +286,7 @@ <varlistentry> <term>-l logfilename</term> - <listitem><para>If specified, logfilename specifies a base filename + <listitem><para>If specified, <replaceable>logfilename</replaceable> specifies a base filename into which operational data from the running client will be logged. </para> @@ -311,7 +311,7 @@ <varlistentry> <term>-I IP-address</term> - <listitem><para>IP address is the address of the server to connect to. + <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. It should be specified in standard "a.b.c.d" notation. </para> <para>Normally the client would attempt to locate a named @@ -344,31 +344,31 @@ <term>-U username[%pass]</term> <listitem><para>Sets the SMB username or username and password. If %pass is not specified, The user will be prompted. The client - will first check the USER environment variable, then the - <parameter>$LOGNAME</parameter> variable and if either exist, the + will first check the <envar>USER</envar> environment variable, then the + <envar>LOGNAME</envar> variable and if either exists, the string is uppercased. Anything in these variables following a '%' - sign will be treated as the password. If these environmental + sign will be treated as the password. If these environment variables are not found, the username <constant>GUEST</constant> is used. </para> - <para>If the password is not included in these environment - variables (using the %pass syntax), rpcclient will look for - a <parameter>$PASSWD</parameter> environment variable from which + <para>If the password is not included in these environment + variables (using the %pass syntax), <command>smbclient</command> will look for + a <envar>PASSWD</envar> environment variable from which to read the password. </para> <para>A third option is to use a credentials file which contains the plaintext of the username and password. This option is mainly provided for scripts where the admin doesn't - desire to pass the credentials on the command line or via environment + wish to pass the credentials on the command line or via environment variables. If this method is used, make certain that the permissions on the file restrict access from unwanted users. See the <parameter>-A</parameter> for more details. </para> <para>Be cautious about including passwords in scripts or in - the <parameter>$PASSWD</parameter> environment variable. Also, on + the <envar>PASSWD</envar> environment variable. Also, on many systems the command line of a running process may be seen via the <command>ps</command> command to be safe always allow - <command>rpcclient</command> to prompt for a password and type + <command>smbclient</command> to prompt for a password and type it in directly. </para></listitem> </varlistentry> @@ -397,14 +397,14 @@ password = <value> are available on a server. You use it as <command>smbclient -L host</command> and a list should appear. The <parameter>-I </parameter> option may be useful if your NetBIOS names don't - match your tcp/ip dns host names or if you are trying to reach a + match your TCP/IP DNS host names or if you are trying to reach a host on another network. </para></listitem> </varlistentry> <varlistentry> <term>-t terminal code</term> - <listitem><para>This option tells smbclient how to interpret + <listitem><para>This option tells <command>smbclient</command> how to interpret filenames coming from the remote server. Usually Asian language multibyte UNIX implementations use different character sets than SMB/CIFS servers (<emphasis>EUC</emphasis> instead of <emphasis> @@ -488,7 +488,7 @@ password = <value> </para></listitem> <listitem><para><parameter>r</parameter> - Regular expression include - or exclude. Uses regular regular expression matching for + or exclude. Uses regular expression matching for excluding or excluding files if compiled with HAVE_REGEX_H. However this mode can be very slow. If not compiled with HAVE_REGEX_H, does a limited wildcard match on '*' and '?'. @@ -511,7 +511,7 @@ password = <value> <para><command>smbclient</command>'s tar option now supports long file names both on backup and restore. However, the full path name of the file must be less than 1024 bytes. Also, when - a tar archive is created, smbclient's tar option places all + a tar archive is created, <command>smbclient</command>'s tar option places all files in the archive with relative names, not absolute names. </para> @@ -523,10 +523,10 @@ password = <value> <para><emphasis>Examples</emphasis></para> - <para>Restore from tar file backup.tar into myshare on mypc + <para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc (no password on share). </para> - <para><command>smbclient //mypc/myshare "" -N -Tx backup.tar + <para><command>smbclient //mypc/yshare "" -N -Tx backup.tar </command></para> <para>Restore everything except <filename>users/docs</filename> @@ -566,7 +566,7 @@ password = <value> <varlistentry> <term>-c command string</term> - <listitem><para>command string is a semicolon separated list of + <listitem><para>command string is a semicolon-separated list of commands to be executed instead of prompting from stdin. <parameter> -N</parameter> is implied by <parameter>-c</parameter>.</para> @@ -616,7 +616,7 @@ password = <value> <variablelist> <varlistentry> <term>? [command]</term> - <listitem><para>If "command" is specified, the ? command will display + <listitem><para>If <replaceable>command</replaceable> is specified, the ? command will display a brief informative message about the specified command. If no command is specified, a list of available commands will be displayed. </para></listitem> @@ -625,7 +625,7 @@ password = <value> <varlistentry> <term>! [shell command]</term> - <listitem><para>If "shell command" is specified, the ! + <listitem><para>If <replaceable>shell command</replaceable> is specified, the ! command will execute a shell locally and run the specified shell command. If no command is specified, a local shell will be run. </para></listitem> @@ -648,14 +648,14 @@ password = <value> <varlistentry> <term>del <mask></term> <listitem><para>The client will request that the server attempt - to delete all files matching "mask" from the current working + to delete all files matching <replaceable>mask</replaceable> from the current working directory on the server. </para></listitem> </varlistentry> <varlistentry> <term>dir <mask></term> - <listitem><para>A list of the files matching "mask" in the current + <listitem><para>A list of the files matching <replaceable>mask</replaceable> in the current working directory on the server will be retrieved from the server and displayed. </para></listitem> </varlistentry> @@ -670,9 +670,9 @@ password = <value> <varlistentry> <term>get <remote file name> [local file name]</term> - <listitem><para>Copy the file called "remote file name" from + <listitem><para>Copy the file called <filename>remote file name</filename> from the server to the machine running the client. If specified, name - the local copy "local file name". Note that all transfers in + the local copy <filename>local file name</filename>. Note that all transfers in <command>smbclient</command> are binary. See also the lowercase command. </para></listitem> </varlistentry> @@ -687,7 +687,7 @@ password = <value> <varlistentry> <term>lcd [directory name]</term> - <listitem><para>If "directory name" is specified, the current + <listitem><para>If <replaceable>directory name</replaceable> is specified, the current working directory on the local machine will be changed to the directory specified. This operation will fail if for any reason the specified directory is inaccessible. </para> @@ -751,13 +751,13 @@ password = <value> <varlistentry> <term>mget <mask></term> - <listitem><para>Copy all files matching mask from the server to + <listitem><para>Copy all files matching <replaceable>mask</replaceable> from the server to the machine running the client. </para> - <para>Note that mask is interpreted differently during recursive + <para>Note that <replaceable>mask</replaceable> is interpreted differently during recursive operation and non-recursive operation - refer to the recurse and mask commands for more information. Note that all transfers in - smbclient are binary. See also the lowercase command. </para></listitem> + <command>smbclient</command> are binary. See also the lowercase command. </para></listitem> </varlistentry> @@ -770,13 +770,13 @@ password = <value> <varlistentry> <term>mput <mask></term> - <listitem><para>Copy all files matching mask in the current working + <listitem><para>Copy all files matching <replaceable>mask</replaceable> in the current working directory on the local machine to the current working directory on the server. </para> - <para>Note that mask is interpreted differently during recursive + <para>Note that <replaceable>mask</replaceable> is interpreted differently during recursive operation and non-recursive operation - refer to the recurse and mask - commands for more information. Note that all transfers in smbclient + commands for more information. Note that all transfers in <command>smbclient</command> are binary. </para></listitem> </varlistentry> @@ -813,10 +813,10 @@ password = <value> <varlistentry> <term>put <local file name> [remote file name]</term> - <listitem><para>Copy the file called "local file name" from the + <listitem><para>Copy the file called <filename>local file name</filename> from the machine running the client to the server. If specified, - name the remote copy "remote file name". Note that all transfers - in smbclient are binary. See also the lowercase command. + name the remote copy <filename>remote file name</filename>. Note that all transfers + in <command>smbclient</command> are binary. See also the lowercase command. </para></listitem> </varlistentry> @@ -863,7 +863,7 @@ password = <value> <varlistentry> <term>rm <mask></term> - <listitem><para>Remove all files matching mask from the current + <listitem><para>Remove all files matching <replaceable>mask</replaceable> from the current working directory on the server. </para></listitem> </varlistentry> @@ -890,7 +890,7 @@ password = <value> <term>blocksize <blocksize></term> <listitem><para>Blocksize. Must be followed by a valid (greater than zero) blocksize. Causes tar file to be written out in - blocksize*TBLOCK (usually 512 byte) blocks. </para></listitem> + <replaceable>blocksize</replaceable>*TBLOCK (usually 512 byte) blocks. </para></listitem> </varlistentry> @@ -938,16 +938,22 @@ password = <value> <refsect1> <title>ENVIRONMENT VARIABLES</title> - <para>The variable <parameter>$USER</parameter> may contain the + <para>The variable <envar>USER</envar> may contain the username of the person using the client. This information is used only if the protocol level is high enough to support session-level passwords.</para> - <para>The variable <parameter>$PASSWD</parameter> may contain + <para>The variable <envar>PASSWD</envar> may contain the password of the person using the client. This information is used only if the protocol level is high enough to support session-level passwords. </para> + + <para>The variable <envar>LIBSMB_PROG</envar> may contain + the path, executed with system(), which the client should connect + to instead of connecting to a server. This functionality is primarily + intended as a development aid, and works best when using a LMHOSTS + file</para> </refsect1> @@ -970,7 +976,7 @@ password = <value> <para>To test the client, you will need to know the name of a running SMB/CIFS server. It is possible to run <command>smbd(8) - </command> an ordinary user - running that server as a daemon + </command> as an ordinary user - running that server as a daemon on a user-accessible port (typically any port number over 1024) would provide a suitable test server. </para> </refsect1> diff --git a/docs/docbook/manpages/smbcontrol.1.sgml b/docs/docbook/manpages/smbcontrol.1.sgml index 8e529d8b71..d2e3d39478 100644 --- a/docs/docbook/manpages/smbcontrol.1.sgml +++ b/docs/docbook/manpages/smbcontrol.1.sgml @@ -113,6 +113,11 @@ 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 2d01fd7d49..05958b83de 100644 --- a/docs/docbook/manpages/smbd.8.sgml +++ b/docs/docbook/manpages/smbd.8.sgml @@ -67,7 +67,7 @@ can force a reload by sending a SIGHUP to the server. Reloading the configuration file will not affect connections to any service that is already established. Either the user will have to - disconnect from the service, or smbd killed and restarted.</para> + disconnect from the service, or <command>smbd</command> killed and restarted.</para> </refsect1> <refsect1> @@ -80,9 +80,9 @@ the server to operate as a daemon. That is, it detaches itself and runs in the background, fielding requests on the appropriate port. Operating the server as a - daemon is the recommended way of running smbd for + daemon is the recommended way of running <command>smbd</command> for servers that provide more than casual use file and - print services. This switch is assumed is <command>smbd + print services. This switch is assumed if <command>smbd </command> is executed on the command line of a shell. </para></listitem> </varlistentry> @@ -104,7 +104,7 @@ <varlistentry> <term>-P</term> - <listitem><para>Passive option. Causes smbd not to + <listitem><para>Passive option. Causes <command>smbd</command> not to send any network traffic out. Used for debugging by the developers only.</para></listitem> </varlistentry> @@ -123,7 +123,7 @@ <varlistentry> <term>-d <debug level></term> - <listitem><para>debuglevel is an integer + <listitem><para><replaceable>debuglevel</replaceable> is an integer from 0 to 10. The default value if this parameter is not specified is zero.</para> @@ -149,7 +149,7 @@ <varlistentry> <term>-l <log file></term> - <listitem><para>If specified, <emphasis>log file</emphasis> + <listitem><para>If specified, <replaceable>log file</replaceable> specifies a log filename into which informational and debug messages from the running server will be logged. The log file generated is never removed by the server although @@ -170,7 +170,7 @@ <varlistentry> <term>-p <port number></term> - <listitem><para>port number is a positive integer + <listitem><para><replaceable>port number</replaceable> is a positive integer value. The default value if this parameter is not specified is 139.</para> @@ -273,10 +273,10 @@ <variablelist> <varlistentry> - <term>PRINTER</term> + <term><envar>PRINTER</envar></term> <listitem><para>If no printer name is specified to printable services, most systems will use the value of - this variable (or lp if this variable is + this variable (or <constant>lp</constant> if this variable is not defined) as the name of the printer to use. This is not specific to the server, however.</para></listitem> </varlistentry> @@ -296,10 +296,10 @@ program itself should be executable by all, as users may wish to run the server themselves (in which case it will of course run with their privileges). The server should NOT be setuid. On some - systems it may be worthwhile to make smbd setgid to an empty group. + systems it may be worthwhile to make <command>smbd</command> setgid to an empty group. This is because some systems may have a security hole where daemon processes that become a user can be attached to with a debugger. - Making the smbd file setgid to an empty group may prevent + Making the <command>smbd</command> file setgid to an empty group may prevent this hole from being exploited. This security hole and the suggested fix has only been confirmed on old versions (pre-kernel 2.0) of Linux at the time this was written. It is possible that this hole only @@ -395,7 +395,7 @@ <title>RUNNING THE SERVER ON REQUEST</title> <para>If your system uses a meta-daemon such as <command>inetd - </command>, you can arrange to have the smbd server started + </command>, you can arrange to have the <command>smbd</command> server started whenever a process attempts to connect to it. This requires several changes to the startup files on the host machine. If you are experimenting as an ordinary user rather than as root, you will @@ -463,6 +463,32 @@ </refsect1> <refsect1> + <title>PAM INTERACTION</title> + <para>Samba uses PAM for authentication (when presented with a plaintext + password), for account checking (is this account disabled?) and for + session management. The degree too which samba supports PAM is restricted + by the limitations of the SMB protocol and the + <ulink url="smb.conf.5.html#OBEYPAMRESRICTIONS">obey pam restricions</ulink> + smb.conf paramater. When this is set, the following restrictions apply: + </para> + + <itemizedlist> + <listitem><para><emphasis>Account Validation</emphasis>: All acccesses to a + samba server are checked + against PAM to see if the account is vaild, not disabled and is permitted to + login at this time. This also applies to encrypted logins. + </para></listitem> + + <listitem><para><emphasis>Session Management</emphasis>: When not using share + level secuirty, users must pass PAM's session checks before access + is granted. Note however, that this is bypassed in share level secuirty. + Note also that some older pam configuration files may need a line + added for session support. + </para></listitem> + </itemizedlist> +</refsect1> + +<refsect1> <title>TESTING THE INSTALLATION</title> <para>If running the server as a daemon, execute it before @@ -471,8 +497,8 @@ <command>inetd</command> will reread their configuration tables if they receive a HUP signal.</para> - <para>If your machine's name is fred and your - name is mary, you should now be able to connect + <para>If your machine's name is <replaceable>fred</replaceable> and your + name is <replaceable>mary</replaceable>, you should now be able to connect to the service <filename>\\fred\mary</filename>. </para> @@ -513,26 +539,26 @@ <refsect1> <title>SIGNALS</title> - <para>Sending the smbd a SIGHUP will cause it to - re-load its <filename>smb.conf</filename> configuration + <para>Sending the <command>smbd</command> a SIGHUP will cause it to + reload its <filename>smb.conf</filename> configuration file within a short period of time.</para> - <para>To shut down a users smbd process it is recommended + <para>To shut down a user's <command>smbd</command> process it is recommended that <command>SIGKILL (-9)</command> <emphasis>NOT</emphasis> be used, except as a last resort, as this may leave the shared memory area in an inconsistent state. The safe way to terminate - an smbd is to send it a SIGTERM (-15) signal and wait for + an <command>smbd</command> is to send it a SIGTERM (-15) signal and wait for it to die on its own.</para> - <para>The debug log level of smbd may be raised by sending - it a SIGUSR1 (<command>kill -USR1 <smbd-pid></command>) - and lowered by sending it a SIGUSR2 (<command>kill -USR2 <smbd-pid> - </command>). This is to allow transient problems to be diagnosed, + <para>The debug log level of <command>smbd</command> may be raised + or lowered using <ulink url="smbcontrol.1.html"><command>smbcontrol(1) + </command></ulink> program (SIGUSR[1|2] signals are no longer used in + Samba 2.2). This is to allow transient problems to be diagnosed, whilst still running at a normally low log level.</para> <para>Note that as the signal handlers send a debug write, - they are not re-entrant in smbd. This you should wait until - smbd is in a state of waiting for an incoming smb before + they are not re-entrant in <command>smbd</command>. This you should wait until + <command>smbd</command> is in a state of waiting for an incoming SMB before issuing them. It is possible to make the signal handlers safe by un-blocking the signals before the select call and re-blocking them after, however this would affect performance.</para> diff --git a/docs/docbook/manpages/smbmnt.8.sgml b/docs/docbook/manpages/smbmnt.8.sgml index 9527a19144..55b66d5d25 100644 --- a/docs/docbook/manpages/smbmnt.8.sgml +++ b/docs/docbook/manpages/smbmnt.8.sgml @@ -31,14 +31,19 @@ <para><command>smbmnt</command> is a helper application used by the smbmount program to do the actual mounting of SMB shares. - <command>smbmnt</command> is meant to be installed setuid root - so that normal users can mount their smb shares. It checks - whether the user has write permissions on the mount point and - then mounts the directory.</para> + <command>smbmnt</command> can be installed setuid root if you want + normal users to be able to mount their SMB shares.</para> + + <para>A setuid smbmnt will only allow mounts on directories owned + by the user, and that the user has write permission on.</para> <para>The <command>smbmnt</command> program is normally invoked by <ulink url="smbmount.8.html"><command>smbmount(8)</command> </ulink>. It should not be invoked directly by users. </para> + + <para>smbmount searches the normal PATH for smbmnt. You must ensure + that the smbmnt version in your path matches the smbmount used.</para> + </refsect1> <refsect1> @@ -79,7 +84,7 @@ <term>-o options</term> <listitem><para> list of options that are passed as-is to smbfs, if this - command is run on a 2.4 or higher linux kernel. + command is run on a 2.4 or higher Linux kernel. </para></listitem> </varlistentry> diff --git a/docs/docbook/manpages/smbmount.8.sgml b/docs/docbook/manpages/smbmount.8.sgml index 391d7d6882..b4a77e51c9 100644 --- a/docs/docbook/manpages/smbmount.8.sgml +++ b/docs/docbook/manpages/smbmount.8.sgml @@ -24,22 +24,23 @@ <refsect1> <title>DESCRIPTION</title> - <para><command>smbmount</command> mounts a SMB filesystem. It - is usually invoked as <command>mount.smb</command> from + <para><command>smbmount</command> mounts a Linux SMB filesystem. It + is usually invoked as <command>mount.smbfs</command> by the <command>mount(8)</command> command when using the - "-t smb" option. The kernel must support the smbfs filesystem. </para> + "-t smbfs" option. This command only works in Linux, and the kernel must + support the smbfs filesystem. </para> - <para>Options to smbmount are specified as a comma separated + <para>Options to <command>smbmount</command> are specified as a comma-separated list of key=value pairs. It is possible to send options other than those listed here, assuming that smbfs supports them. If you get mount failures, check your kernel log for errors on unknown options.</para> - <para>smbmount is a daemon. After mounting it keeps running until + <para><command>smbmount</command> is a daemon. After mounting it keeps running until the mounted smbfs is umounted. It will log things that happen when in daemon mode using the "machine name" smbmount, so - typically this output will end up in log.smbmount. The - smbmount process may also be called mount.smbfs.</para> + typically this output will end up in <filename>log.smbmount</filename>. The + <command>smbmount</command> process may also be called mount.smbfs.</para> <para><emphasis>NOTE:</emphasis> <command>smbmount</command> calls <command>smbmnt(8)</command> to do the actual mount. You @@ -69,7 +70,16 @@ <envar>PASSWD</envar> is used. If it can find no password <command>smbmount</command> will prompt for a passeword, unless the guest option is - given. </para></listitem> + given. </para> + + <para> + Note that password which contain the arguement delimiter + character (i.e. a comma ',') will failed to be parsed correctly + on the command line. However, the same password defined + in the PASSWD environment variable or a credentials file (see + below) will be read correctly. + </para> + </listitem> </varlistentry> <varlistentry> @@ -85,7 +95,7 @@ </para> <para>This is preferred over having passwords in plaintext in a - shared file, such as /etc/fstab. Be sure to protect any + shared file, such as <filename>/etc/fstab</filename>. Be sure to protect any credentials file properly. </para></listitem> </varlistentry> @@ -131,7 +141,7 @@ <varlistentry> <term>dmask=<arg></term> - <listitem><para>sets the directory mask. This deterines the + <listitem><para>sets the directory mask. This determines the permissions that remote directories have in the local filesystem. The default is based on the current umask. </para></listitem> </varlistentry> @@ -140,7 +150,9 @@ <varlistentry> <term>debug=<arg></term> <listitem><para>sets the debug level. This is useful for - tracking down SMB connection problems. </para></listitem> + tracking down SMB connection problems. A suggested value to + start with is 4. If set too high there will be a lot of + output, possibly hiding the useful output.</para></listitem> </varlistentry> @@ -191,7 +203,7 @@ <varlistentry> <term>iocharset=<arg></term> <listitem><para> - sets the charset used by the linux side for codepage + sets the charset used by the Linux side for codepage to charset translations (NLS). Argument should be the name of a charset, like iso8859-1. (Note: only kernel 2.4.0 or later) @@ -241,29 +253,36 @@ protocol level is high enough to support session-level passwords.</para> - <para>The variable <envar>PASSWD_FILE</envar> may contain the pathname of - a file to read the password from. A single line of input is - read and used as password.</para> + <para>The variable <envar>PASSWD_FILE</envar> may contain the pathname + of a file to read the password from. A single line of input is + read and used as the password.</para> </refsect1> <refsect1> <title>BUGS</title> - <para>Not many known smbmount bugs. But one smbfs bug is - important enough to mention here anyway:</para> + <para>Passwords and other options containing , can not be handled. + For passwords an alternative way of passing them is in a credentials + file or in the PASSWD environment.</para> + + <para>The credentials file does not handle usernames or passwords with + leading space.</para> + + <para>One smbfs bug is important enough to mention here, even if it + is a bit misplaced:</para> <itemizedlist> <listitem><para>Mounts sometimes stop working. This is usually caused by smbmount terminating. Since smbfs needs smbmount to - reconnect when the server disconnects, the mount will go - dead. A re-mount normally fixes this. At least 2 ways to + reconnect when the server disconnects, the mount will eventually go + dead. An umount/mount normally fixes this. At least 2 ways to trigger this bug are known.</para></listitem> </itemizedlist> - <para>Note that the typical response to a bugreport is suggestion + <para>Note that the typical response to a bug report is suggestion to try the latest version first. So please try doing that first, and always include which versions you use of relevant software when reporting bugs (minimum: samba, kernel, distribution)</para> @@ -274,8 +293,15 @@ <refsect1> <title>SEE ALSO</title> - <para>Documentation/filesystems/smbfs.txt in the kernel source tree - may contain additional options and information.</para> + <para>Documentation/filesystems/smbfs.txt in the linux kernel + source tree may contain additional options and information.</para> + + <para>FreeBSD also has a smbfs, but it is not related to smbmount</para> + + <para>For Solaris, HP-UX and others you may want to look at + <ulink url="smbsh.1.html"><command>smbsh(1)</command></ulink> or at other + solutions, such as sharity or perhaps replacing the SMB server with + a NFS server.</para> </refsect1> diff --git a/docs/docbook/manpages/smbpasswd.5.sgml b/docs/docbook/manpages/smbpasswd.5.sgml index 0e8a704c50..be75107819 100644 --- a/docs/docbook/manpages/smbpasswd.5.sgml +++ b/docs/docbook/manpages/smbpasswd.5.sgml @@ -59,9 +59,9 @@ <varlistentry> <term>Lanman Password Hash</term> - <listitem><para>This is the LANMAN hash of the users password, + <listitem><para>This is the LANMAN hash of the user's password, encoded as 32 hex digits. The LANMAN hash is created by DES - encrypting a well known string with the users password as the + encrypting a well known string with the user's password as the DES key. This is the same password used by Windows 95/98 machines. Note that this password hash is regarded as weak as it is vulnerable to dictionary attacks and if two users choose the @@ -69,7 +69,7 @@ is not "salted" as the UNIX password is). If the user has a null password this field will contain the characters "NO PASSWORD" as the start of the hex string. If the hex string is equal to - 32 'X' characters then the users account is marked as + 32 'X' characters then the user's account is marked as <constant>disabled</constant> and the user will not be able to log onto the Samba server. </para> @@ -89,14 +89,14 @@ <varlistentry> <term>NT Password Hash</term> - <listitem><para>This is the Windows NT hash of the users + <listitem><para>This is the Windows NT hash of the user's password, encoded as 32 hex digits. The Windows NT hash is - created by taking the users password as represented in + created by taking the user's password as represented in 16-bit, little-endian UNICODE and then applying the MD4 (internet rfc1321) hashing algorithm to it. </para> <para>This password hash is considered more secure than - the Lanman Password Hash as it preserves the case of the + the LANMAN Password Hash as it preserves the case of the password and uses a much higher quality hashing algorithm. However, it is still the case that if two users choose the same password this entry will be identical (i.e. the password is @@ -132,7 +132,7 @@ in the smbpasswd file. </para></listitem> <listitem><para><emphasis>N</emphasis> - This means the - account has no password (the passwords in the fields Lanman + account has no password (the passwords in the fields LANMAN Password Hash and NT Password Hash are ignored). Note that this will only allow users to log on with no password if the <parameter> null passwords</parameter> parameter is set in the <ulink diff --git a/docs/docbook/manpages/smbpasswd.8.sgml b/docs/docbook/manpages/smbpasswd.8.sgml index 3af636715d..e757a0c67c 100644 --- a/docs/docbook/manpages/smbpasswd.8.sgml +++ b/docs/docbook/manpages/smbpasswd.8.sgml @@ -9,7 +9,7 @@ <refnamediv> <refname>smbpasswd</refname> - <refpurpose>change a users SMB password</refpurpose> + <refpurpose>change a user's SMB password</refpurpose> </refnamediv> <refsynopsisdiv> @@ -45,7 +45,7 @@ SMB passwords. </para> <para>By default (when run with no arguments) it will attempt to - change the current users SMB password on the local machine. This is + change the current user's SMB password on the local machine. This is similar to the way the <command>passwd(1)</command> program works. <command>smbpasswd</command> differs from how the passwd program works however in that it is not <emphasis>setuid root</emphasis> but works in @@ -56,10 +56,10 @@ the <filename>smbpasswd(5)</filename> file. </para> <para>When run by an ordinary user with no options. smbpasswd - will prompt them for their old smb password and then ask them + will prompt them for their old SMB password and then ask them for their new password twice, to ensure that the new password was typed correctly. No passwords will be echoed on the screen - whilst being typed. If you have a blank smb password (specified by + whilst being typed. If you have a blank SMB password (specified by the string "NO PASSWORD" in the smbpasswd file) then just press the <Enter> key when asked for your old password. </para> @@ -117,7 +117,7 @@ will fail. </para> <para>If the smbpasswd file is in the 'old' format (pre-Samba 2.0 - format) there is no space in the users password entry to write + format) there is no space in the user's password entry to write this information and so the user is disabled by writing 'X' characters into the password space in the smbpasswd file. See <command>smbpasswd(5) </command> for details on the 'old' and new password file formats. @@ -151,7 +151,7 @@ <varlistentry> <term>-D debuglevel</term> - <listitem><para><parameter>debuglevel</parameter> is an integer + <listitem><para><replaceable>debuglevel</replaceable> is an integer from 0 to 10. The default value if this parameter is not specified is zero. </para> @@ -274,68 +274,52 @@ <varlistentry> - <term>-j DOMAIN</term> <listitem><para>This option is used - to add a Samba server into a Windows NT Domain, as a Domain - member capable of authenticating user accounts to any - Domain Controller in the same way as a Windows NT - Server. See the <command>security = domain</command> option - in the <filename>smb.conf(5)</filename> man page. </para> - - <para>The Samba server can be joined to the Windows NT - Domain in one of two ways. The Administrator for the - domain can use the "Server Manager for Domains" program to - add the primary NetBIOS name of the Samba server as a - member of the Domain. </para> - - <para>After this has been done, to join the Domain invoke - <command> smbpasswd</command> with this - parameter. smbpasswd will then look up the Primary Domain - Controller for the Domain (found in the - <filename>smb.conf</filename> file in the parameter - <parameter>password server</parameter> and change the - machine account password used to create the secure Domain - communication. This password is then stored by smbpasswd - in a TDB, writeable only by root, called - <filename>secrets.tdb</filename> </para> + <term>-j DOMAIN</term> + <listitem><para>This option is used to add a Samba server + into a Windows NT Domain, as a Domain member capable of authenticating + user accounts to any Domain Controller in the same way as a Windows + NT Server. See the <command>security = domain</command> option in + the <filename>smb.conf(5)</filename> man page. </para> + + <para>In order to be used in this way, the Administrator for + the Windows NT Domain must have used the program "Server Manager + for Domains" to add the primary NetBIOS name of the Samba server + as a member of the Domain. </para> + + <para>After this has been done, to join the Domain invoke <command> + smbpasswd</command> with this parameter. smbpasswd will then + look up the Primary Domain Controller for the Domain (found in + the <filename>smb.conf</filename> file in the parameter + <parameter>password server</parameter> and change the machine account + password used to create the secure Domain communication. This + password is then stored by smbpasswd in a TDB, writeable only by root, + called <filename>secrets.tdb</filename> </para> <para>Once this operation has been performed the <filename> - smb.conf</filename> file may be updated to set the - <command> security = domain</command> option and all future - logins to the Samba server will be authenticated to the - Windows NT PDC. </para> - - <para>Note that even though the authentication is being - done to the PDC all users accessing the Samba server must - still have a valid UNIX account on that machine. </para> - - <para>The second method for joining the domain is to - use the <parameter>-U</parameter> option in addition to the - <parameter>-j</parameter> to specify an administrator - username and optional password. This method does not - require the use of the "Server Manager for Domains" - program. This method is more secure as the machine account - password is set to a well known value before the member - server is joined to the domain. - - <para>This option is only available when running smbpasswd - as root. </para></listitem> + smb.conf</filename> file may be updated to set the <command> + security = domain</command> option and all future logins + to the Samba server will be authenticated to the Windows NT + PDC. </para> + + <para>Note that even though the authentication is being + done to the PDC all users accessing the Samba server must still + have a valid UNIX account on that machine. </para> + + + <para>This option is only available when running smbpasswd as root. + </para></listitem> </varlistentry> <varlistentry> - <term>-U username[%password]</term> <listitem><para>This - option may only be used in conjunction with the - <parameter>-r</parameter> or <parameter>-j</parameter> - options. When changing a password on a remote machine it - allows the user to specify the user name on that machine - whose password will be changed. It is present to allow - users who have different user names on different systems to - change these passwords. When changing the password on a - machine account using the <parameter>-j</parameter> option - the username and password of an administrator is specified - here. Non-administrator users with the 'Add workstations - to domain' user right can also be used.</para></listitem> + <term>-U username</term> + <listitem><para>This option may only be used in conjunction + with the <parameter>-r</parameter> option. When changing + a password on a remote machine it allows the user to specify + the user name on that machine whose password will be changed. It + is present to allow users who have different user names on + different systems to change these passwords. </para></listitem> </varlistentry> @@ -351,7 +335,7 @@ <varlistentry> <term>-s</term> <listitem><para>This option causes smbpasswd to be silent (i.e. - not issue prompts) and to read it's old and new passwords from + not issue prompts) and to read its old and new passwords from standard input, rather than from <filename>/dev/tty</filename> (like the <command>passwd(1)</command> program does). This option is to aid people writing scripts to drive smbpasswd</para> diff --git a/docs/docbook/manpages/smbsh.1.sgml b/docs/docbook/manpages/smbsh.1.sgml index 3a95f116d9..46adac6b79 100644 --- a/docs/docbook/manpages/smbsh.1.sgml +++ b/docs/docbook/manpages/smbsh.1.sgml @@ -1,5 +1,5 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -<refentry id="findsmb"> +<refentry id="smbsh"> <refmeta> <refentrytitle>smbsh</refentrytitle> @@ -28,12 +28,12 @@ <para><command>smbsh</command> allows you to access an NT filesystem using UNIX commands such as <command>ls</command>, <command> egrep</command>, and <command>rcp</command>. You must use a - shell that is dynmanically linked in order for <command>smbsh</command> + shell that is dynamically linked in order for <command>smbsh</command> to work correctly.</para> <para>To use the <command>smbsh</command> command, execute <command> smbsh</command> from the prompt and enter the username and password - that authenticate you to the machine running the Windows NT + that authenticates you to the machine running the Windows NT operating system.</para> <para><programlisting> @@ -46,8 +46,10 @@ <para>Any dynamically linked command you execute from this shell will access the <filename>/smb</filename> directory using the smb protocol. For example, the command <command>ls /smb - </command> will show all the machines in your workgroup. The command - <command>ls /smb/<machine-name></command> will show the share + </command> will show a list of workgroups. The command + <command>ls /smb/MYGROUP </command> will show all the machines in + the workgroup MYGROUP. The command + <command>ls /smb/MYGROUP/<machine-name></command> will show the share names for that machine. You could then, for example, use the <command> cd</command> command to change directories, <command>vi</command> to edit files, and <command>rcp</command> to copy files.</para> diff --git a/docs/docbook/manpages/smbspool.8.sgml b/docs/docbook/manpages/smbspool.8.sgml index 5b409bb9de..d5c9c0a114 100644 --- a/docs/docbook/manpages/smbspool.8.sgml +++ b/docs/docbook/manpages/smbspool.8.sgml @@ -52,12 +52,12 @@ </itemizedlist> <para>smbspool tries to get the URI from argv[0]. If argv[0] - contains the name of the program then it looks in the <parameter> - DEVICE_URI</parameter> environment variable.</para> + contains the name of the program then it looks in the <envar> + DEVICE_URI</envar> environment variable.</para> <para>Programs using the <command>exec(2)</command> functions can pass the URI in argv[0], while shell scripts must set the - <parameter>DEVICE_URI</parameter> environment variable prior to + <envar>DEVICE_URI</envar> environment variable prior to running smbspool.</para> </refsect1> diff --git a/docs/docbook/manpages/smbumount.8.sgml b/docs/docbook/manpages/smbumount.8.sgml index 15e20a2e70..d6a1b65b57 100644 --- a/docs/docbook/manpages/smbumount.8.sgml +++ b/docs/docbook/manpages/smbumount.8.sgml @@ -24,7 +24,7 @@ <para>With this program, normal users can unmount smb-filesystems, provided that it is suid root. <command>smbumount</command> has - been written to give normal linux-users more control over their + been written to give normal Linux users more control over their resources. It is safe to install this program suid root, because only the user who has mounted a filesystem is allowed to unmount it again. For root it is not necessary to use smbumount. The normal umount diff --git a/docs/docbook/manpages/swat.8.sgml b/docs/docbook/manpages/swat.8.sgml index 7a362ee3ce..dc6989d566 100644 --- a/docs/docbook/manpages/swat.8.sgml +++ b/docs/docbook/manpages/swat.8.sgml @@ -31,10 +31,10 @@ configure the complex <ulink url="smb.conf.5.html"><filename> smb.conf(5)</filename></ulink> file via a Web browser. In addition, a <command>swat</command> configuration page has help links - to all the configurable options in the smb.conf file allowing an + 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>swat is run from inetd </para> + <para><command>swat</command> is run from <command>inetd</command> </para> </refsect1> @@ -47,7 +47,7 @@ <listitem><para>The default configuration file path is determined at compile time. The file specified contains the configuration details required by the <command>smbd - </command> server. This is the file that swat will modify. + </command> 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. @@ -59,8 +59,8 @@ <varlistentry> <term>-a</term> <listitem><para>This option disables authentication and puts - swat in demo mode. In that mode anyone will be able to modify - the smb.conf file. </para> + <command>swat</command> in demo mode. In that mode anyone will be able to modify + the <filename>smb.conf</filename> file. </para> <para><emphasis>Do NOT enable this option on a production server. </emphasis></para></listitem> @@ -89,7 +89,7 @@ <para>You need to edit your <filename>/etc/inetd.conf </filename> and <filename>/etc/services</filename> - to enable SWAT to be launched via inetd.</para> + 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> @@ -123,10 +123,10 @@ <refsect2> <title>Launching</title> - <para>To launch swat just run your favorite web browser and + <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 + <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> diff --git a/docs/docbook/manpages/testparm.1.sgml b/docs/docbook/manpages/testparm.1.sgml index da90dc6e6c..320e39e6f5 100644 --- a/docs/docbook/manpages/testparm.1.sgml +++ b/docs/docbook/manpages/testparm.1.sgml @@ -72,7 +72,7 @@ <varlistentry> <term>-L servername</term> - <listitem><para>Sets the value of the %L macro to servername. + <listitem><para>Sets the value of the %L macro to <replaceable>servername</replaceable>. This is useful for testing include files specified with the %L macro. </para></listitem> </varlistentry> @@ -90,7 +90,7 @@ <varlistentry> <term>hostname</term> <listitem><para>If this parameter and the following are - specified, then testparm will examine the <parameter>hosts + specified, then <command>testparm</command> will examine the <parameter>hosts allow</parameter> and <parameter>hosts deny</parameter> parameters in the <filename>smb.conf</filename> file to determine if the hostname with this IP address would be @@ -126,7 +126,7 @@ <title>DIAGNOSTICS</title> <para>The program will issue a message saying whether the - configuration file loaded OK or not. This message may be preceeded by + configuration file loaded OK or not. This message may be preceded by errors and warnings if the file did not load. If the file was loaded OK, the program then dumps all known service details to stdout. </para> diff --git a/docs/docbook/manpages/wbinfo.1.sgml b/docs/docbook/manpages/wbinfo.1.sgml index fcc96207c7..7133573b14 100644 --- a/docs/docbook/manpages/wbinfo.1.sgml +++ b/docs/docbook/manpages/wbinfo.1.sgml @@ -149,7 +149,7 @@ <para>The wbinfo program returns 0 if the operation succeeded, or 1 if the operation failed. If the <command>winbindd(8) - </command> daemon is not working wbinfo will always return + </command> daemon is not working <command>wbinfo</command> will always return failure. </para> </refsect1> @@ -158,8 +158,7 @@ <title>VERSION</title> <para>This man page is correct for version 2.2 of - the Samba suite. winbindd is however not available in - stable release of Samba as of yet.</para> + the Samba suite.</para> </refsect1> <refsect1> @@ -177,7 +176,7 @@ to the way the Linux kernel is developed.</para> <para><command>wbinfo</command> and <command>winbindd</command> - were written by TIm Potter.</para> + were written by Tim Potter.</para> <para>The conversion to DocBook for Samba 2.2 was done by Gerald Carter</para> diff --git a/docs/docbook/manpages/winbindd.8.sgml b/docs/docbook/manpages/winbindd.8.sgml index ed4e72604d..6a1ecd59fd 100644 --- a/docs/docbook/manpages/winbindd.8.sgml +++ b/docs/docbook/manpages/winbindd.8.sgml @@ -25,9 +25,8 @@ <refsect1> <title>DESCRIPTION</title> - <para>This tool is part of the <ulink url="samba.7.html"> - Samba</ulink> suite version 3.0 and describes functionality not - yet implemented in the main version of Samba.</para> + <para>This program is part of the <ulink url="samba.7.html"> + Samba</ulink> suite.</para> <para><command>winbindd</command> is a daemon that provides a service for the Name Service Switch capability that is present @@ -39,7 +38,7 @@ of user and group ids specified by the administrator of the Samba system.</para> - <para>The service provided by winbindd is called `winbind' and + <para>The service provided by <command>winbindd</command> is called `winbind' and can be used to resolve user and group information from a Windows NT server. The service can also provide authentication services via an associated PAM module. </para> @@ -144,7 +143,7 @@ group: files winbind DOMAIN\username. In some cases this separator character may cause problems as the '\' character has special meaning in unix shells. In that case you can use the winbind separator - option to specify an alternative sepataror character. Good + option to specify an alternative separator character. Good alternatives may be '/' (although that conflicts with the unix directory separator) or a '+ 'character. The '+' character appears to be the best choice for 100% @@ -161,7 +160,7 @@ group: files winbind <term>winbind uid</term> <listitem><para>The winbind uid parameter specifies the range of user ids that are allocated by the winbindd daemon. - This range of ids should have no existing local or nis users + This range of ids should have no existing local or NIS users within it as strange conflicts can occur otherwise. </para> <para>Default: <command>winbind uid = <empty string> @@ -175,7 +174,7 @@ group: files winbind <term>winbind gid</term> <listitem><para>The winbind gid parameter specifies the range of group ids that are allocated by the winbindd daemon. - This range of group ids should have no existing local or nis + This range of group ids should have no existing local or NIS groups within it as strange conflicts can occur otherwise.</para> <para>Default: <command>winbind gid = <empty string> @@ -191,7 +190,7 @@ group: files winbind seconds the winbindd daemon will cache user and group information before querying a Windows NT server again. When a item in the cache is older than this time winbindd will ask the domain - controller for the sequence number of the servers account database. + controller for the sequence number of the server's account database. If the sequence number has not changed then the cached item is marked as valid for a further <parameter>winbind cache time </parameter> seconds. Otherwise the item is fetched from the @@ -215,7 +214,7 @@ group: files winbind return any data. </para> <para><emphasis>Warning:</emphasis> Turning off user enumeration - may cause some programs to behave oddly. For example, the finger + may cause some programs to behave oddly. For example, the <command>finger</command> program relies on having access to the full user list when searching for matching usernames. </para> @@ -308,18 +307,15 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok </command></para> <para>The next step is to join the domain. To do that use the - <command>samedit</command> program like this: </para> + <command>smbpasswd</command> program like this: </para> - <para><command>samedit -S '*' -W DOMAIN -UAdministrator</command></para> + <para><command>smbpasswd -j DOMAIN -r PDC -U + Administrator</command></para> - <para>The username after the <parameter>-U</parameter> can be any Domain - user that has administrator priviliges on the machine. Next from - within <command>samedit</command>, run the command: </para> - - <para><command>createuser MACHINE$ -j DOMAIN -L</command></para> - - <para>This assumes your domain is called "DOMAIN" and your Samba - workstation is called "MACHINE". </para> + <para>The username after the <parameter>-U</parameter> can be any + Domain user that has administrator privileges on the machine. + Substitute your domain name for "DOMAIN" and the name of your PDC + for "PDC".</para> <para>Next copy <filename>libnss_winbind.so</filename> to <filename>/lib</filename> and <filename>pam_winbind.so</filename> @@ -329,7 +325,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok older version of glibc then the target of the link should be <filename>/lib/libnss_winbind.so.1</filename>.</para> - <para>Finally, setup a smb.conf containing directives like the + <para>Finally, setup a <filename>smb.conf</filename> containing directives like the following: </para> <para><programlisting> @@ -356,7 +352,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok <refsect1> - <title>Notes</title> + <title>NOTES</title> <para>The following notes are useful when configuring and running <command>winbindd</command>: </para> @@ -369,8 +365,8 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok servers, it must be sent a SIGHUP signal. </para> <para>Client processes resolving names through the <command>winbindd</command> - nsswitch module read an environment variable named <parameter> - $WINBINDD_DOMAIN</parameter>. If this variable contains a comma separated + nsswitch module read an environment variable named <envar> + $WINBINDD_DOMAIN</envar>. If this variable contains a comma separated list of Windows NT domain names, then winbindd will only resolve users and groups within those Windows NT domains. </para> @@ -389,7 +385,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok <refsect1> - <title>Signals</title> + <title>SIGNALS</title> <para>The following signals can be used to manipulate the <command>winbindd</command> daemon. </para> @@ -418,7 +414,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok </refsect1> <refsect1> - <title>Files</title> + <title>FILES</title> <variablelist> <varlistentry> @@ -447,7 +443,7 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok <term>$LOCKDIR/winbindd_idmap.tdb</term> <listitem><para>Storage for the Windows NT rid to UNIX user/group id mapping. The lock directory is specified when Samba is initially - compiled using the <filename>--with-lockdir</filename> option. + compiled using the <parameter>--with-lockdir</parameter> option. This directory is by default <filename>/usr/local/samba/var/locks </filename>. </para></listitem> </varlistentry> @@ -464,9 +460,8 @@ auth required /lib/security/pam_pwdb.so use_first_pass shadow nullok <refsect1> <title>VERSION</title> - <para>This man page is correct for version 2.2 of - the Samba suite. winbindd is however not available in - stable release of Samba as of yet.</para> + <para>This man page is correct for version 2.2 of + the Samba suite.</para> </refsect1> <refsect1> |