From 9a18c2ae733772c9b76798107732bd17d92081e8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 16 Jan 2008 17:26:57 +0000 Subject: Add documentation for new parameter "config backend". Adapt documentation of registry based configuration. Michael (This used to be commit 5a9f8f45a7a5191cf6f44f6995fdd01fdd124dc1) --- docs/manpages-3/smb.conf.5.xml | 58 ++++++++++++---------------------- docs/smbdotconf/misc/include.xml | 14 +++----- docs/smbdotconf/misc/lockdirectory.xml | 5 +++ 3 files changed, 30 insertions(+), 47 deletions(-) diff --git a/docs/manpages-3/smb.conf.5.xml b/docs/manpages-3/smb.conf.5.xml index 2d54c3c182..87584de650 100644 --- a/docs/manpages-3/smb.conf.5.xml +++ b/docs/manpages-3/smb.conf.5.xml @@ -716,8 +716,8 @@ chmod 1770 /usr/local/samba/lib/usershares 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. @@ -727,54 +727,38 @@ chmod 1770 /usr/local/samba/lib/usershares yes in smb.conf. - Note: Shares defined in smb.conf always take priority over + Note: Shares defined in smb.conf + always take priority over shares of the same name defined in registry. Global smb.conf options stored in registry are used. This - is triggered by a new special meaning of the - parameter registry in - the [global] section of smb.conf. - 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 + registry in + the [global] section of smb.conf. + 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. - - Even when global registry options are used, the initial source of - configuration is still the smb.conf file. - It is this possible though, to produce a registry-only configuration - with a minimal configuration file like this: - - - registry - - This is also currently the only supported configuration with global - registry options activated. More precisely, it is only supported to - specify options in smb.conf - before the - occurrence of - registry. - - Caveat: To make registry-based configurations foolprof at least to a - certain extent, the use of lock directory + certain extent, the use of + lock directory, + config backend, and include inside the registry configuration has been disabled. Especially, by changing the lock directory 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 - lock directory after the - registry directive. - This is why - this type of configuration is classified "unsupported" above. + do not see the configuration they loaded once it is active. @@ -784,7 +768,7 @@ chmod 1770 /usr/local/samba/lib/usershares HKLM\Software\Samba\smbconf. More conveniently, the conf subcommand of the - net + net 8 utility offers a dedicated interface to read and write the registry based configuration locally, i.e. directly diff --git a/docs/smbdotconf/misc/include.xml b/docs/smbdotconf/misc/include.xml index d8179ef1b0..1a08b49464 100644 --- a/docs/smbdotconf/misc/include.xml +++ b/docs/smbdotconf/misc/include.xml @@ -13,18 +13,12 @@ It takes the standard substitutions, except %u, %P and %S. - + + - Since Samba version 3.0.26, setting - registry has - a special meaning: It does not include - a file named registry 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. - /usr/local/samba/lib/admin_smb.conf diff --git a/docs/smbdotconf/misc/lockdirectory.xml b/docs/smbdotconf/misc/lockdirectory.xml index d96351a4fb..cbe10d5b8d 100644 --- a/docs/smbdotconf/misc/lockdirectory.xml +++ b/docs/smbdotconf/misc/lockdirectory.xml @@ -9,6 +9,11 @@ files will be placed. The lock files are used to implement the option. + + + Note: This option can not be set inside registry + configurations. + ${prefix}/var/locks -- cgit