diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
| commit | 2243479b7415942604284028cd34a20aa0ba79c0 (patch) | |
| tree | 9d13b463baaccdcab307943f6896592f8385a677 /source3/param/loadparm.c | |
| parent | 6a89b59ca6187ef6e06124c2aa729be18b43bb75 (diff) | |
| parent | 4f9b6fdce4340a1022f659daaa035d0336ff6b53 (diff) | |
| download | samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.gz samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.bz2 samba-2243479b7415942604284028cd34a20aa0ba79c0.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3401bd16a0..d91d34d29b 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -7423,7 +7423,7 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2) return (*((char *)ptr1) == *((char *)ptr2)); case P_LIST: - return str_list_compare(*(char ***)ptr1, *(char ***)ptr2); + return str_list_equal(*(const char ***)ptr1, *(const char ***)ptr2); case P_STRING: case P_USTRING: @@ -7512,8 +7512,8 @@ static bool is_default(int i) return False; switch (parm_table[i].type) { case P_LIST: - return str_list_compare (parm_table[i].def.lvalue, - *(char ***)parm_table[i].ptr); + return str_list_equal((const char **)parm_table[i].def.lvalue, + *(const char ***)parm_table[i].ptr); case P_STRING: case P_USTRING: return strequal(parm_table[i].def.svalue, |