The branch, master has been updated
via b4747b6 s4:torture:smb2:rename: Fix typo in simple_nodelete
testcase.
via 25dcdc9 lib/param: fix hiding of FLAG_SYNONYM values
via 8262ecb build:wafsamba: Use the samba-provided CHECK_CFG method in
configuration tests
from 3408591 ctdb-doc: Fix a typo in the definition of CTDB_NODE_ADDRESS
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b4747b6364d9c49a3f146800921c44b3c39f59d1
Author: Anubhav Rakshit <[email protected]>
Date: Wed Sep 16 21:04:12 2015 +0530
s4:torture:smb2:rename: Fix typo in simple_nodelete testcase.
Signed-off-by: Anubhav Rakshit <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Mon Sep 21 04:51:11 CEST 2015 on sn-devel-104
commit 25dcdc92709a46d87125bc454faae7cad43d6b71
Author: Stefan Metzmacher <[email protected]>
Date: Fri Sep 18 18:54:31 2015 +0200
lib/param: fix hiding of FLAG_SYNONYM values
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11526
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 8262ecb98884cb71a59c6a18252aa632b8cbcc35
Author: Thomas Nagy <[email protected]>
Date: Sat Sep 12 09:49:41 2015 +0200
build:wafsamba: Use the samba-provided CHECK_CFG method in configuration
tests
This is for forward compatibility with waf 1.8. All other tests
use CHECK_CFG, but check_cfg was re-introduced for some reason.
Signed-off-by: Thomas Nagy <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/param/loadparm.c | 89 ++++++++++++++++++++++++++-----------------
lib/util/wscript_configure | 6 +--
source3/wscript | 2 +-
source4/torture/smb2/rename.c | 2 +-
4 files changed, 58 insertions(+), 41 deletions(-)
mode change 100644 => 100755 source4/torture/smb2/rename.c
Changeset truncated at 500 lines:
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index a0700a9..871d2d9 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2054,22 +2054,28 @@ void lpcfg_dump_globals(struct loadparm_context
*lp_ctx, FILE *f,
fprintf(f, "# Global parameters\n[global]\n");
- for (i = 0; parm_table[i].label; i++)
- if (parm_table[i].p_class == P_GLOBAL &&
- (i == 0 || (parm_table[i].offset != parm_table[i -
1].offset))) {
- if (!show_defaults) {
- if (lp_ctx->flags && (lp_ctx->flags[i] &
FLAG_DEFAULT)) {
- continue;
- }
+ for (i = 0; parm_table[i].label; i++) {
+ if (parm_table[i].p_class != P_GLOBAL) {
+ continue;
+ }
- if (is_default(lp_ctx->globals, i)) {
- continue;
- }
+ if (parm_table[i].flags & FLAG_SYNONYM) {
+ continue;
+ }
+
+ if (!show_defaults) {
+ if (lp_ctx->flags && (lp_ctx->flags[i] & FLAG_DEFAULT))
{
+ continue;
+ }
+
+ if (is_default(lp_ctx->globals, i)) {
+ continue;
}
+ }
- fprintf(f, "\t%s = ", parm_table[i].label);
- lpcfg_print_parameter(&parm_table[i],
lpcfg_parm_ptr(lp_ctx, NULL, &parm_table[i]), f);
- fprintf(f, "\n");
+ fprintf(f, "\t%s = ", parm_table[i].label);
+ lpcfg_print_parameter(&parm_table[i], lpcfg_parm_ptr(lp_ctx,
NULL, &parm_table[i]), f);
+ fprintf(f, "\n");
}
if (lp_ctx->globals->param_opt != NULL) {
for (data = lp_ctx->globals->param_opt; data;
@@ -2097,34 +2103,45 @@ void lpcfg_dump_a_service(struct loadparm_service *
pService, struct loadparm_se
fprintf(f, "\n[%s]\n", pService->szService);
for (i = 0; parm_table[i].label; i++) {
- if (parm_table[i].p_class == P_LOCAL &&
- (*parm_table[i].label != '-') &&
- (i == 0 || (parm_table[i].offset != parm_table[i -
1].offset)))
- {
- if (pService == sDefault) {
- if (!show_defaults) {
- if (flags && (flags[i] & FLAG_DEFAULT))
{
- continue;
- }
+ if (parm_table[i].p_class != P_LOCAL) {
+ continue;
+ }
- if (is_default(sDefault, i)) {
- continue;
- }
+ if (parm_table[i].flags & FLAG_SYNONYM) {
+ continue;
+ }
+
+ if (*parm_table[i].label == '-') {
+ continue;
+ }
+
+ if (pService == sDefault) {
+ if (!show_defaults) {
+ if (flags && (flags[i] & FLAG_DEFAULT)) {
+ continue;
}
- } else {
- if (lpcfg_equal_parameter(parm_table[i].type,
- ((char *)pService) +
- parm_table[i].offset,
- ((char *)sDefault) +
- parm_table[i].offset))
+
+ if (is_default(sDefault, i)) {
continue;
+ }
+ }
+ } else {
+ bool equal;
+
+ equal = lpcfg_equal_parameter(parm_table[i].type,
+ ((char *)pService) +
+ parm_table[i].offset,
+ ((char *)sDefault) +
+ parm_table[i].offset);
+ if (equal) {
+ continue;
}
-
- fprintf(f, "\t%s = ", parm_table[i].label);
- lpcfg_print_parameter(&parm_table[i],
- ((char *)pService) +
parm_table[i].offset, f);
- fprintf(f, "\n");
}
+
+ fprintf(f, "\t%s = ", parm_table[i].label);
+ lpcfg_print_parameter(&parm_table[i],
+ ((char *)pService) + parm_table[i].offset, f);
+ fprintf(f, "\n");
}
if (pService->param_opt != NULL) {
for (data = pService->param_opt; data; data = data->next) {
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index e7bcbd6..a1e5801 100644
--- a/lib/util/wscript_configure
+++ b/lib/util/wscript_configure
@@ -110,19 +110,19 @@ conf.SET_TARGET_TYPE('systemd-journal', 'EMPTY')
conf.SET_TARGET_TYPE('systemd', 'EMPTY')
if Options.options.enable_systemd != False:
- conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs',
+ conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
msg='Checking for libsystemd-daemon')
if not conf.CHECK_LIB('systemd-daemon', shlib=True):
conf.CHECK_LIB('systemd', shlib=True)
if Options.options.enable_systemd != False:
- conf.check_cfg(package='libsystemd-journal', args='--cflags --libs',
+ conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
msg='Checking for libsystemd-journal')
if not conf.CHECK_LIB('systemd-journal', shlib=True):
conf.CHECK_LIB('systemd', shlib=True)
if Options.options.enable_lttng != False:
- conf.check_cfg(package='lttng-ust', args='--cflags --libs',
+ conf.CHECK_CFG(package='lttng-ust', args='--cflags --libs',
msg='Checking for lttng-ust', uselib_store="LTTNG-UST")
conf.CHECK_HEADERS('lttng/tracef.h', lib='lttng-st')
conf.CHECK_LIB('lttng-ust', shlib=True)
diff --git a/source3/wscript b/source3/wscript
index 33e36b1..2687620 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1582,7 +1582,7 @@ main() {
versions = ['1.0', '0.16', '0.14']
for version in versions:
testlib = 'tracker-sparql-' + version
- if conf.check_cfg(package=testlib,
+ if conf.CHECK_CFG(package=testlib,
args='--cflags --libs',
mandatory=False):
conf.SET_TARGET_TYPE(testlib, 'SYSLIB')
diff --git a/source4/torture/smb2/rename.c b/source4/torture/smb2/rename.c
old mode 100644
new mode 100755
index 07bdabd..23fe4f9
--- a/source4/torture/smb2/rename.c
+++ b/source4/torture/smb2/rename.c
@@ -1403,7 +1403,7 @@ struct torture_suite *torture_smb2_rename_init(void)
torture_suite_add_1smb2_test(suite, "simple",
torture_smb2_rename_simple);
- torture_suite_add_1smb2_test(suite, "simple_nodelete)",
+ torture_suite_add_1smb2_test(suite, "simple_nodelete",
torture_smb2_rename_simple2);
torture_suite_add_1smb2_test(suite, "no_sharing",
--
Samba Shared Repository
