adding heloserver name to the options for email
fixing up the helo stuff
merging changes
Merge branch 'fixed-ehlo-name-sendmail-213' of http://github.com/jrossi/ossec-hids into fixed-ehlo-name-sendmail-213
Merge pull request #214 from jrossi/fixed-ehlo-name-sendmail-213

adding heloserver name to the options for email

Seems to work for me.
extra_data doesn't seem to be a supported field for cdb lists.
So switch that to url. It almost fits the intended use (at least as
well as extra_data does).
Merge pull request #322 from ddpbsd/unbound

extra_data doesn't seem to be a supported field for cdb lists.
derp, forgot that the domains end in a .
Merge pull request #323 from ddpbsd/unbound

derp, forgot that the domains end in a .
fix compiler warnings by "gcc -Wall -O2"
for md5-fix see http://lists.denx.de/pipermail/u-boot/2012-April/123364.html
fix clang warning
use global variable __local_name instead of macro ARGV0 in libraries, so that the binary name set into __local_name will be used
[os_regex] do not use static maps
Merge pull request #325 from cgzones/fix_for_makefiles

fixing compiler warnings with "-O2 -Wall"
Update cis_rhel5_linux_rcl.txt

- Update to V 2.1.0 of the CIS benchmark
- Add detection for CentOS, Cloudlinux, Oracle Linux, Better Linux
fix test compilation
Merge pull request #329 from atomicturtle/rootcheck-db-update

Update cis_rhel5_linux_rcl.txt
Merge pull request #328 from cgzones/os_regex_maps_no_static

[os_regex] do not use static maps
Merge pull request #326 from cgzones/no_argv0_in_libs

use global variable __local_name instead of macro ARGV0 in libraries
Merge branch 'master' into makefile-need-love-too