From b2ce4e75496dca9cc51dd858b569ee2b7e80eed2 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Wed, 26 Feb 2014 12:06:03 +1300 Subject: [PATCH] lib/param: change set_variable to be more consistent with s3 loadparm Correctly frees CMDLIST memory and uses lp_int instead of atoi. Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index e2da7c92d2f..33960da2a7b 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1441,7 +1441,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, break; case P_INTEGER: - *(int *)parm_ptr = atoi(pszParmValue); + *(int *)parm_ptr = lp_int(pszParmValue); break; case P_CHAR: @@ -1468,6 +1468,7 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, } case P_CMDLIST: + TALLOC_FREE(*(char ***)parm_ptr); *(const char * const **)parm_ptr = (const char * const *)str_list_make(mem_ctx, pszParmValue, NULL); -- 2.11.4.GIT