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
[tests] test searchAndReplace with different sizes for search and replace string
Merge pull request #319 from cgzones/searchAndReplace2

test searchAndReplace() with different sizes for search and replace string
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