From: Miloš Mulač <mulac@civ.zcu.cz>
Date: Fri, 31 Mar 2006 08:02:38 +0000 (+0000)
Subject: fail if ftp port not explicitely set
X-Git-Tag: glite-jp-primary_R_1_2_0~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d0c1ba571cc1c64957f6e6d6200d9c21e34d86d4;p=jra1mw.git

fail if ftp port not explicitely set
---

diff --git a/org.glite.jp.primary/config/startup b/org.glite.jp.primary/config/startup
index 30ae3ad..e7120ed 100644
--- a/org.glite.jp.primary/config/startup
+++ b/org.glite.jp.primary/config/startup
@@ -17,7 +17,6 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
 unset creds
 
 test -n "$GLITE_JP_PRIMARY_PORT" ||  GLITE_JP_PRIMARY_PORT=8901
-test -n "$GLITE_JP_PRIMARY_FTP_PORT" ||  GLITE_JP_PRIMARY_FTP_PORT=8950
 
 start()
 {
@@ -83,7 +82,7 @@ start()
 		FTPBE_INT_PREFIX=\"$GLITE_JP_PRIMARY_INTERNAL\" \
 		LD_LIBRARY_PATH=$GLOBUS_LOCATION/lib \
 		LD_PRELOAD=$GLITE_LOCATION/lib/glite-jp-ftpdauth.so \
-		$GLOBUS_LOCATION/sbin/in.ftpd -a -s -p $GLITE_JP_PRIMARY_FTP_PORT & \
+		$GLOBUS_LOCATION/sbin/in.ftpd -Q -W -a -s -p $GLITE_JP_PRIMARY_FTP_PORT & \
 		pid=\$!; echo \$pid > $pidfile.ftpd; sleep 2; true kill -0 \$pid" && echo " done" || echo " FAILED"
 }