summaryrefslogtreecommitdiff
path: root/net/snort/patches/patch-aa
blob: 93826cf886f2dc9435d012b641cc1848726423f9 (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.16 2007/10/21 00:22:53 adrianp Exp $

--- src/snort.c.orig	2007-09-07 19:01:56.000000000 +0100
+++ src/snort.c
@@ -158,7 +158,6 @@ extern OutputFuncNode *LogList;
 time_t start_time;    /* tracks how many seconds snort actually ran */
 #endif
 
-extern int errno;
 
 /* exported variables *********************************************************/
 u_int8_t runMode = 0;   /* snort run mode */
@@ -3194,6 +3193,19 @@ int SetPktProcessor(void)
 
             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)
             {
@@ -3743,7 +3755,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;