summaryrefslogtreecommitdiff
path: root/net/snort/patches/patch-aa
blob: 1ed1483a7a5ce14841c15caf1530fa962394058e (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
$NetBSD: patch-aa,v 1.11 2004/01/31 20:43:41 kristerw Exp $

--- src/snort.c.orig	Wed Dec  3 16:22:22 2003
+++ src/snort.c	Sat Jan 31 21:25:32 2004
@@ -1391,6 +1391,18 @@
 
             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)
             {
@@ -1780,7 +1792,7 @@
 {
     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 *home_dir = NULL;
     char *rval = NULL;