Changeset 467

Timestamp:

Mar 25, 2015, 11:45:32 PM (10 years ago)

Author:

katerina

Message:

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

Location:

trunk

Files:

• src/sh_getopt.c (modified) (1 diff)
• test/testrun_2a.sh (modified) (3 diffs)

trunk/src/sh_getopt.c

@@ -93 +93 @@
     HAS_ARG_YES, 
     sh_forward_server_port },
+  { N_("server-host"),  
+    '-', 
+    N_("Set the server host to connect to"),  
+    HAS_ARG_YES, 
+    sh_forward_setlogserver },
 #endif
 #ifdef SH_WITH_SERVER

trunk/test/testrun_2a.sh

@@ -25 +25 @@
 SERVER_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
 
-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
+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-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
 
 do_test_1_a () {
@@ -42 +42 @@
         [ -z "$verbose" ] || { 
             echo; 
-            echo "${S}Start Client${E}: ./samhain.new -l none -p none -e info -t check"; 
+            echo "${S}Start Client${E}: ./samhain.new -l none -p none -e info -t check --bind-address=127.0.0.1 --server-host=localhost"; 
             echo; 
         }
 
-        ${VALGRIND} ./samhain.new -t check -p none -l none -e info --bind-address=127.0.0.1 >/dev/null 2>>test_log_valgrind
+        ${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
         if test x$? = x0; then
             [ -z "$verbose" ] || log_msg_ok    "samhain.new -t check";
@@ -312 +312 @@
     log_end "RUN FULL CLIENT/SERVER"
 }
-