[package] update snort to 2.8.4.1 (#3653)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@16820 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,27 +1,34 @@
|
||||
--- snort-2.3.2-orig/src/snort.c 2005-01-13 21:36:20.000000000 +0100
|
||||
+++ snort-2.3.2-1/src/snort.c 2005-04-04 20:03:34.000000000 +0200
|
||||
@@ -1949,7 +1949,7 @@
|
||||
--- a/src/snort.c
|
||||
+++ b/src/snort.c
|
||||
@@ -4140,7 +4140,7 @@
|
||||
{
|
||||
struct stat st;
|
||||
int i;
|
||||
- char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
|
||||
+ char *conf_files[]={"/etc/snort/snort.conf", NULL};
|
||||
char *fname = NULL;
|
||||
char *home_dir = NULL;
|
||||
char *rval = NULL;
|
||||
@@ -1970,23 +1970,6 @@
|
||||
|
||||
@@ -4159,30 +4159,6 @@
|
||||
i++;
|
||||
}
|
||||
|
||||
- /* search for .snortrc in the HOMEDIR */
|
||||
- if(!rval)
|
||||
- {
|
||||
- if((home_dir = getenv("HOME")))
|
||||
- char *home_dir = NULL;
|
||||
-
|
||||
- if((home_dir = getenv("HOME")) != NULL)
|
||||
- {
|
||||
- char *snortrc = "/.snortrc";
|
||||
- int path_len;
|
||||
-
|
||||
- path_len = strlen(home_dir) + strlen(snortrc) + 1;
|
||||
-
|
||||
- /* create the full path */
|
||||
- fname = (char *)malloc(strlen(home_dir) + strlen("/.snortrc") + 1);
|
||||
- if(!fname)
|
||||
- FatalError("Out of memory searching for config file\n");
|
||||
- fname = (char *)SnortAlloc(path_len);
|
||||
-
|
||||
- SnortSnprintf(fname, path_len, "%s%s", home_dir, snortrc);
|
||||
-
|
||||
- if(stat(fname, &st) != -1)
|
||||
- rval = fname;
|
||||
|
Reference in New Issue
Block a user