From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 19 Feb 2013 21:36:31 +0000 (+0100)
Subject: do not save state when printing rules
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d73c2b436cc16d49ce706920802604150781dc9;p=oweals%2Ffirewall3.git

do not save state when printing rules
---

diff --git a/main.c b/main.c
index d94d0e9..3ef7243 100644
--- a/main.c
+++ b/main.c
@@ -261,7 +261,7 @@ start(struct fw3_state *state, bool restart)
 		if (!family_loaded(state, family) || !restore_pipe(family, false))
 			continue;
 
-		if (!restart && family_running(statefile, family))
+		if (!print_rules && !restart && family_running(statefile, family))
 		{
 			warn("The %s firewall appears to be started already. "
 			     "If it is indeed empty, remove the %s file and retry.",
@@ -299,7 +299,7 @@ start(struct fw3_state *state, bool restart)
 
 	fw3_free_statefile(statefile);
 
-	if (!rv)
+	if (!rv && !print_rules)
 		fw3_write_statefile(state);
 
 	return rv;
@@ -406,6 +406,9 @@ int main(int argc, char **argv)
 
 	if (!strcmp(argv[optind], "print"))
 	{
+		if (use_family == FW3_FAMILY_ANY)
+			use_family = FW3_FAMILY_V4;
+
 		freopen("/dev/null", "w", stderr);
 
 		state->disable_ipsets = true;