--- jakarta-tomcat-3.2.1-dist/bin/tomcat.sh	Tue Dec 12 14:36:46 2000
+++ jakarta-tomcat-3.2.1/bin/tomcat.sh	Tue Jan  9 21:52:38 2001
@@ -122,10 +122,11 @@
   shift 
   echo Using classpath: ${CLASSPATH}
   if [ "$1" = "-security" ] ; then
+    shift
     echo Starting with a SecurityManager
-    $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME}  org.apache.tomcat.startup.Tomcat "$@" &
+    $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy=${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@" &
   else
-  $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME}  org.apache.tomcat.startup.Tomcat "$@" &
+    $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@" &
   fi
 #   $JAVACMD org.apache.tomcat.shell.Startup "$@" &
 
@@ -139,10 +140,11 @@
   shift 
   echo Using classpath: ${CLASSPATH}
   if [ "$1" = "-security" ] ; then
+    shift
     echo Starting with a SecurityManager
-    $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy==${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@"
+    $JAVACMD $TOMCAT_OPTS -Djava.security.manager -Djava.security.policy=${TOMCAT_HOME}/conf/tomcat.policy -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@"
   else
-  $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@" 
+    $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.tomcat.startup.Tomcat "$@" 
   fi
 #  $JAVACMD org.apache.tomcat.shell.Startup "$@" 
   # no &

