X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=875a141cc44fa2e2efb51ca8f3da673d77a5b1d6;hp=aca98d59657d037b8789769a0e18244c757c7405;hb=6039c7f4b0052c4da21520cdd604f04a5a67f50d;hpb=be8ead27f625b3e4ed383f270dcfee2d158231ec

diff --git a/utils.c b/utils.c
index aca98d5..875a141 100644
--- a/utils.c
+++ b/utils.c
@@ -463,11 +463,6 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
 	uci_set(ctx, &ptr);
 
 	ptr.o      = NULL;
-	ptr.option = "conntrack";
-	ptr.value  = z->conntrack ? "1" : "0";
-	uci_set(ctx, &ptr);
-
-	ptr.o      = NULL;
 	ptr.option = "mtu_fix";
 	ptr.value  = z->mtu_fix ? "1" : "0";
 	uci_set(ctx, &ptr);
@@ -490,18 +485,21 @@ write_zone_uci(struct uci_context *ctx, struct fw3_zone *z,
 
 	fw3_foreach(dev, &z->devices)
 	{
+		char *ep;
+
 		if (!dev)
 			continue;
 
 		p = buf;
+		ep = buf + sizeof(buf);
 
 		if (dev->invert)
-			p += sprintf(p, "!");
+			p += snprintf(p, ep - p, "!");
 
 		if (*dev->network)
-			p += sprintf(p, "%s@%s", dev->name, dev->network);
+			p += snprintf(p, ep - p, "%s@%s", dev->name, dev->network);
 		else
-			p += sprintf(p, "%s", dev->name);
+			p += snprintf(p, ep - p, "%s", dev->name);
 
 		ptr.value = buf;
 		uci_add_list(ctx, &ptr);