From c78853b8de4a249cc097bba435e97f67c5530b89 Mon Sep 17 00:00:00 2001 From: Kris Kennaway Date: Sun, 16 Mar 2003 00:31:55 +0000 Subject: Add a patch to fix runtime problems when snort is built with -DWITH_MYSQL Submitted by: Mike Harding Obtained from: snort CVS --- security/snort/files/patch-snort.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/security/snort/files/patch-snort.c b/security/snort/files/patch-snort.c index 0cf8de8354d4..a563db650a4e 100644 --- a/security/snort/files/patch-snort.c +++ b/security/snort/files/patch-snort.c @@ -1,11 +1,36 @@ ---- src/snort.c.orig Sun Oct 6 02:14:32 2002 -+++ src/snort.c Sun Oct 6 02:14:18 2002 -@@ -2193,7 +2193,7 @@ +--- src/snort.c.orig Fri Mar 14 19:58:33 2003 ++++ src/snort.c Fri Mar 14 19:58:19 2003 +@@ -1,4 +1,4 @@ +-/* $Id: snort.c,v 1.157.2.7 2003/02/19 21:16:50 chris_reid Exp $ */ ++/* $Id: snort.c,v 1.157.2.9 2003/03/04 20:47:15 andrewbaker Exp $ */ + /* + ** Copyright (C) 1998-2002 Martin Roesch + ** +@@ -252,6 +252,8 @@ + OpenPcap(pv.readfile, 0); + } + ++ InitOutputPlugins(); ++ + /* didn't get any conf data at the command line, try to find the default + * conf file + */ +@@ -310,9 +312,6 @@ + GoDaemon(); + } + +- /* initialize these here so we do not print unwanted messages */ +- InitOutputPlugins(); +- + /* + * creating a PID file before setting its proper + * path (in SanityChecks()) is not a good idea +@@ -2212,7 +2211,7 @@ struct stat st; int found; int i; - char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL}; -+ char *conf_files[]={"%%PREFIX%%/etc/snort.conf", "./snort.conf", NULL}; ++ char *conf_files[]={"/usr/local/etc/snort.conf", "./snort.conf", NULL}; char *fname = NULL; char *home_dir; char *tmp; -- cgit v1.2.3