diff options
Diffstat (limited to 'lib/param/loadparm.c')
-rw-r--r-- | lib/param/loadparm.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 4751a06198..38140877e7 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1355,13 +1355,19 @@ static bool set_variable(TALLOC_CTX *mem_ctx, int parmnum, void *parm_ptr, char **new_list = str_list_make(mem_ctx, pszParmValue, NULL); for (i=0; new_list[i]; i++) { - if (new_list[i][0] == '+' && new_list[i][1]) { + if (*(const char ***)parm_ptr != NULL && + new_list[i][0] == '+' && + new_list[i][1]) + { if (!str_list_check(*(const char ***)parm_ptr, &new_list[i][1])) { *(const char ***)parm_ptr = str_list_add(*(const char ***)parm_ptr, &new_list[i][1]); } - } else if (new_list[i][0] == '-' && new_list[i][1]) { + } else if (*(const char ***)parm_ptr != NULL && + new_list[i][0] == '-' && + new_list[i][1]) + { str_list_remove(*(const char ***)parm_ptr, &new_list[i][1]); } else { |