[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed Jan 29 03:12:04 MST 2014
The branch, master has been updated
via c7790d6 lib/param: Fix copy_service to handle BOOLREV
via 7ddb58d docs: Remove unused parameters.global.xml and parameters.service.xml
via 12aed89 docs: Remove find_missing_manpages replaced by docs.py and dependent on a Makefile.in file
via b04b4fb param: don't ignore some parameters when performing map_parameter
via c18096b lib/param: fix copy service to include the case for P_CHAR
via 1d68b5b docs: remove the file prefix from included path names
via 0237936 docs: update XInclude year to conform with current standard
via 21a94c0 param: remove unnecessary checks in dump a parameter
via 58d3ad7 param: fix an offset bug in lpcfg_set_cmdline
from 58865d9 pthreadpool: Fix a comment, "quit"->"shutdown"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c7790d63e848f30015be2e4b2e129fb760d76f3c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Jan 15 14:13:13 2014 +1300
lib/param: Fix copy_service to handle BOOLREV
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Wed Jan 29 11:11:11 CET 2014 on sn-devel-104
commit 7ddb58dcd96c9361fb7f2b76d0eb9bbf2edc50e3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 14 12:35:25 2014 +1300
docs: Remove unused parameters.global.xml and parameters.service.xml
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 12aed897ec688d5bc379690208e8b85158b8227f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 14 11:22:16 2014 +1300
docs: Remove find_missing_manpages replaced by docs.py and dependent on a Makefile.in file
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit b04b4fba5bc21bac5a4519b9cb3876de63dde1bf
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed Jan 8 14:29:36 2014 +1300
param: don't ignore some parameters when performing map_parameter
Only the -valid parameter is currently affected by this. There doesn't seem to be any reason why you shouldn't
be able to simply map the parameter and there are already existing checks, in dump_a_service for instance, where it
checks for the prefix anyways.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit c18096b7b36c24b78726c1e04e73ebe641215235
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed Jan 8 12:51:26 2014 +1300
lib/param: fix copy service to include the case for P_CHAR
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 1d68b5b0bb3158cabcd371ab5c24392bcb0a32bd
Author: Garming Sam <garming at catalyst.net.nz>
Date: Tue Jan 7 17:09:39 2014 +1300
docs: remove the file prefix from included path names
This allows the inbuilt python xml modules to perform the include.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 02379369ef7968f297b8678c9743679b4775662e
Author: Garming Sam <garming at catalyst.net.nz>
Date: Tue Jan 7 16:08:50 2014 +1300
docs: update XInclude year to conform with current standard
This allows the inbuilt python XML parser to handle these includes.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 21a94c023782d557b848922272e061cc7103358e
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed Jan 29 12:12:00 2014 +1300
param: remove unnecessary checks in dump a parameter
In dump_a_parameter we now allow dumping of a parameter by alias name,
and so this check is not required.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
commit 58d3ad76120201356b77aaa1dfb6c9b131ad4ae4
Author: Garming Sam <garming at catalyst.net.nz>
Date: Wed Jan 29 11:59:29 2014 +1300
param: fix an offset bug in lpcfg_set_cmdline
Previously, it was possible to compare offsets between
loadparm_service and loadparm_global. This meant in some cases
incorrectly skipping certain parameters.
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/.gitignore | 2 -
docs-xml/Makefile | 15 +------
docs-xml/scripts/find_missing_manpages | 71 --------------------------------
docs-xml/wscript_build | 4 +-
lib/param/loadparm.c | 19 ++++++--
source3/param/loadparm.c | 8 +---
6 files changed, 18 insertions(+), 101 deletions(-)
delete mode 100755 docs-xml/scripts/find_missing_manpages
Changeset truncated at 500 lines:
diff --git a/docs-xml/.gitignore b/docs-xml/.gitignore
index 6dab9bb..8beaa2d 100644
--- a/docs-xml/.gitignore
+++ b/docs-xml/.gitignore
@@ -11,8 +11,6 @@ configure
test.d
tmp
smbdotconf/parameters.all.xml
-smbdotconf/parameters.global.xml
-smbdotconf/parameters.service.xml
*.d
output/manpages
Samba3-ByExample.tex
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index f9c60d0..d9ae92b 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -37,7 +37,6 @@ help:
@echo " html - Build multi-file HTML versions"
@echo " html-single - Build single-file HTML versions"
@echo " htmlman - Build HTML version of manpages"
- @echo " undocumented - Output list of undocumented smb.conf options"
@echo " samples - Extract examples"
$(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps $(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard Samba3-ByExample/*.xml)
@@ -222,19 +221,11 @@ $(MANPAGEDIR)/smb.conf.5.xml: parameters
# any smbdotconf/*/*.xml file ...
.PHONY: parameters
-parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
+parameters: $(SMBDOTCONFDOC)/parameters.all.xml
$(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh
$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
-$(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
- @echo "Generating list of global smb.conf options"
- $(XSLTPROC) --xinclude --param smb.context "'G'" --output $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
-
-$(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
- @echo "Generating list of share-mode smb.conf options"
- $(XSLTPROC) --xinclude --param smb.context "'S'" --output $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
-
$(OUTPUTDIR):
test -d $@ || mkdir $@
@@ -262,10 +253,6 @@ $(PEARSONDIR)/%.report.html: $(PEARSONDIR)/%.xml
%-validate: %/index.xml
cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
-# Find undocumented parameters
-undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_manpages
- $(PERL) scripts/find_missing_manpages $(SRCDIR)/source3
-
samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
@mkdir -p examples
$(XSLTPROC) --xinclude xslt/extract-examples.xsl $< > /dev/null 2> examples/README
diff --git a/docs-xml/scripts/find_missing_manpages b/docs-xml/scripts/find_missing_manpages
deleted file mode 100755
index baa5809..0000000
--- a/docs-xml/scripts/find_missing_manpages
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-# Copyright (C) 2007,2012 Jelmer Vernooij <jelmer at samba.org>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-import optparse
-import os
-import re
-
-parser = optparse.OptionParser("source_dir")
-
-(opts, args) = parser.parse_args()
-
-invar = False
-
-if len(args) == 1:
- topdir = args[0]
-else:
- topdir = "."
-
-progs = []
-
-f = open(os.path.join(topdir, "Makefile.in"), "r")
-try:
- for l in f.readlines():
- l = l.strip()
- if invar:
- invar = (l[-1] == "\\")
- progs.extend(l.rstrip("\\").split(" "))
- else:
- m = re.match("^([^ ]*)_PROGS([0-9]*) = (.*?)([\\\\])$", l)
- if m:
- progs.extend(m.group(3).split(" "))
- invar = (m.group(4) == "\\")
- else:
- invar = False
-finally:
- f.close()
-
-#$progs =~ s/@([^@]+)@//g;
-#$progs =~ s/\$\(.*?\)//g;
-
-for prog in progs:
- prog = prog.strip()
- if prog == "":
- continue
- if prog[0] in ("@", "$"):
- continue
- prog = prog[len("bin/"):]
-
- found = False
-
- for i in range(9):
- p = "manpages/%s.%d.xml" % (prog, i)
- if os.path.exists(p):
- found = True
-
- if not found:
- print "'%s' does not have a manpage" % prog
diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
index a752758..d1b3ec5 100644
--- a/docs-xml/wscript_build
+++ b/docs-xml/wscript_build
@@ -98,9 +98,9 @@ def smbdotconf_generate_parameter_list(task):
parameter_all = task.outputs[0].bldpath(task.env)
articles = task.inputs
- t = '<section xmlns:xi="http://www.w3.org/2003/XInclude">\n'
+ t = '<section xmlns:xi="http://www.w3.org/2001/XInclude">\n'
for article in articles:
- t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n"
+ t += "<xi:include href='" + article.abspath(task.env) + "' parse='xml'/>\n"
t += "</section>\n"
save_file(parameter_all, t , create_dir=True)
return 0
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 802ac27..cf7af34 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -806,9 +806,6 @@ static int map_parameter(const char *pszParmName)
{
int iIndex;
- if (*pszParmName == '-')
- return -1;
-
for (iIndex = 0; parm_table[iIndex].label; iIndex++)
if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
return iIndex;
@@ -927,6 +924,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
switch (parm_table[i].type) {
case P_BOOL:
+ case P_BOOLREV:
*(bool *)dest_ptr = *(bool *)src_ptr;
break;
@@ -937,6 +935,10 @@ static void copy_service(struct loadparm_service *pserviceDest,
*(int *)dest_ptr = *(int *)src_ptr;
break;
+ case P_CHAR:
+ *(char *)dest_ptr = *(char *)src_ptr;
+ break;
+
case P_STRING:
lpcfg_string_set(pserviceDest,
(char **)dest_ptr,
@@ -1574,10 +1576,17 @@ bool lpcfg_set_cmdline(struct loadparm_context *lp_ctx, const char *pszParmName,
lp_ctx->flags[parmnum] |= FLAG_CMDLINE;
/* we have to also set FLAG_CMDLINE on aliases */
- for (i=parmnum-1;i>=0 && parm_table[i].offset == parm_table[parmnum].offset;i--) {
+ for (i=parmnum-1;
+ i>=0 && parm_table[i].p_class == parm_table[parmnum].p_class &&
+ parm_table[i].offset == parm_table[parmnum].offset;
+ i--) {
lp_ctx->flags[i] |= FLAG_CMDLINE;
}
- for (i=parmnum+1;i<NUMPARAMETERS && parm_table[i].offset == parm_table[parmnum].offset;i++) {
+ for (i=parmnum+1;
+ i<NUMPARAMETERS &&
+ parm_table[i].p_class == parm_table[parmnum].p_class &&
+ parm_table[i].offset == parm_table[parmnum].offset;
+ i++) {
lp_ctx->flags[i] |= FLAG_CMDLINE;
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5d8d7f9..489a21f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1974,9 +1974,6 @@ static int map_parameter(const char *pszParmName)
{
int iIndex;
- if (*pszParmName == '-' && !strequal(pszParmName, "-valid"))
- return (-1);
-
for (iIndex = 0; parm_table[iIndex].label; iIndex++)
if (strwicmp(parm_table[iIndex].label, pszParmName) == 0)
return (iIndex);
@@ -3800,10 +3797,7 @@ bool dump_a_parameter(int snum, char *parm_name, FILE * f, bool isGlobal)
for (i = 0; parm_table[i].label; i++) {
if (strwicmp(parm_table[i].label, parm_name) == 0 &&
- !(parm_table[i].flags & FLAG_META) &&
- (parm_table[i].p_class == p_class || parm_table[i].flags & flag) &&
- (*parm_table[i].label != '-') &&
- (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset)))
+ (parm_table[i].p_class == p_class || parm_table[i].flags & flag))
{
void *ptr;
--
Samba Shared Repository
More information about the samba-cvs
mailing list