]> granicus.if.org Git - ipset/commitdiff
Ignore -n flag (list just setnames) when sets are to be saved
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 6 May 2011 20:05:10 +0000 (22:05 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Fri, 6 May 2011 20:05:10 +0000 (22:05 +0200)
lib/session.c

index c55c3114d7d760190f0603aaeccf08a9563ef231..59405d482b333307552f939d258fc2ea757a3a90 100644 (file)
@@ -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));