[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  af7cc9d s3:param/loadparm fix testparm --show-all-parameters
      from  b1e718f nsswitch: Simplify winbind_named_pipe_sock()

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


- Log -----------------------------------------------------------------
commit af7cc9d1b41c4007cd5d3f3d95babe9c318ae717
Author: Christian Ambach <ambi at samba.org>
Date:   Mon Jun 8 23:48:54 2015 +0200

    s3:param/loadparm fix testparm --show-all-parameters
    
    it didn't know about the new types of config parameters
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=11170
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Tue Jun  9 11:49:18 CEST 2015 on sn-devel-104

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

Summary of changes:
 source3/param/loadparm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6f8e145..cedaf1a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1713,7 +1713,7 @@ static void show_parameter(int parmIndex)
 	bool inverse;
 	const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
 		"P_OCTAL", "P_LIST", "P_STRING", "P_USTRING",
-		"P_ENUM" };
+		"P_ENUM", "P_BYTES", "P_CMDLIST" };
 	unsigned flags[] = { FLAG_DEPRECATED, FLAG_SYNONYM };
 	const char *flag_names[] = { "FLAG_DEPRECATED", "FLAG_SYNONYM", NULL};
 


-- 
Samba Shared Repository