blob: eaf713ae8241ed244d8ee2352b09547d16dc8d33 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
$NetBSD: patch-aa,v 1.15 2007/08/20 20:28:18 adrianp Exp $
--- src/snort.c.orig 2007-07-26 21:07:18.000000000 +0100
+++ src/snort.c
@@ -150,7 +150,6 @@ extern OutputFuncNode *LogList;
long start_time; /* tracks how many seconds snort actually ran */
#endif
-extern int errno;
/* exported variables *********************************************************/
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 */
+
+# 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(!pv.readmode_flag)
{
@@ -3210,7 +3220,7 @@ static char *ConfigFileSearch()
{
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;
|
