From fac5288ad80b7ca2f23d1d5acf6ced98a61fd8eb Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Jozsef Kadlecsik/emailAddress=kadlec@blackhole.kfki.hu" Date: Tue, 21 Oct 2008 22:04:47 +0000 Subject: - macipmap type reported misleading deprecated separator tokens and printed the old one at listing set elements. Token printing was errorneous too. (Bugs reported by Krzysztof Oledzki) - Warn only once about deprecated separator tokens in restore mode. --- ipset_ipportnethash.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ipset_ipportnethash.c') diff --git a/ipset_ipportnethash.c b/ipset_ipportnethash.c index 51297ff..4707189 100644 --- a/ipset_ipportnethash.c +++ b/ipset_ipportnethash.c @@ -199,10 +199,9 @@ adt_parser(unsigned cmd, const char *optarg, void *data) DP("ipportnethash: %p %p", optarg, data); - if ((ptr = strchr(tmp, ':')) || (ptr = strchr(tmp, '%'))) - fprintf(stderr, "Warning: please replace old separator character '%s.1' with ','.\n" - "Next release won't support it.\n", - ptr); + if (((ptr = strchr(tmp, ':')) || (ptr = strchr(tmp, '%'))) && ++warn_once == 1) + fprintf(stderr, "Warning: please use ',' separator token between ip,port,net.\n" + "Next release won't support old separator tokens.\n"); ptr = strsep(&tmp, ":%,"); parse_ip(ptr, &mydata->ip); -- cgit v1.2.3