From f65b2fb8b654fa0d5369a11a980b01bdc6aeed56 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 26 May 2008 17:35:47 +0200
Subject: [PATCH] iptstate wrapper for connections.cgi

---
 config/rootfiles/common/misc-progs |  1 +
 doc/packages-list.txt              |  2 --
 html/cgi-bin/connections.cgi       |  2 +-
 src/misc-progs/Makefile            |  2 +-
 src/misc-progs/getiptstate.c       | 24 ++++++++++++++++++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 src/misc-progs/getiptstate.c

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 6d66c248a..beadf06af 100644
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -5,6 +5,7 @@ usr/local/bin/backupctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/extrahdctrl
 usr/local/bin/getipstat
+usr/local/bin/getiptstate
 #usr/local/bin/iowrap
 usr/local/bin/ipfirereboot
 usr/local/bin/ipsecctrl
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 437cbc425..8f7758824 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -59,7 +59,6 @@
 * centerim-4.22.1
 * clamav-0.93
 * cmake-2.4.8
-* collectd-4.3.0
 * collectd-4.4.0
 * coreutils-5.96
 * cpio-2.6
@@ -242,7 +241,6 @@
 * rrdtool-1.2.15
 * rsync-2.6.9
 * rtorrent-0.7.9
-* samba-3.0.28a
 * samba-3.0.29
 * sane-1.0.19
 * sane-1.0.19-kmod
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index fd95f239b..9cf4f6852 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -44,7 +44,7 @@ undef (@dummy);
 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
-open (ACTIVE, 'iptstate -1rbt |') or die 'Unable to open ip_conntrack';
+open (ACTIVE, '/usr/local/bin/getiptstate |') or die 'Unable to open ip_conntrack';
 my @active = <ACTIVE>;
 close (ACTIVE);
 
diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index 9530a2540..0691d2fa7 100644
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -29,7 +29,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \
 	ipsecctrl timectrl dhcpctrl snortctrl \
 	applejuicectrl rebuildhosts backupctrl \
 	logwatch openvpnctrl outgoingfwctrl \
-	wirelessctrl getipstat qosctrl launch-ether-wake \
+	wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \
 	redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \
 	smartctrl clamavctrl addonctrl pakfire mpfirectrl
 
diff --git a/src/misc-progs/getiptstate.c b/src/misc-progs/getiptstate.c
new file mode 100644
index 000000000..338b531f8
--- /dev/null
+++ b/src/misc-progs/getiptstate.c
@@ -0,0 +1,24 @@
+/* IPFire helper program - IPStat
+ *
+ * Get the list from IPTABLES -L
+ * 
+ */
+         
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include "setuid.h"
+
+
+int main(void)
+{
+	if (!(initsetuid()))
+		exit(1);
+	
+	safe_system("/usr/sbin/iptstate -1rbt");
+	return 0;
+}
+