From de81984b5e9a7ac77a275722f45c827afa54cb17 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 21 Jun 2007 23:11:21 +0000 Subject: r23579: Up to now, the "allparameters" argument to lp_next_parameter was not effective for the global section (snum < 0). This checkin makes it effective for the global section, too. This does not produce changes in the results of the present calls of lp_next_parameter: Beside the new use in utils/net_conf.c (which is hereby fixed), the only calls of lp_next_parameter are in web/swat.c, where it is effectively always called with allparameters == 1. Michael (This used to be commit 56f82485ec3b14ddcbcf7f5823926a94b17683f3) --- source3/param/loadparm.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/param/loadparm.c') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ed77cfda43..a04c0f2fbd 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4308,6 +4308,9 @@ struct parm_struct *lp_next_parameter(int snum, int *i, int allparameters) && (parm_table[*i].ptr == parm_table[(*i) - 1].ptr)) continue; + + if (is_default(*i) && !allparameters) + continue; return &parm_table[(*i)++]; } -- cgit