Changeset 469


Ignore:
Timestamp:
Mar 26, 2015, 12:01:16 AM (6 years ago)
Author:
katerina
Message:

Fix for ticket #367 (testing scripts). Also update version and changelog.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r463 r469  
    1212dnl start
    1313dnl
    14 AM_INIT_AUTOMAKE(samhain, 3.1.4)
     14AM_INIT_AUTOMAKE(samhain, 3.1.5)
    1515AC_DEFINE([SAMHAIN], 1, [Application is samhain])
    1616AC_CANONICAL_HOST
  • trunk/docs/Changelog

    r463 r469  
    1 3.1.4:
     13.1.5:
     2        * Fix IPv6 issue with portcheck (need to be able to specify
     3          IPv6 interfaces).
     4        * Fix minor issues with bugs in testing code
     5        * Add command line option '--server-host' to set the log server
     6        * In samhain.startLinux.in start script template, add code to read
     7          options from /etc/sysconfig/${NAME} for RedHat
     8
     93.1.4 (17-02-2015):
    210        * Add non-existent file to the regression test config
    311        * Fix erroneous call to sh_hash_init when a missing file
  • trunk/test/testrc_2.in

    r463 r469  
    11-----BEGIN PGP SIGNED MESSAGE-----
    22Hash: SHA1
     3NotDashEscaped: You need GnuPG to verify this message
    34
    45#####################################################################
     
    208209[Clients]
    209210-----BEGIN PGP SIGNATURE-----
    210 Version: GnuPG v1.4.2.2 (GNU/Linux)
    211 
    212 iD8DBQFFsTXBGq0myA9XH2wRAju6AKDsNT3cVYHVs4z+ZHdFgPwOdvESewCfcIAY
    213 RsnSZyhwBGtlA+rf35/gcQw=
    214 =Rb0p
     211Version: GnuPG v1
     212
     213iEYEARECAAYFAlUTGCcACgkQGq0myA9XH2zINACfQb/Wfa19OBbHVkw9uBNMB+lF
     214cwUAnR0Geb+sFDcv7JsrrTjY8htjPHd2
     215=7wXO
    215216-----END PGP SIGNATURE-----
  • trunk/test/testrun_2c.sh

    r336 r469  
    378378    fi
    379379    #
     380    cp ${SCRIPTDIR}/testrc_2.in testrc_2
     381    #
    380382    GPG=`find_path gpg`
    381383    if [ -z "$GPG" ]; then
     
    387389        else
    388390            testrun_threesockets "$GPG"
    389 
     391            #
     392            cp ${SCRIPTDIR}/testrc_2.in testrc_2
     393            #
    390394            if [ -f ./yule ]; then
    391                 ./yule -D >/dev/null 2>>test_log
     395                ./yule -D --set-database-severity=warn >/dev/null 2>>test_log
    392396                five_sec_sleep
    393397                netstat -pant 2>/dev/null | grep 49777 | grep yule >/dev/null 2>&1
    394398                if [ $? -ne 0 ]; then
    395                     [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
     399                    [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 1";
    396400                else
    397401                    NSOCK=`netstat -pand 2>/dev/null | grep STREAM | grep yule | wc -l`
    398402                    if [ $NSOCK -ne 2 ]; then
    399                         [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
     403                        [ -z "$quiet" ] && log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 2";
    400404                        netstat -pand 2>/dev/null | grep yule
    401405                    else
     
    406410                kill $PID
    407411            else
    408                 log_fail 4 ${MAXTEST} "Three sockets open (gpg)";
     412                log_fail 4 ${MAXTEST} "Three sockets open (gpg) - 3";
    409413            fi
    410414        fi
Note: See TracChangeset for help on using the changeset viewer.