X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=defaults.c;h=127f7506782c29b16dfd354db5a823dc87da25f4;hp=ec95ec918e7e116bfdf0e5338690e5c06795d1bc;hb=95cc95c7fec2d68fa8e27cc8e8e4b8dbacababf8;hpb=d7988a8aaedbf22cf1d34268615034e3082613ce

diff --git a/defaults.c b/defaults.c
index ec95ec9..127f750 100644
--- a/defaults.c
+++ b/defaults.c
@@ -220,7 +220,7 @@ fw3_print_default_head_rules(struct fw3_ipt_handle *handle,
 
 		r = fw3_ipt_rule_new(handle);
 		fw3_ipt_rule_target(r, tr->target);
-		fw3_ipt_rule_append(r, tr->chain);
+		fw3_ipt_rule_replace(r, tr->chain);
 	}
 
 	switch (handle->table)
@@ -419,7 +419,13 @@ fw3_flush_rules(struct fw3_ipt_handle *handle, struct fw3_state *state,
 		if (c->flag && !has(defs->flags, handle->family, c->flag))
 			continue;
 
-		fw3_ipt_delete_rules(handle, c->format);
+		fw3_ipt_flush_chain(handle, c->format);
+
+		/* keep certain basic chains that do not depend on any settings to
+		   avoid purging unrelated user rules pointing to them */
+		if (reload && !c->flag)
+			continue;
+
 		fw3_ipt_delete_chain(handle, c->format);
 	}