[Openvas-commits] r10645 - in trunk/openvas-scanner: . tools

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-03-28 16:18:41 +0200 (Mon, 28 Mar 2011)
New Revision: 10645

Modified:
   trunk/openvas-scanner/ChangeLog
   trunk/openvas-scanner/tools/greenbone-nvt-sync
Log:
* tools/greenbone-nvt-sync: Add support for specifying an arbitrary
  port for synchronization.


Modified: trunk/openvas-scanner/ChangeLog
===================================================================
--- trunk/openvas-scanner/ChangeLog	2011-03-28 14:14:33 UTC (rev 10644)
+++ trunk/openvas-scanner/ChangeLog	2011-03-28 14:18:41 UTC (rev 10645)
@@ -1,5 +1,10 @@
 2011-03-28  Michael Wiegand <michael.wiegand at greenbone.net>
 
+	* tools/greenbone-nvt-sync: Add support for specifying an arbitrary
+	port for synchronization.
+
+2011-03-28  Michael Wiegand <michael.wiegand at greenbone.net>
+
 	* tools/greenbone-nvt-sync: Add support for reading configuration from
 	$sysconfdir/openvas/greenbone-nvt-sync.conf.
 

Modified: trunk/openvas-scanner/tools/greenbone-nvt-sync
===================================================================
--- trunk/openvas-scanner/tools/greenbone-nvt-sync	2011-03-28 14:14:33 UTC (rev 10644)
+++ trunk/openvas-scanner/tools/greenbone-nvt-sync	2011-03-28 14:18:41 UTC (rev 10645)
@@ -58,6 +58,9 @@
 # Verbosity flag for rsync. "-q" means a quiet rsync, "-v" a verbose rsync.
 RSYNC_VERBOSE="-q"
 
+# Port to use for synchronization. Default value is 24.
+PORT=24
+
 if [ ! -w $LOGDIR ]
 then
   NOLOG=1
@@ -189,9 +192,9 @@
     fi
     if [ "$gsmproxy" = "proxy_feed" ] || [ -z $gsmproxy ]
     then
-      rsync -e "ssh -p 24 -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR
+      rsync -e "ssh -p $PORT -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR
     else
-      rsync -e "ssh -o \"ProxyCommand corkscrew $gsmproxy %h %p\" -p 24 -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR
+      rsync -e "ssh -o \"ProxyCommand corkscrew $gsmproxy %h %p\" -p $PORT -i $sysconfdir/openvas/gsf-access-key" -ltrP $RSYNC_VERBOSE --protocol=29 $RSYNC_DELETE $feeduser $NVT_DIR
     fi
     if [ $? -ne 0 ]  ; then
       stderr_write "== greenbone-nvt-sync $VERSION ================================================"