[PATCH 11/37] param: finish the set_param_helper lineup by rearranging case order

abartlet at samba.org abartlet at samba.org
Fri Jun 20 05:47:33 MDT 2014


From: Garming Sam <garming at catalyst.net.nz>

Attempting to make the code match exactly before moving it over.

Change-Id: If05fccd11d245176b5793e59d1b92317b25fd2c8
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
 source3/param/loadparm.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 22c7e48..b3996a2 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2699,6 +2699,13 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 			return false;
 		}
 
+		case P_CMDLIST:
+			TALLOC_FREE(*(char ***)parm_ptr);
+			*(const char * const **)parm_ptr
+				= (const char * const *)str_list_make_v3(mem_ctx,
+									 pszParmValue, NULL);
+			break;
+
 		case P_LIST:
 		{
 			char **new_list = str_list_make_v3(mem_ctx,
@@ -2735,12 +2742,6 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
 			}
 			break;
 		}
-		case P_CMDLIST:
-			TALLOC_FREE(*(char ***)parm_ptr);
-			*(const char * const **)parm_ptr
-				= (const char * const *)str_list_make_v3(mem_ctx,
-									 pszParmValue, NULL);
-			break;
 
 		case P_STRING:
 			lpcfg_string_set(mem_ctx, (char **)parm_ptr, pszParmValue);
-- 
1.9.3



More information about the samba-technical mailing list