iptables.spec

[blaass]

Update do ipt_conntrack i ipt_ttl.


--
Maciej "blaass" Bry³ka 
-------------- next part --------------
--- iptables.spec.org	2004-08-05 20:31:36.000000000 +0000
+++ iptables.spec	2004-09-06 19:53:48.000000000 +0000
@@ -39,6 +39,8 @@
 Patch2:		%{name}-1.2.9-ipt_imq.patch
 Patch3:		%{name}-libipt_time.patch
 Patch4:		%{name}-debug.patch
+Patch5:		%{name}-libipt_ttl.patch
+Patch6:		%{name}-libipt_conntrack.patch
 URL:		http://www.netfilter.org/
 Vendor:		Netfilter mailing list <netfilter at lists.samba.org>
 %if %{with doc}
@@ -128,6 +130,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
 
 # removed broken ...
 #%rm -f extensions/.set-test
-------------- next part --------------
--- libipt_conntrack.c.org	2004-05-26 15:55:43.000000000 +0000
+++ libipt_conntrack.c	2004-09-06 19:49:59.000000000 +0000
@@ -492,7 +492,7 @@
 
 	if(sinfo->flags & IPT_CONNTRACK_STATUS) {
 		printf("%sctstatus ", optpfx);
-        	if (sinfo->invflags & IPT_CONNTRACK_STATE)
+        	if (sinfo->invflags & IPT_CONNTRACK_STATUS)
                 	printf("! ");
 		print_status(sinfo->statusmask);
 	}
-------------- next part --------------
--- ./extensions/libipt_ttl.c.org	2002-05-29 13:08:16.000000000 +0000
+++ ./extensions/libipt_ttl.c	2004-09-06 19:38:32.000000000 +0000
@@ -1,7 +1,7 @@
 /* Shared library add-on to iptables to add TTL matching support 
  * (C) 2000 by Harald Welte <laforge at gnumonks.org>
  *
- * $Id: libipt_ttl.c,v 1.6 2002/05/29 13:08:16 laforge Exp $
+ * $Id: libipt_ttl.c,v 1.7 2004/08/23 20:45:17 kaber Exp $
  *
  * This program is released under the terms of GNU GPL */
 
@@ -40,10 +40,6 @@
 	check_inverse(optarg, &invert, &optind, 0);
 	value = atoi(argv[optind-1]);
 
-	if (*flags) 
-		exit_error(PARAMETER_PROBLEM, 
-				"Can't specify TTL option twice");
-
 	if (!optarg)
 		exit_error(PARAMETER_PROBLEM,
 				"ttl: You must specify a value");
@@ -56,8 +52,6 @@
 
 			/* is 0 allowed? */
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		case '3':
 			if (invert) 
@@ -66,8 +60,6 @@
 
 			info->mode = IPT_TTL_LT;
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		case '4':
 			if (invert)
@@ -76,14 +68,17 @@
 
 			info->mode = IPT_TTL_GT;
 			info->ttl = value;
-			*flags = 1;
-
 			break;
 		default:
 			return 0;
 
 	}
 
+	if (*flags) 
+		exit_error(PARAMETER_PROBLEM, 
+				"Can't specify TTL option twice");
+	*flags = 1;
+
 	return 1;
 }