Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #7 from regit/master

Small fixes from Suricata team.
  • Loading branch information...
commit deb8603a4d275f6a3189391a7d4531cc7b1da29f 2 parents 405761e + beb7445
Ian Firns authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 etc/Makefile.am
  2. +1 −1  src/output-plugins/spo_sguil.c
5 etc/Makefile.am
View
@@ -1,6 +1,7 @@
## $Id$
AUTOMAKE_OPTIONS=foreign no-dependencies
-sysconf_DATA = barnyard2.conf
-
EXTRA_DIST = barnyard2.conf
+
+install-data-am:
+ test -e $(sysconfdir)/barnyard2.conf || install -m 600 $(top_srcdir)/etc/barnyard2.conf $(sysconfdir)
2  src/output-plugins/spo_sguil.c
View
@@ -237,7 +237,7 @@ void Sguil(Packet *p, void *event, uint32_t event_type, void *arg)
return;
}
- if ( p->ip6h != NULL )
+ if ( (p != NULL) && (p->ip6h != NULL) )
{
return;
}
Please sign in to comment.
Something went wrong with that request. Please try again.