From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 24 May 2011 07:34:36 +0000 (+0200)
Subject: Accept "\r\n" terminated COMMIT command in restore files
X-Git-Tag: v6.6~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6bce7d2ea2839849bf3d3731ec713a8b41959734;p=ipset

Accept "\r\n" terminated COMMIT command in restore files
---

diff --git a/src/ipset.c b/src/ipset.c
index 1f2dbcc..a647160 100644
--- a/src/ipset.c
+++ b/src/ipset.c
@@ -184,7 +184,7 @@ restore(char *argv0)
 			c++;
 		if (c[0] == '\0' || c[0] == '#')
 			continue;
-		else if (strcmp(c, "COMMIT\n") == 0) {
+		else if (STREQ(c, "COMMIT\n") || STREQ(c, "COMMIT\r\n")) {
 			ret = ipset_commit(session);
 			if (ret < 0)
 				handle_error();