Changeset 467


Ignore:
Timestamp:
Mar 25, 2015, 11:45:32 PM (6 years ago)
Author:
katerina
Message:

Fix for ticket #365 (cl option to choose log server).

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/sh_getopt.c

    r422 r467  
    9393    HAS_ARG_YES,
    9494    sh_forward_server_port },
     95  { N_("server-host"), 
     96    '-',
     97    N_("Set the server host to connect to"), 
     98    HAS_ARG_YES,
     99    sh_forward_setlogserver },
    95100#endif
    96101#ifdef SH_WITH_SERVER
  • trunk/test/testrun_2a.sh

    r463 r467  
    2525SERVER_BUILDOPTS="--quiet  $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
    2626
    27 CLIENT_BUILDOPTS="--quiet  $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
     27CLIENT_BUILDOPTS="--quiet  $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
    2828
    2929do_test_1_a () {
     
    4242        [ -z "$verbose" ] || {
    4343            echo;
    44             echo "${S}Start Client${E}: ./samhain.new -l none -p none -e info -t check";
     44            echo "${S}Start Client${E}: ./samhain.new -l none -p none -e info -t check --bind-address=127.0.0.1 --server-host=localhost";
    4545            echo;
    4646        }
    4747
    48         ${VALGRIND} ./samhain.new -t check -p none -l none -e info --bind-address=127.0.0.1 >/dev/null 2>>test_log_valgrind
     48        ${VALGRIND} ./samhain.new -t check -p none -l none -e info --bind-address=127.0.0.1 --server-host=localhost >/dev/null 2>>test_log_valgrind
    4949        if test x$? = x0; then
    5050            [ -z "$verbose" ] || log_msg_ok    "samhain.new -t check";
     
    312312    log_end "RUN FULL CLIENT/SERVER"
    313313}
    314 
Note: See TracChangeset for help on using the changeset viewer.