summaryrefslogtreecommitdiffstats
path: root/docs-xml
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-01-15 17:29:57 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-02-12 13:17:13 +1300
commit0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c (patch)
tree32fd04e3952881feaab0021cb0c289dd29190e6e /docs-xml
parentcc6a77835bc286b2e570a05596b3b6acc54c1052 (diff)
downloadsamba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.gz
samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.tar.xz
samba-0c7ed5a8ab99aa2a5c9c40e3cea8ce1e58cfe30c.zip
param: No longer have a special case for lp_configfile
This parameter is renamed because it does not normally return the current smb.conf file, but instead returns the next one, as found in a config file = directive, to be loaded. This avoids a conflict with the lpcfg_configfile from lib/param, which does refer to the current smb.conf path. Andrew Bartlett Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/misc/configfile.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/smbdotconf/misc/configfile.xml b/docs-xml/smbdotconf/misc/configfile.xml
index 755a43dbd31..abbc80c656c 100644
--- a/docs-xml/smbdotconf/misc/configfile.xml
+++ b/docs-xml/smbdotconf/misc/configfile.xml
@@ -2,7 +2,7 @@
context="G"
type="string"
hide="1"
- generated_function="0"
+ function="next_configfile"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This allows you to override the config file