diff options
Diffstat (limited to 'net/snort/patches/patch-aa')
| -rw-r--r-- | net/snort/patches/patch-aa | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa index e4d7136db1b..eaf713ae824 100644 --- a/net/snort/patches/patch-aa +++ b/net/snort/patches/patch-aa @@ -1,35 +1,36 @@ -$NetBSD: patch-aa,v 1.14 2007/05/18 22:20:10 adrianp Exp $ +$NetBSD: patch-aa,v 1.15 2007/08/20 20:28:18 adrianp Exp $ ---- src/snort.c.orig 2007-03-15 18:58:28.000000000 +0000 +--- src/snort.c.orig 2007-07-26 21:07:18.000000000 +0100 +++ src/snort.c -@@ -148,7 +148,6 @@ extern OutputFuncNode *LogList; +@@ -150,7 +150,6 @@ extern OutputFuncNode *LogList; long start_time; /* tracks how many seconds snort actually ran */ #endif -extern int errno; - /*extern char *malloc_options;*/ /* exported variables *********************************************************/ -@@ -2590,6 +2589,18 @@ int SetPktProcessor() + u_int8_t runMode = 0; /* snort run mode */ +@@ -2656,7 +2655,18 @@ int SetPktProcessor(void) + grinder = DecodeSlipPkt; break; - +- +#if defined(__NetBSD__) +# if defined(__NetBSD_Version__) +# if (__NetBSD_Version__ >= 105000000) -+ case DLT_PPP_ETHER: /* PPP over Ethernet */ ++ case DLT_PPP_ETHER: /* PPP over Ethernet */ + +# else -+ /* no DLT_PPP_* on <1.5 */ ++ /* no DLT_PPP_* on <1.5 */ +# endif /* >= NetBSD 1.5 */ +# else -+ /* no __NetBSD_Version__ on <1.4 */ ++ /* no __NetBSD_Version__ on <1.4 */ +# endif /* __NetBSD_Version__ */ +#endif /* NetBSD */ case DLT_PPP: /* point-to-point protocol */ if(!pv.readmode_flag) { -@@ -3116,7 +3127,7 @@ static char *ConfigFileSearch() +@@ -3210,7 +3220,7 @@ static char *ConfigFileSearch() { struct stat st; int i; |