The branch, master has been updated
via 70feedb s3-loadparm: Add synonym "private directory".
from 31db7d2 Fix bug 8920, null dereference
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 70feedbfe38d6d63913faac6fae59f010ef59abc
Author: Karolin Seeger <[email protected]>
Date: Thu May 10 16:48:04 2012 +0200
s3-loadparm: Add synonym "private directory".
Karolin
Autobuild-User: Karolin Seeger <[email protected]>
Autobuild-Date: Fri May 11 13:04:03 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/security/privatedir.xml | 1 +
source3/param/loadparm.c | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/security/privatedir.xml
b/docs-xml/smbdotconf/security/privatedir.xml
index d0cbcfa..46d4a82 100644
--- a/docs-xml/smbdotconf/security/privatedir.xml
+++ b/docs-xml/smbdotconf/security/privatedir.xml
@@ -3,6 +3,7 @@
type="string"
advanced="1" developer="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";>
+<synonym>private directory</synonym>
<description>
<para>This parameters defines the directory
smbd will use for storing such files as <filename
moreinfo="none">smbpasswd</filename>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e781048..7d82b61 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -723,6 +723,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = "private directory",
+ .type = P_STRING,
+ .p_class = P_GLOBAL,
+ .offset = GLOBAL_VAR(szPrivateDir),
+ .special = NULL,
+ .enum_list = NULL,
+ .flags = FLAG_HIDE,
+ },
+ {
.label = "passdb backend",
.type = P_STRING,
.p_class = P_GLOBAL,
--
Samba Shared Repository
