Attachment 10470 Details for Bug 10864 – Cherry picked fix from master

[patch] Cherry picked fix from master

0001-param-fix-testparm-to-show-hidden-share-defaults.patch (text/plain), 1.28 KB, created by Garming Sam on 2014-12-01 03:47:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2014-12-01 03:47:19 UTC

Size: 1.28 KB

patch

obsolete

>From d71d7f80a2513ae64a09222d983a1e656036dc74 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Fri, 28 Nov 2014 10:03:29 +1300
>Subject: [PATCH] param: fix testparm to show hidden share defaults
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10864
>Change-Id: I16710f70a3cbaeadf7adf139441dd2b017ef81ee
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): Garming Sam <garming@samba.org>
>Autobuild-Date(master): Fri Nov 28 07:54:54 CET 2014 on sn-devel-104
>
>(cherry picked from commit 907094c7fa73aaf2e9dda184ea4f0c1a606300bc)
>---
> lib/param/loadparm.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
>index 9953053..56c6796 100644
>--- a/lib/param/loadparm.c
>+++ b/lib/param/loadparm.c
>@@ -2077,10 +2077,11 @@ void lpcfg_dump_a_service(struct loadparm_service * pService, struct loadparm_se
> 		    (i == 0 || (parm_table[i].offset != parm_table[i - 1].offset)))
> 		{
> 			if (pService == sDefault) {
>-				if (flags && (flags[i] & FLAG_DEFAULT)) {
>-					continue;
>-				}
> 				if (!show_defaults) {
>+					if (flags && (flags[i] & FLAG_DEFAULT)) {
>+						continue;
>+					}
>+
> 					if (is_default(sDefault, i)) {
> 						continue;
> 					}
>-- 
>1.9.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 10864: 10470