1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00

merge from 2.2 and regenerate

This commit is contained in:
Gerald Carter -
parent e40a0a7f27
commit 55c53ef089
9 changed files with 389 additions and 930 deletions

Binary file not shown.

View File

@ -139,7 +139,7 @@
<para>parameters in this section apply to the server
as a whole, or are defaults for sections which do not
specifically define certain items. See the notes
specifically define certain items. See the notes
under PARAMETERS for more information.</para>
</refsect2>
@ -183,7 +183,7 @@
<para>A similar process occurs if the requested section
name is "homes", except that the share name is not
changed to that of the requesting user. This method of using
changed to that of the requesting user. This method of using
the [homes] section works well if different users share
a client PC.</para>
@ -227,7 +227,7 @@
<para>When a connection request is made, the existing sections
are scanned. If a match is found, it is used. If no match is found,
but a [homes] section exists, it is used as described
above. Otherwise, the requested section name is treated as a
above. Otherwise, the requested section name is treated as a
printer name and the appropriate printcap file is scanned to see
if the requested section name is a valid printer share name. If
a match is found, a new printer share is created by cloning
@ -315,7 +315,7 @@
the default behavior for all services.</para>
<para>parameters are arranged here in alphabetical order - this may
not create best bedfellows, but at least you can find them! Where
not create best bedfellows, but at least you can find them! Where
there are synonyms, the preferred synonym is described, others refer
to the preferred synonym.</para>
</refsect1>
@ -749,6 +749,7 @@
<listitem><para><link linkend="TIMESERVER"><parameter>time server</parameter></link></para></listitem>
<listitem><para><link linkend="TIMESTAMPLOGS"><parameter>timestamp logs</parameter></link></para></listitem>
<listitem><para><link linkend="TOTALPRINTJOBS"><parameter>total print jobs</parameter></link></para></listitem>
<listitem><para><link linkend="UNIXEXTENSIONS"><parameter>unix extensions</parameter></link></para></listitem>
<listitem><para><link linkend="UNIXPASSWORDSYNC"><parameter>unix password sync</parameter></link></para></listitem>
<listitem><para><link linkend="UPDATEENCRYPTED"><parameter>update encrypted</parameter></link></para></listitem>
<listitem><para><link linkend="USEMMAP"><parameter>use mmap</parameter></link></para></listitem>
@ -795,6 +796,7 @@
<listitem><para><link linkend="CREATEMASK"><parameter>create mask</parameter></link></para></listitem>
<listitem><para><link linkend="CREATEMODE"><parameter>create mode</parameter></link></para></listitem>
<listitem><para><link linkend="DEFAULTCASE"><parameter>default case</parameter></link></para></listitem>
<listitem><para><link linkend="DEFAULTDEVMODE"><parameter>default devmode</parameter></link></para></listitem>
<listitem><para><link linkend="DELETEREADONLY"><parameter>delete readonly</parameter></link></para></listitem>
<listitem><para><link linkend="DELETEVETOFILES"><parameter>delete veto files</parameter></link></para></listitem>
<listitem><para><link linkend="DENYHOSTS"><parameter>deny hosts</parameter></link></para></listitem>
@ -1869,11 +1871,49 @@
<varlistentry>
<term><anchor id="DEFAULTDEVMODE">default devmode (S)</term>
<listitem><para>This parameter is only applicable to <link
linkend="PRINTOK">printable</link> services. When smbd is serving
Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
server has a Device Mode which defines things such as paper size and
orientation and duplex settings. The device mode can only correctly be
generated by the printer driver itself (which can only be executed on a
Win32 platform). Because smbd is unable to execute the driver code
to generate the device mode, the default behavior is to set this field
to NULL.
</para>
<para>Most problems with serving printer drivers to Windows NT/2k/XP clients
can be traced to a problem with the generated device mode. Certain drivers
will do things such as crashing the client's Explorer.exe with a NULL devmode.
However, other printer drivers can cause the client's spooler service
(spoolsv.exe) to die if the devmode was not created by the driver itself
(i.e. smbd generates a default devmode).
</para>
<para>This parameter should be used with care and tested with the printer
driver in question. It is better to leave the device mode to NULL
and let the Windows client set the correct values. Because drivers do not
do this all the time, setting <command>default devmode = yes</command>
will instruct smbd to generate a default one.
</para>
<para>For more information on Windows NT/2k printing and Device Modes,
see the <ulink url="http://msdn.microsoft.com/">MSDN documentation</ulink>.
</para>
<para>Default: <command>default devmode = no</command></para>
</listitem>
</varlistentry>
<varlistentry>
<term><anchor id="DEFAULTSERVICE">default service (G)</term>
<listitem><para>This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are <emphasis>NOT</emphasis>
<listitem><para>This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are <emphasis>NOT</emphasis>
given in the parameter value (see example below).</para>
<para>There is no default value for this parameter. If this
@ -3474,7 +3514,7 @@
the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>.
The default is to use the stand LDAPS port 636.
</para>
<para>See Also: <link linkend="LDAPSSL">ldap ssl</link>
</para>
@ -7543,6 +7583,22 @@
<varlistentry>
<term><anchor id="UNIXEXTENSIONS">unix extensions(G)</term>
<listitem><para>This boolean parameter controls whether Samba
implments the CIFS UNIX extensions, as defined by HP. These
extensions enable CIFS to server UNIX clients to UNIX servers
better, and allow such things as symbolic links, hard links etc.
These extensions require a similarly enabled client, and are of
no current use to Windows clients.</para>
<para>Default: <command>unix extensions = no</command></para>
</listitem>
</varlistentry>
<varlistentry>
<term><anchor id="UNIXPASSWORDSYNC">unix password sync (G)</term>
<listitem><para>This boolean parameter controls whether Samba

View File

@ -126,22 +126,22 @@
<sect1>
<title>Step 5: Starting the smbd and nmbd</title>
<para>You must choose to start smbd and nmbd either
as daemons or from <command>inetd</command>. Don't try
<para>You must choose to start smbd and nmbd either
as daemons or from <command>inetd</command>. Don't try
to do both! Either you can put them in <filename>
inetd.conf</filename> and have them started on demand
inetd.conf</filename> and have them started on demand
by <command>inetd</command>, or you can start them as
daemons either from the command line or in <filename>
/etc/rc.local</filename>. See the man pages for details
on the command line options. Take particular care to read
the bit about what user you need to be in order to start
/etc/rc.local</filename>. See the man pages for details
on the command line options. Take particular care to read
the bit about what user you need to be in order to start
Samba. In many cases you must be root.</para>
<para>The main advantage of starting <command>smbd</command>
and <command>nmbd</command> as a daemon is that they will
respond slightly more quickly to an initial connection
request. This is, however, unlikely to be a problem.</para>
and <command>nmbd</command> using the recommended daemon method
is that they will respond slightly more quickly to an initial connection
request.</para>
<sect2>
<title>Step 5a: Starting from inetd.conf</title>

View File

@ -624,7 +624,7 @@ CEO+TsInternetUser
</programlisting></para>
<para>
Obviously, I have named my domain 'CEO' and my <parameter>winbindd
Obviously, I have named my domain 'CEO' and my <parameter>winbind
separator</parameter> is '+'.
</para>

File diff suppressed because it is too large Load Diff

View File

@ -260,15 +260,15 @@ NAME="AEN63"
>Step 5: Starting the smbd and nmbd</A
></H1
><P
>You must choose to start smbd and nmbd either
>You must choose to start smbd and nmbd either
as daemons or from <B
CLASS="COMMAND"
>inetd</B
>. Don't try
>. Don't try
to do both! Either you can put them in <TT
CLASS="FILENAME"
> inetd.conf</TT
> and have them started on demand
> and have them started on demand
by <B
CLASS="COMMAND"
>inetd</B
@ -276,9 +276,9 @@ CLASS="COMMAND"
daemons either from the command line or in <TT
CLASS="FILENAME"
> /etc/rc.local</TT
>. See the man pages for details
on the command line options. Take particular care to read
the bit about what user you need to be in order to start
>. See the man pages for details
on the command line options. Take particular care to read
the bit about what user you need to be in order to start
Samba. In many cases you must be root.</P
><P
>The main advantage of starting <B
@ -288,9 +288,9 @@ CLASS="COMMAND"
and <B
CLASS="COMMAND"
>nmbd</B
> as a daemon is that they will
respond slightly more quickly to an initial connection
request. This is, however, unlikely to be a problem.</P
> using the recommended daemon method
is that they will respond slightly more quickly to an initial connection
request.</P
><DIV
CLASS="SECT2"
><HR><H2

View File

@ -232,7 +232,7 @@ NAME="AEN50"
><P
>parameters in this section apply to the server
as a whole, or are defaults for sections which do not
specifically define certain items. See the notes
specifically define certain items. See the notes
under PARAMETERS for more information.</P
></DIV
><DIV
@ -293,7 +293,7 @@ CLASS="USERINPUT"
><P
>A similar process occurs if the requested section
name is "homes", except that the share name is not
changed to that of the requesting user. This method of using
changed to that of the requesting user. This method of using
the [homes] section works well if different users share
a client PC.</P
><P
@ -360,7 +360,7 @@ NAME="AEN79"
>When a connection request is made, the existing sections
are scanned. If a match is found, it is used. If no match is found,
but a [homes] section exists, it is used as described
above. Otherwise, the requested section name is treated as a
above. Otherwise, the requested section name is treated as a
printer name and the appropriate printcap file is scanned to see
if the requested section name is a valid printer share name. If
a match is found, a new printer share is created by cloning
@ -493,7 +493,7 @@ NAME="AEN102"
the default behavior for all services.</P
><P
>parameters are arranged here in alphabetical order - this may
not create best bedfellows, but at least you can find them! Where
not create best bedfellows, but at least you can find them! Where
there are synonyms, the preferred synonym is described, others refer
to the preferred synonym.</P
></DIV
@ -2769,6 +2769,18 @@ CLASS="PARAMETER"
><LI
><P
><A
HREF="#UNIXEXTENSIONS"
><TT
CLASS="PARAMETER"
><I
>unix extensions</I
></TT
></A
></P
></LI
><LI
><P
><A
HREF="#UNIXPASSWORDSYNC"
><TT
CLASS="PARAMETER"
@ -3035,7 +3047,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN982"
NAME="AEN986"
></A
><H2
>COMPLETE LIST OF SERVICE PARAMETERS</H2
@ -3204,6 +3216,18 @@ CLASS="PARAMETER"
><LI
><P
><A
HREF="#DEFAULTDEVMODE"
><TT
CLASS="PARAMETER"
><I
>default devmode</I
></TT
></A
></P
></LI
><LI
><P
><A
HREF="#DELETEREADONLY"
><TT
CLASS="PARAMETER"
@ -4466,7 +4490,7 @@ CLASS="PARAMETER"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN1458"
NAME="AEN1466"
></A
><H2
>EXPLANATION OF EACH PARAMETER</H2
@ -6655,16 +6679,67 @@ CLASS="COMMAND"
></DD
><DT
><A
NAME="DEFAULTDEVMODE"
></A
>default devmode (S)</DT
><DD
><P
>This parameter is only applicable to <A
HREF="#PRINTOK"
>printable</A
> services. When smbd is serving
Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
server has a Device Mode which defines things such as paper size and
orientation and duplex settings. The device mode can only correctly be
generated by the printer driver itself (which can only be executed on a
Win32 platform). Because smbd is unable to execute the driver code
to generate the device mode, the default behavior is to set this field
to NULL.
</P
><P
>Most problems with serving printer drivers to Windows NT/2k/XP clients
can be traced to a problem with the generated device mode. Certain drivers
will do things such as crashing the client's Explorer.exe with a NULL devmode.
However, other printer drivers can cause the client's spooler service
(spoolsv.exe) to die if the devmode was not created by the driver itself
(i.e. smbd generates a default devmode).
</P
><P
>This parameter should be used with care and tested with the printer
driver in question. It is better to leave the device mode to NULL
and let the Windows client set the correct values. Because drivers do not
do this all the time, setting <B
CLASS="COMMAND"
>default devmode = yes</B
>
will instruct smbd to generate a default one.
</P
><P
>For more information on Windows NT/2k printing and Device Modes,
see the <A
HREF="http://msdn.microsoft.com/"
TARGET="_top"
>MSDN documentation</A
>.
</P
><P
>Default: <B
CLASS="COMMAND"
>default devmode = no</B
></P
></DD
><DT
><A
NAME="DEFAULTSERVICE"
></A
>default service (G)</DT
><DD
><P
>This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
>This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are <EM
>NOT</EM
>
>
given in the parameter value (see example below).</P
><P
>There is no default value for this parameter. If this
@ -17684,6 +17759,25 @@ CLASS="COMMAND"
></DD
><DT
><A
NAME="UNIXEXTENSIONS"
></A
>unix extensions(G)</DT
><DD
><P
>This boolean parameter controls whether Samba
implments the CIFS UNIX extensions, as defined by HP. These
extensions enable CIFS to server UNIX clients to UNIX servers
better, and allow such things as symbolic links, hard links etc.
These extensions require a similarly enabled client, and are of
no current use to Windows clients.</P
><P
>Default: <B
CLASS="COMMAND"
>unix extensions = no</B
></P
></DD
><DT
><A
NAME="UNIXPASSWORDSYNC"
></A
>unix password sync (G)</DT
@ -19315,7 +19409,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6097"
NAME="AEN6125"
></A
><H2
>WARNINGS</H2
@ -19345,7 +19439,7 @@ TARGET="_top"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6103"
NAME="AEN6131"
></A
><H2
>VERSION</H2
@ -19356,7 +19450,7 @@ NAME="AEN6103"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6106"
NAME="AEN6134"
></A
><H2
>SEE ALSO</H2
@ -19435,7 +19529,7 @@ CLASS="COMMAND"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN6126"
NAME="AEN6154"
></A
><H2
>AUTHOR</H2

View File

@ -903,7 +903,7 @@ CEO+TsInternetUser</PRE
>Obviously, I have named my domain 'CEO' and my <TT
CLASS="PARAMETER"
><I
>winbindd
>winbind
separator</I
></TT
> is '+'.</P

View File

@ -3,7 +3,7 @@
.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/>
.\" Please send any bug reports, improvements, comments, patches,
.\" etc. to Steve Cheng <steve@ggi-project.org>.
.TH "SMB.CONF" "5" "24 January 2002" "" ""
.TH "SMB.CONF" "5" "26 January 2002" "" ""
.SH NAME
smb.conf \- The configuration file for the Samba suite
.SH "SYNOPSIS"
@ -122,7 +122,7 @@ elsewhere):
.PP
parameters in this section apply to the server
as a whole, or are defaults for sections which do not
specifically define certain items. See the notes
specifically define certain items. See the notes
under PARAMETERS for more information.
.SS "THE HOMES SECTION"
.PP
@ -167,7 +167,7 @@ of fuss.
.PP
A similar process occurs if the requested section
name is "homes", except that the share name is not
changed to that of the requesting user. This method of using
changed to that of the requesting user. This method of using
the [homes] section works well if different users share
a client PC.
.PP
@ -213,7 +213,7 @@ specified in the local host's printcap file.
When a connection request is made, the existing sections
are scanned. If a match is found, it is used. If no match is found,
but a [homes] section exists, it is used as described
above. Otherwise, the requested section name is treated as a
above. Otherwise, the requested section name is treated as a
printer name and the appropriate printcap file is scanned to see
if the requested section name is a valid printer share name. If
a match is found, a new printer share is created by cloning
@ -307,7 +307,7 @@ the [global] section - in which case they will define
the default behavior for all services.
.PP
parameters are arranged here in alphabetical order - this may
not create best bedfellows, but at least you can find them! Where
not create best bedfellows, but at least you can find them! Where
there are synonyms, the preferred synonym is described, others refer
to the preferred synonym.
.SH "VARIABLE SUBSTITUTIONS"
@ -980,6 +980,9 @@ each parameter for details. Note that some are synonyms.
\fItotal print jobs\fR
.TP 0.2i
\(bu
\fIunix extensions\fR
.TP 0.2i
\(bu
\fIunix password sync\fR
.TP 0.2i
\(bu
@ -1089,6 +1092,9 @@ each parameter for details. Note that some are synonyms.
\fIdefault case\fR
.TP 0.2i
\(bu
\fIdefault devmode\fR
.TP 0.2i
\(bu
\fIdelete readonly\fR
.TP 0.2i
\(bu
@ -2192,10 +2198,38 @@ See the section on NAME MANGLING. Also note the \fIshort preserve case\fR para
Default: \fBdefault case = lower\fR
.TP
\fBdefault devmode (S)\fR
This parameter is only applicable to printable services. When smbd is serving
Printer Drivers to Windows NT/2k/XP clients, each printer on the Samba
server has a Device Mode which defines things such as paper size and
orientation and duplex settings. The device mode can only correctly be
generated by the printer driver itself (which can only be executed on a
Win32 platform). Because smbd is unable to execute the driver code
to generate the device mode, the default behavior is to set this field
to NULL.
Most problems with serving printer drivers to Windows NT/2k/XP clients
can be traced to a problem with the generated device mode. Certain drivers
will do things such as crashing the client's Explorer.exe with a NULL devmode.
However, other printer drivers can cause the client's spooler service
(spoolsv.exe) to die if the devmode was not created by the driver itself
(i.e. smbd generates a default devmode).
This parameter should be used with care and tested with the printer
driver in question. It is better to leave the device mode to NULL
and let the Windows client set the correct values. Because drivers do not
do this all the time, setting \fBdefault devmode = yes\fR
will instruct smbd to generate a default one.
For more information on Windows NT/2k printing and Device Modes,
see the MSDN documentation <URL:http://msdn.microsoft.com/>.
Default: \fBdefault devmode = no\fR
.TP
\fBdefault service (G)\fR
This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are \fBNOT\fR
This parameter specifies the name of a service
which will be connected to if the service actually requested cannot
be found. Note that the square brackets are \fBNOT\fR
given in the parameter value (see example below).
There is no default value for this parameter. If this
@ -6653,6 +6687,16 @@ Default: \fBtotal print jobs = 0\fR
Example: \fBtotal print jobs = 5000\fR
.TP
\fBunix extensions(G)\fR
This boolean parameter controls whether Samba
implments the CIFS UNIX extensions, as defined by HP. These
extensions enable CIFS to server UNIX clients to UNIX servers
better, and allow such things as symbolic links, hard links etc.
These extensions require a similarly enabled client, and are of
no current use to Windows clients.
Default: \fBunix extensions = no\fR
.TP
\fBunix password sync (G)\fR
This boolean parameter controls whether Samba
attempts to synchronize the UNIX password with the SMB password