From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 6 May 2011 20:05:10 +0000 (+0200)
Subject: Ignore -n flag (list just setnames) when sets are to be saved
X-Git-Tag: v6.5~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896447190b8ced40819cb91250db00bc38423bbf;p=thirdparty%2Fipset.git

Ignore -n flag (list just setnames) when sets are to be saved
---

diff --git a/lib/session.c b/lib/session.c
index c55c3114..59405d48 100644
--- a/lib/session.c
+++ b/lib/session.c
@@ -952,7 +952,8 @@ callback_list(struct ipset_session *session, struct nlattr *nla[],
 
 	ATTR2DATA(session, nla, IPSET_ATTR_SETNAME, cmd_attrs);
 	D("setname %s", ipset_data_setname(data));
-	if (session->envopts & IPSET_ENV_LIST_SETNAME) {
+	if (session->envopts & IPSET_ENV_LIST_SETNAME &&
+	    session->mode != IPSET_LIST_SAVE) {
 		if (session->mode == IPSET_LIST_XML)
 			safe_snprintf(session, "<ipset name=\"%s\"/>\n",
 				      ipset_data_setname(data));