git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ab3159
)
s4-param Also check the p_class matches when comparing offset
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 7 Jul 2011 11:30:02 +0000
(21:30 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Fri, 8 Jul 2011 09:23:23 +0000
(11:23 +0200)
source4/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source4/param/loadparm.c
b/source4/param/loadparm.c
index 0a71d027710e4d2a53418943684c0aebcdc11a6a..41fee6fde945636ec49a1faae318cbeb66835fa4 100644
(file)
--- 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)++];