The branch, v3-2-stable has been updated
via be95b548ee0c0c14ce27cadea0f3030b70b43b80 (commit)
via 29d9974fe6d534b875d815c9657460a3b5276b8a (commit)
from 05f727f4dd4f798d2df77b3914b87f9d410da94f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit be95b548ee0c0c14ce27cadea0f3030b70b43b80
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Thu Apr 24 11:23:36 2008 +0200
manpages: update the section about registry configuration in smb.conf.5
Michael
(cherry picked from commit 27bc3ac03f8be222814ff7b77cb3e50b3167a1ef)
commit 29d9974fe6d534b875d815c9657460a3b5276b8a
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Thu Apr 24 11:24:23 2008 +0200
manpages: describe special meaning of "include = registry" in description
of "include"
Michael
(cherry picked from commit 613b6dc6f833dd7ef93e107c0eddc211d42fff93)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/smb.conf.5.xml | 69 +++++++++++++++++++++-------------
docs-xml/smbdotconf/misc/include.xml | 11 ++++-
2 files changed, 51 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/smb.conf.5.xml
b/docs-xml/manpages-3/smb.conf.5.xml
index ff94ab6..b6d27f4 100644
--- a/docs-xml/manpages-3/smb.conf.5.xml
+++ b/docs-xml/manpages-3/smb.conf.5.xml
@@ -725,44 +725,61 @@ chmod 1770 /usr/local/samba/lib/usershares
<para>
Starting with Samba version 3.2.0, the capability to
store Samba configuration in the registry is available.
+ The configuration is stored in the registry key
+
<emphasis><literal>HKLM\Software\Samba\smbconf</literal></emphasis>.
There are two levels of registry configuration:
</para>
<orderedlist continuation="restarts" inheritnum="ignore"
numeration="arabic">
<listitem><para>Share definitions stored in registry are used.
This is triggered by setting the global
- parameter <parameter>registry shares</parameter> to
<quote>yes</quote>
- in <emphasis>smb.conf</emphasis>.
+ parameter <parameter>registry shares</parameter>
+ to <quote>yes</quote> in <emphasis>smb.conf</emphasis>.
</para>
- <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 the
- parameter <smbconfoption name="config
backend">registry</smbconfoption> in
- the [global] section of <emphasis>smb.conf</emphasis>.
- This removes everything that has been read from config files
+ <para>The registry shares are loaded not at startup but
+ on demand at runtime by <emphasis>smbd</emphasis>.
+ Shares defined in <emphasis>smb.conf</emphasis> 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 can be activated
+ in two different ways:</para>
+
+ <para>Firstly, a registry only configuration is triggered
+ by setting
+ <smbconfoption name="config backend">registry</smbconfoption>
+ in the [global] section of <emphasis>smb.conf</emphasis>.
+ This resets everything that has been read from config files
to this point and reads the content of the global configuration
section from the registry.
- Activation of global registry options automatically
- activates registry shares. In this case, no share definitions
- 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>
+ This is the recommended method of using registry based
+ configuration.</para>
+
+ <para>Secondly, a mixed configuration can be activated
+ by a special new meaning of the parameter
+ <smbconfoption name="include">registry</smbconfoption>
+ in the [global] section of <emphasis>smb.conf</emphasis>.
+ This reads the global options from registry with the same
+ priorities as for an include of a text file.
+ This may be especially useful in cases where an initial
+ configuration is needed to access the registry.</para>
+
+ <para>Activation of global registry options automatically
+ activates registry shares. So in the registry only case,
+ shares are loaded on demand only.</para>
+ </listitem>
</orderedlist>
<para>
- Caveat: To make registry-based configurations foolproof at
least to a
- 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
+ Note: To make registry-based configurations foolproof
+ at least to a certain extent, the use
+ of <parameter>lock directory</parameter> and
+ <parameter>config backend</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.
@@ -770,7 +787,7 @@ chmod 1770 /usr/local/samba/lib/usershares
<para>
The registry configuration can be accessed with
- tools like <emphasis>regedit</emphasis> or <emphasis>net rpc
+ tools like <emphasis>regedit</emphasis> or <emphasis>net (rpc)
registry</emphasis> in the key
<emphasis><literal>HKLM\Software\Samba\smbconf</literal></emphasis>.
diff --git a/docs-xml/smbdotconf/misc/include.xml
b/docs-xml/smbdotconf/misc/include.xml
index 1a08b49..8217d84 100644
--- a/docs-xml/smbdotconf/misc/include.xml
+++ b/docs-xml/smbdotconf/misc/include.xml
@@ -13,12 +13,17 @@
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>
- Note: This option can not be set inside registry
- configurations.
+ The parameter <parameter>include = registry</parameter> 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.
</para>
+</description>
<value type="default"></value>
<value type="example">/usr/local/samba/lib/admin_smb.conf</value>
--
Samba Shared Repository
