svn commit: samba-docs r1225 - in trunk: manpages-3 smbdotconf/misc
obnox at samba.org
obnox at samba.org
Wed Jan 16 17:26:57 GMT 2008
Author: obnox
Date: 2008-01-16 17:26:57 +0000 (Wed, 16 Jan 2008)
New Revision: 1225
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=1225
Log:
Add documentation for new parameter "config backend".
Adapt documentation of registry based configuration.
Michael
Modified:
trunk/manpages-3/smb.conf.5.xml
trunk/smbdotconf/misc/include.xml
trunk/smbdotconf/misc/lockdirectory.xml
Changeset:
Modified: trunk/manpages-3/smb.conf.5.xml
===================================================================
--- trunk/manpages-3/smb.conf.5.xml 2008-01-10 08:39:53 UTC (rev 1224)
+++ trunk/manpages-3/smb.conf.5.xml 2008-01-16 17:26:57 UTC (rev 1225)
@@ -716,8 +716,8 @@
<para>
Starting with Samba version 3.2.0, the capability to
- store Samba configuration in the registry is available.
- There are two levels of registry configuration.
+ store Samba configuration in the registry is available.
+ There are two levels of registry configuration.
</para>
<orderedlist continuation="restarts" inheritnum="ignore" numeration="arabic">
@@ -727,54 +727,38 @@
<quote>yes</quote> in <emphasis>smb.conf</emphasis>.
</para>
- <para>Note: Shares defined in <emphasis>smb.conf</emphasis> always take priority over
+ <para>Note: Shares defined in <emphasis>smb.conf</emphasis>
+ always take priority over
shares of the same name defined in registry.
</para></listitem>
<listitem><para>Global <emphasis>smb.conf</emphasis> options stored in
registry are used. This
- is triggered by a new special meaning of the
- parameter <smbconfoption name="include">registry</smbconfoption> in
- the [global] section of <emphasis>smb.conf</emphasis>.
- This reads the content of
- the global configuration section from the regsitry
- and includes the result with the same priorities as
- an include of a text file. Activation of global
- registry options automatically activates registry
- shares.
+ is triggered by a new parameter
+ <smbconfoption name="config backend">registry</smbconfoption> in
+ the [global] section of <emphasis>smb.conf</emphasis>.
+ This this removes everything that has been red from config files
+ to this poing and reads the content of the global configuration
+ section from the regsitry
+ Activation of global registry options automatically
+ activates registry shares. In this case, no share definition
+ from smb.conf are read: This is a registry only configuration
+ with the advantage that share definitions are not read
+ in a bulk at startup time but on demand when a share is
+ accessed.
</para></listitem>
</orderedlist>
- <para>
- Even when global registry options are used, the initial source of
- configuration is still the <emphasis>smb.conf</emphasis> file.
- It is this possible though, to produce a registry-only configuration
- with a minimal configuration file like this:
-<programlisting>
- <smbconfsection name="[global]"/>
- <smbconfoption name="include">registry</smbconfoption>
-</programlisting>
- This is also currently the only supported configuration with global
- registry options activated. More precisely, it is only supported to
- specify options in <emphasis>smb.conf</emphasis>
- <emphasis>before</emphasis> the
- occurrence of
- <smbconfoption name="include">registry</smbconfoption>.
- </para>
-
<para>
Caveat: To make registry-based configurations foolprof at least to a
- certain extent, the use of <parameter>lock directory</parameter>
+ certain extent, the use of
+ <parameter>lock directory</parameter>,
+ <parameter>config backend</parameter>,
and <parameter>include</parameter> inside the registry
configuration has been disabled. Especially, by changing the
<parameter>lock directory</parameter> inside the registry
configuration, one would create a broken setup where the daemons
- do not see the configuration they loaded once it is active. This
- phenomenon can of course also be triggered by specifying
- <parameter>lock directory</parameter> after the
- <smbconfoption name="include">registry</smbconfoption> directive.
- This is why
- this type of configuration is classified "unsupported" above.
+ do not see the configuration they loaded once it is active.
</para>
<para>
@@ -784,7 +768,7 @@
<emphasis><literal>HKLM\Software\Samba\smbconf</literal></emphasis>.
More conveniently, the <emphasis>conf</emphasis> subcommand of the
- <citerefentry><refentrytitle>net</refentrytitle>
+ <citerefentry><refentrytitle>net</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> utility
offers a dedicated interface to read and write the
registry based configuration locally, i.e. directly
Modified: trunk/smbdotconf/misc/include.xml
===================================================================
--- trunk/smbdotconf/misc/include.xml 2008-01-10 08:39:53 UTC (rev 1224)
+++ trunk/smbdotconf/misc/include.xml 2008-01-16 17:26:57 UTC (rev 1225)
@@ -13,18 +13,12 @@
It takes the standard substitutions, except <parameter moreinfo="none">%u</parameter>,
<parameter moreinfo="none">%P</parameter> and <parameter moreinfo="none">%S</parameter>.
</para>
-
+</description>
+
<para>
- Since Samba version 3.0.26, setting
- <smbconfoption name="include">registry</smbconfoption> has
- a special meaning: It does <emphasis>not</emphasis> include
- a file named <emphasis>registry</emphasis> from the current working
- directory, but instead reads the global configuration options
- from the registry. See the section on registry-based
- configuration for details. Note that this option
- automatically activates registry shares.
+ Note: This option can not be set inside registry
+ configurations.
</para>
-</description>
<value type="default"></value>
<value type="example">/usr/local/samba/lib/admin_smb.conf</value>
Modified: trunk/smbdotconf/misc/lockdirectory.xml
===================================================================
--- trunk/smbdotconf/misc/lockdirectory.xml 2008-01-10 08:39:53 UTC (rev 1224)
+++ trunk/smbdotconf/misc/lockdirectory.xml 2008-01-16 17:26:57 UTC (rev 1225)
@@ -9,6 +9,11 @@
files will be placed. The lock files are used to implement the
<smbconfoption name="max connections"/> option.
</para>
+
+ <para>
+ Note: This option can not be set inside registry
+ configurations.
+ </para>
</description>
<value type="default">${prefix}/var/locks</value>
More information about the samba-cvs
mailing list