[SCM] Samba Shared Repository - branch master updated

Garming Sam garming at samba.org
Thu Nov 27 23:55:04 MST 2014


The branch, master has been updated
       via  907094c param: fix testparm to show hidden share defaults
      from  f9acb94 messaging4: Fix types

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 907094c7fa73aaf2e9dda184ea4f0c1a606300bc
Author: Garming Sam <garming at catalyst.net.nz>
Date:   Fri Nov 28 10:03:29 2014 +1300

    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 at catalyst.net.nz>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Fri Nov 28 07:54:54 CET 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/param/loadparm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 7df4608..bfa9c7b 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2073,10 +2073,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;
 					}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list