diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /gpe-shield/gpe-shield-0.6/backend-iptables.patch | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gpe-shield/gpe-shield-0.6/backend-iptables.patch')
-rw-r--r-- | gpe-shield/gpe-shield-0.6/backend-iptables.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/gpe-shield/gpe-shield-0.6/backend-iptables.patch b/gpe-shield/gpe-shield-0.6/backend-iptables.patch index e69de29bb2..5c306be02f 100644 --- a/gpe-shield/gpe-shield-0.6/backend-iptables.patch +++ b/gpe-shield/gpe-shield-0.6/backend-iptables.patch @@ -0,0 +1,71 @@ +Index: backend.c +=================================================================== +RCS file: /cvs/gpe/base/gpe-shield/backend.c,v +retrieving revision 1.8 +diff -u -r1.8 backend.c +--- backend.c 21 Jun 2004 08:54:53 -0000 1.8 ++++ backend.c 16 Aug 2004 12:17:54 -0000 +@@ -41,6 +41,7 @@ + #define IPTABLES_CMD1 "/usr/sbin/iptables" + #define IPTABLES_CMD2 "/sbin/iptables" + #define IPTABLES_CMD3 "/usr/local/sbin/iptables" ++#define IPTABLES_CMD4 "/usr/bin/iptables" + + static const char* IPTABLES_CMD = NULL; + +@@ -144,13 +145,17 @@ + void + do_clear(void) + { +- char* cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush"); ++ char* cmd; ++ ++ cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush"); + system(cmd); ++ + g_free(cmd); + cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"-P INPUT ACCEPT"); /* reset input policy */ + system(cmd); + g_free(cmd); + g_free(rule_info); ++ + rule_info = NULL; + rule_count = 0; + } +@@ -387,6 +392,7 @@ + + pfd[0].fd = sock; + pfd[0].events = (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI); ++ + while (poll (pfd, 1, -1) > 0) + { + if ((pfd[0].revents & POLLERR) || (pfd[0].revents & POLLHUP)) +@@ -497,7 +503,8 @@ + IPTABLES_CMD = IPTABLES_CMD2; + else if (!access(IPTABLES_CMD3,X_OK)) + IPTABLES_CMD = IPTABLES_CMD3; +- ++ else if (!access(IPTABLES_CMD4,X_OK)) ++ IPTABLES_CMD = IPTABLES_CMD4; + } + + /* app mainloop */ +@@ -505,8 +512,16 @@ + int + suidloop (int csock) + { +- find_iptables(); +- ++ find_iptables(); ++ ++ if (IPTABLES_CMD == NULL) ++ { ++ fprintf(stderr, "Iptables not found, exiting.\n"); ++ close (sock); ++ unlink (PK_SOCKET); ++ exit (2); ++ } ++ + sock = csock; + + while (wait_message ()) ; |