summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-07 21:30:02 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-08 11:23:23 +0200
commit27e169e17efd7150cc9479face9989586a65c70f (patch)
tree9882b1923efc83414fc68fa77cbfe200058d22ad
parent3ab3159f757cd9849ea77c2938c340564fd1b018 (diff)
downloadsamba-27e169e17efd7150cc9479face9989586a65c70f.tar.gz
samba-27e169e17efd7150cc9479face9989586a65c70f.tar.bz2
samba-27e169e17efd7150cc9479face9989586a65c70f.zip
s4-param Also check the p_class matches when comparing offset
-rw-r--r--source4/param/loadparm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 0a71d02771..41fee6fde9 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -3090,7 +3090,9 @@ struct parm_struct *lpcfg_next_parameter(struct loadparm_context *lp_ctx, int sn
if ((*i) > 0
&& (parm_table[*i].offset ==
- parm_table[(*i) - 1].offset))
+ parm_table[(*i) - 1].offset)
+ && (parm_table[*i].p_class ==
+ parm_table[(*i) - 1].p_class))
continue;
return &parm_table[(*i)++];