b8f0ec33c9
Upstream NEWS is weak; release notes for 2.8.5.1 follow.
[*] Improvements
* Fixed syslog output when running on Windows.
* Fixed potential segfault when printing IPv6 packets using the -v option.
Thanks to Laurent Gaffie for reporting this issue.
* Fixed segfault when additional policies were added during a configuration
reload.
33 lines
1,001 B
Text
33 lines
1,001 B
Text
$NetBSD: patch-aa,v 1.17 2011/04/01 16:48:36 gdt Exp $
|
|
|
|
--- src/snort.c.orig 2009-10-19 17:44:03.000000000 +0000
|
|
+++ src/snort.c
|
|
@@ -2737,6 +2737,19 @@ static int SetPktProcessor(void)
|
|
break;
|
|
#endif // NO_NON_ETHER_DECODER
|
|
|
|
+#if defined(__NetBSD__)
|
|
+# if defined(__NetBSD_Version__)
|
|
+# if (__NetBSD_Version__ >= 105000000)
|
|
+ case DLT_PPP_ETHER: /* PPP over Ethernet */
|
|
+
|
|
+# else
|
|
+ /* no DLT_PPP_* on <1.5 */
|
|
+# endif /* >= NetBSD 1.5 */
|
|
+# else
|
|
+ /* no __NetBSD_Version__ on <1.4 */
|
|
+# endif /* __NetBSD_Version__ */
|
|
+#endif /* NetBSD */
|
|
+
|
|
case DLT_PPP: /* point-to-point protocol */
|
|
if (!ScReadMode())
|
|
{
|
|
@@ -3379,7 +3392,7 @@ static char *ConfigFileSearch(void)
|
|
{
|
|
struct stat st;
|
|
int i;
|
|
- char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
|
|
+ char *conf_files[]={"@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL};
|
|
char *fname = NULL;
|
|
char *rval = NULL;
|
|
|