Rollback unwanted changes picked up by mistake BUG1186917_BRANCH
authorElio Maldonado <emaldona@redhat.com>
Sat, 12 Dec 2015 09:38:18 -0800
branchBUG1186917_BRANCH
changeset 11766 fa1f5d12a77d9273af114f164404fe1f91522f4f
parent 11765 653076b2a38b8260df4dad443e701559657c9043
child 11767 c66f1a61f45ffb3c95a39565db2e3ba86d7f6a98
push id893
push useremaldona@redhat.com
push dateSat, 12 Dec 2015 17:38:45 +0000
Rollback unwanted changes picked up by mistake
tests/doc/nssqa.txt
tests/doc/platform_specific_problems
tests/doc/qa_wrapper.html
tests/header
tests/iopr/ssl_iopr.sh
tests/memleak/ignored
tests/memleak/memleak.sh
tests/nssqa
tests/qa_stat
tests/qaclean
tests/run_niscc.sh
tests/ssl/ssl.sh
--- a/tests/doc/nssqa.txt
+++ b/tests/doc/nssqa.txt
@@ -63,28 +63,28 @@ not quite up to date
 		determine os and set up the environment (espec. PATH)
 		set the directories to run in (influenced by parameters and -l option)
 		set and initialize the tmp / debugging / output files
 
 	nssqa:init (local)
 		locking: if nssqa is already running on this systems (yes-exit, 
 			no-lockfile)
 		set HOST and DOMSUF variables if running interavtively
-		set flag to kill remaining selfserv_9727 processes during cleanup
+		set flag to kill remaining selfserv processes during cleanup
 		if QA platform different from build platform create neccessary 
 			symbolic links
 		wait for the build to finish (max of 5h)
 
 	main:
 		repeated per test (optimized, debug, 32, 64 bit)
 			set flags for this run of all.sh (optimized, debug, 32, 64 bit)
 			set the DIST directory (where the binaries reside)
 			kill running selfservers (sorry - just don't use the svbld 
 				account if you need to do your own testing... I will fix 
-				selfserv_9727 as soon as I can - but it hangs too often and 
+				selfserv as soon as I can - but it hangs too often and 
 				disturbs all following QA)
 			run all.sh 
 		
 	header:exit (global)
 		remove temporary files
 		kill remaining selfservers
 		send email to the list
 		
--- a/tests/doc/platform_specific_problems
+++ b/tests/doc/platform_specific_problems
@@ -4,25 +4,25 @@ I will check it in
 sonmi@netscape.com
 
 
 The NSS 3.1 SSL Stress Tests fail for me on FreeBSD 3.5.  The end of the output
 of './ssl.sh stress' looks like this:
 
 ********************* Stress Test  ****************************
 ********************* Stress SSL2 RC4 128 with MD5 ****************************
-selfserv_9513 -p 8443 -d
+selfserv -p 8443 -d
 /local/llennox/NSS-PSM/mozilla/tests_results/security/conrail.20/server -n
 conrail.cs.columbia.edu -w nss   -i /tmp/tests_pid.5505  & strsclnt -p 8443 -d . -w nss -c 1000 -C A  conrail.cs.columbia.edu 
 strsclnt: -- SSL: Server Certificate Validated.
 strsclnt: PR_NewTCPSocket returned error -5974:
 Insufficient system resources.
 Terminated 
 ********************* Stress SSL3 RC4 128 with MD5 ****************************
-selfserv_9513 -p 8443 -d
+selfserv -p 8443 -d
 /local/llennox/NSS-PSM/mozilla/tests_results/security/conrail.20/server -n
 conrail.cs.columbia.edu -w nss   -i /tmp/tests_pid.5505  & strsclnt -p 8443 -d . -w nss -c 1000 -C c  conrail.cs.columbia.edu 
 strsclnt: -- SSL: Server Certificate Validated.
 strsclnt: PR_NewTCPSocket returned error -5974:
 Insufficient system resources.
 Terminated 
 
 Running ktrace on the process (ktrace is a system-call tracer, the equivalent of
--- a/tests/doc/qa_wrapper.html
+++ b/tests/doc/qa_wrapper.html
@@ -101,17 +101,17 @@ compatibility testing
 <p>&nbsp;&nbsp;&nbsp; nssqa:init (local)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; locking: if nssqa is already
 running on this systems (yes-exit,
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 no-lockfile)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; set HOST and DOMSUF variables
 if running interavtively
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; set flag to kill remaining
-selfserv_9513 processes during cleanup
+selfserv processes during cleanup
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if QA platform different
 from build platform create neccessary
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 symbolic links
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; wait for the build to finish
 (max of 5h)
 <p>&nbsp;&nbsp;&nbsp; main:
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; repeated per test (optimized,
@@ -120,17 +120,17 @@ debug, 32, 64 bit)
 set flags for this run of all.sh (optimized, debug, 32, 64 bit)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 set the DIST directory (where the binaries reside)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 kill running selfservers (sorry - just don't use the svbld
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 account if you need to do your own testing... I will fix
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-selfserv_9513 as soon as I can - but it hangs too often and
+selfserv as soon as I can - but it hangs too often and
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 disturbs all following QA)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 run all.sh
 <p>&nbsp;&nbsp;&nbsp; header:exit (global)
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; remove temporary files
 <p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; kill remaining selfservers
 <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; send email to the list
--- a/tests/header
+++ b/tests/header
@@ -136,17 +136,17 @@ then
     exit 1
 fi
 
 KILLPIDS="$TMP/killpids.$$"
 export KILLERPIDS
 TMPFILES="$TMPFILES $KILLPIDS"
 
 KILL_SELFSERV=OFF   # if sourcing script sets this to on cleanup will also 
-                    # kill the running selfserv_9727 processes
+                    # kill the running selfserv processes
 
                     # Set the masterbuilds 
 if [ -z "$UX_MASTERBUILD" ]
 then                     
     UX_MASTERBUILD=booboo_Solaris8
     #if [ ! -d $UX_MASTERBUILD ] ; then
         #UX_MASTERBUILD=booboo_Solaris8_forte6
     #fi
@@ -1295,17 +1295,17 @@ Exit()
     if [ -n "${TMPFILES}" ]
     then
         Debug "rm -f ${TMPFILES}"
         rm -f $TMPFILES 2>/dev/null
     fi
     O_ALWAYS_YES=ON # set to non-interactive - don't ask anymore questions here
     if [ $KILL_SELFSERV = "ON" ]
     then
-        kill_by_name selfserv_9727
+        kill_by_name selfserv
     fi
     if [ $O_MAIL_LINK = "ON" -a $O_FILE = "ON" ]
     then
         if [ $EARLY_EXIT = TRUE ]    #before the report file has been created
         then
             early_exit "$1"
         else
             head -3  $FILENAME >$ML_FILE
--- a/tests/iopr/ssl_iopr.sh
+++ b/tests/iopr/ssl_iopr.sh
@@ -265,20 +265,20 @@ ssl_iopr_crl_ext_server()
 
 ########################################################################
 # local shell function to perform SSL Cipher Coverage tests of nss server
 # by invoking remote test client on web server side.
 # Invoked only if reverse testing is supported by web server.
 # Params:
 #      $1 - remote web server host
 #      $2 - open port to connect to invoke CGI script
-#      $3 - host where selfserv_9727 is running(name of the host nss tests
+#      $3 - host where selfserv is running(name of the host nss tests
 #           are running)
-#      $4 - port where selfserv_9727 is running
-#      $5 - selfserv_9727 nss db location
+#      $4 - port where selfserv is running
+#      $5 - selfserv nss db location
 # No return value
 #  
 ssl_iopr_cov_ext_client()
 {
   host=$1
   port=$2
   sslHost=$3
   sslPort=$4
@@ -288,17 +288,17 @@ ssl_iopr_cov_ext_client()
 
   setValidCert
   ret=$?
   if [ $res -ne 0 ]; then
       html_failed "Fail to find valid test cert(ws: $host)" 
       return $ret
   fi
 
-  # P_R_SERVERDIR switch require for selfserv_9727 to work.
+  # P_R_SERVERDIR switch require for selfserv to work.
   # Will be restored after test
   OR_P_R_SERVERDIR=$P_R_SERVERDIR
   P_R_SERVERDIR=$serDbDir
   OR_P_R_CLIENTDIR=$P_R_CLIENTDIR
   P_R_CLIENTDIR=$serDbDir
   testname=""
   sparam="-vvvc ABCDEFcdefgijklmnvyz"
   # Launch the server
@@ -369,20 +369,20 @@ ssl_iopr_cov_ext_client()
 
 ########################################################################
 # local shell function to perform SSL Authentication tests of nss server
 # by invoking remove test client on web server side
 # Invoked only if reverse testing is supported by web server.
 # Params:
 #      $1 - remote web server host
 #      $2 - open port to connect to invoke CGI script
-#      $3 - host where selfserv_9727 is running(name of the host nss tests
+#      $3 - host where selfserv is running(name of the host nss tests
 #           are running)
-#      $4 - port where selfserv_9727 is running
-#      $5 - selfserv_9727 nss db location
+#      $4 - port where selfserv is running
+#      $5 - selfserv nss db location
 # No return value
 #  
 ssl_iopr_auth_ext_client()
 {
   host=$1
   port=$2
   sslHost=$3
   sslPort=$4
@@ -465,20 +465,20 @@ ssl_iopr_auth_ext_client()
 
 #########################################################################
 # local shell function to perform SSL CRL testing of nss server
 # by invoking remote test client on web server side
 # Invoked only if reverse testing is supported by web server.
 # Params:
 #      $1 - remote web server host
 #      $2 - open port to connect to invoke CGI script
-#      $3 - host where selfserv_9727 is running(name of the host nss tests
+#      $3 - host where selfserv is running(name of the host nss tests
 #           are running)
-#      $4 - port where selfserv_9727 is running
-#      $5 - selfserv_9727 nss db location
+#      $4 - port where selfserv is running
+#      $5 - selfserv nss db location
 # No return value
 #  
 ssl_iopr_crl_ext_client()
 {
   host=$1
   port=$2
   sslHost=$3
   sslPort=$4
@@ -544,17 +544,17 @@ ssl_iopr_crl_ext_client()
               modvalue=1
               testAddMsg="revoked"
           else
               testAddMsg="not revoked"
               modvalue=0
           fi
           
           html_msg $ret $modvalue "${testname} (cert ${testUser} - $testAddMsg)" \
-		"produced a returncode of $ret, expected is $modvalue(selfserv_9727 args: $sparam)"
+		"produced a returncode of $ret, expected is $modvalue(selfserv args: $sparam)"
           rm -f $TEST_OUT $TEST_IN 2>&1 > /dev/null
       done
       kill_selfserv
   done < ${SSLAUTH_TMP}
 
   P_R_SERVERDIR=$OR_P_R_SERVERDIR
   P_R_CLIENTDIR=$OR_P_R_CLIENTDIR
 
@@ -617,20 +617,20 @@ ssl_iopr_run() {
                 ${IOPR_SSL_CLIENTDIR}_${IOPR_HOSTADDR}
             ssl_iopr_auth_ext_server $sslTestType ${IOPR_HOSTADDR} \
                 ${IOPR_SSL_CLIENTDIR}_${IOPR_HOSTADDR}
             ssl_iopr_crl_ext_server $sslTestType ${IOPR_HOSTADDR} \
                 ${IOPR_SSL_CLIENTDIR}_${IOPR_HOSTADDR}
         done
         
         
-        # Testing selfserv_9727 with client located at the webserver.
+        # Testing selfserv with client located at the webserver.
         echo "Testing ssl interoperability.
                 Client: remote($IOPR_HOSTADDR:$PORT)
-                Server: local(selfserv_9727)"
+                Server: local(selfserv)"
         ssl_iopr_cov_ext_client ${IOPR_HOSTADDR} ${IOPR_OPEN_PORT} \
             ${HOSTADDR} ${PORT} ${R_IOPR_SSL_SERVERDIR}_${IOPR_HOSTADDR}
         ssl_iopr_auth_ext_client ${IOPR_HOSTADDR} ${IOPR_OPEN_PORT} \
             ${HOSTADDR} ${PORT} ${R_IOPR_SSL_SERVERDIR}_${IOPR_HOSTADDR}
         ssl_iopr_crl_ext_client ${IOPR_HOSTADDR} ${IOPR_OPEN_PORT} \
             ${HOSTADDR} ${PORT} ${R_IOPR_SSL_SERVERDIR}_${IOPR_HOSTADDR}
         echo "================================================"
         echo "Done testing interoperability with $IOPR_HOSTADDR"
--- a/tests/memleak/ignored
+++ b/tests/memleak/ignored
@@ -43,16 +43,16 @@
 #463208
 **/sqlite3UnixFullPathname/_getcwd/**
 **/unixFullPathname/_getcwd/**
 
 #463631
 vfychain/main/PL_CreateOptState/**
 
 #486298
-selfserv_9513/main/PORT_Strdup_Util**
+selfserv/main/PORT_Strdup_Util**
 
 #497251
 **/FREEBL_InitStubs/dlopen@@GLIBC_**
 
 #679524
 **/nss_Init/PR_CallOnce/nss_doLockInit/**
 
--- a/tests/memleak/memleak.sh
+++ b/tests/memleak/memleak.sh
@@ -322,52 +322,52 @@ run_command_valgrind()
 	echo "==0=="
 	
 	unset NSS_DISABLE_ARENA_FREE_LIST
 	
 	return $ret
 }
 
 ############################# run_selfserv #############################
-# local shell function to start selfserv_9513
+# local shell function to start selfserv
 ########################################################################
 run_selfserv()
 {
 	echo "PATH=${PATH}"
 	echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
-	echo "${SCRIPTNAME}: -------- Running selfserv_9513:"
-	echo "selfserv_9513 ${SELFSERV_ATTR}"
-	${BINDIR}/selfserv_9513 ${SELFSERV_ATTR}
+	echo "${SCRIPTNAME}: -------- Running selfserv:"
+	echo "selfserv ${SELFSERV_ATTR}"
+	${BINDIR}/selfserv ${SELFSERV_ATTR}
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		html_failed "${LOGNAME}: Selfserv"
 		echo "${SCRIPTNAME} ${LOGNAME}: " \
 			"Selfserv produced a returncode of ${ret} - FAILED"
 	fi
 }
 
 ########################### run_selfserv_dbg ###########################
-# local shell function to start selfserv_9513 under debug tool
+# local shell function to start selfserv under debug tool
 ########################################################################
 run_selfserv_dbg()
 {
 	echo "PATH=${PATH}"
 	echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
-	${RUN_COMMAND_DBG} ${BINDIR}/selfserv_9513 ${SERVER_OPTION} ${SELFSERV_ATTR}
+	${RUN_COMMAND_DBG} ${BINDIR}/selfserv ${SERVER_OPTION} ${SELFSERV_ATTR}
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		html_failed "${LOGNAME}: Selfserv"
 		echo "${SCRIPTNAME} ${LOGNAME}: " \
 			"Selfserv produced a returncode of ${ret} - FAILED"
 	fi
 }
 
 ############################# run_strsclnt #############################
 # local shell function to run strsclnt for all ciphers and send stop
-# command to selfserv_9513 over tstclnt
+# command to selfserv over tstclnt
 ########################################################################
 run_strsclnt()
 {
 	for cipher in ${cipher_list}; do
 		VMIN="ssl3"
 		VMAX=
 		case "${cipher}" in
 		A|B|C|D|E|F)
@@ -402,17 +402,17 @@ run_strsclnt()
 	fi
 	
 	sleep 20
 	kill $(jobs -p) 2> /dev/null
 }
 
 ########################### run_strsclnt_dbg ###########################
 # local shell function to run strsclnt under debug tool for all ciphers 
-# and send stop command to selfserv_9513 over tstclnt
+# and send stop command to selfserv over tstclnt
 ########################################################################
 run_strsclnt_dbg()
 {
 	for cipher in ${cipher_list}; do
 		VMIN="ssl3"
 		VMAX=
 		case "${cipher}" in
 		A|B|C|D|E|F)
@@ -501,17 +501,17 @@ stat_print()
 		echo "Leaked bytes: ${stat_minbytes} min, ${stat_avgbytes} avg, ${stat_maxbytes} max"
 		echo "Leaked blocks: ${stat_minblocks} min, ${stat_avgblocks} avg, ${stat_maxblocks} max"
 		echo "Total runs: ${stat_runs}"
 		echo
 	fi
 }
 
 ########################## run_ciphers_server ##########################
-# local shell function to test server part of code (selfserv_9513)
+# local shell function to test server part of code (selfserv)
 ########################################################################
 run_ciphers_server()
 {
 	html_head "Memory leak checking - server"
 	
 	stat_clear
 	
 	client_mode="NORMAL"	
--- a/tests/nssqa
+++ b/tests/nssqa
@@ -36,17 +36,17 @@ TBX_EXIT=50             # in case we are
 . `dirname $0`/header   # utilities, shellfunctions etc, global to NSS QA
 
 if [ -z "$O_TBX" -o "$O_TBX" != "ON" ] ; then
     is_running ${TMP}/nssqa 
                         # checks if the file exists, if yes Exits, if not 
                         # creates to implement a primitive locking mechanism
 fi
 
-KILL_SELFSERV=OFF       # cleanup will also kill the leftover selfserv_9727 processes
+KILL_SELFSERV=OFF       # cleanup will also kill the leftover selfserv processes
 
 ################################ check_distdir #########################
 # local shell function to check if the DIST directory exists, if not there 
 # is no use to continue the test
 ########################################################################
 check_distdir()
 {
     set_objdir
@@ -72,17 +72,17 @@ check_distdir()
 
 ################################ run_all ###############################
 # local shell function to start the all.sh after asking user and redirect 
 # the output apropriately
 ########################################################################
 run_all()        
 {
     check_distdir || return 1
-    #kill_by_name selfserv_9727
+    #kill_by_name selfserv
     ask "Testing $OBJDIR continue with all.sh" "y" "n" || Exit
 
     Debug "running all.sh in `pwd`"
     if [ $O_SILENT = ON ]
     then
         if [ $O_DEBUG = ON -a $O_FILE = ON ]
         then
             all.sh >>$FILENAME 2>>$FILENAME
--- a/tests/qa_stat
+++ b/tests/qa_stat
@@ -768,17 +768,17 @@ set -x
   do
       BCT_DIR=`dirname "bct/$w"`
       BCT_RESULT="bct/$w"
       BCT_LOG="$BCT_DIR/output.log"
       grep "bgcolor=red" $BCT_RESULT | 
            sed -e 's/.results.html:<TR><TD>/ /' -e 's/<[^>]*>/ /g'
       grep 'cache hits; .* cache misses, .* cache not reusable' \
         $BCT_LOG |
-        grep -v selfserv_9513 |
+        grep -v selfserv |
         grep -v '0 cache hits; 1 cache misses, 0 cache not reusable' |
         grep -v '0 cache hits; 0 cache misses, 0 cache not reusable' |
         grep -v ' cache hits; 1 cache misses, 0 cache not reusable'
       grep -vi "write to SSL socket" $BCT_LOG |
         grep -vi "HDX PR_Read returned error" |
         grep -vi "no error" |
         grep -vi "12285" |
         grep -i  $BEFORE_CONTEXT_GREP $AFTER_CONTEXT_GREP error
--- a/tests/qaclean
+++ b/tests/qaclean
@@ -72,17 +72,17 @@ kill_by_name()
 }
 
 kill_the_rest()
 {
 i=0
 while [ $i -lt $1 ]
 do
     kill_by_name nssqa
-    kill_by_name selfserv_9727
+    kill_by_name selfserv
     kill_by_name strsclnt
     kill_by_name all.sh
     kill_by_name sdr.sh
     kill_by_name ssl.sh
     kill_by_name smime.sh
     i=`expr $i + 1`
 done
 }
--- a/tests/run_niscc.sh
+++ b/tests/run_niscc.sh
@@ -193,17 +193,17 @@ create_environment()
     export QA_LIST=${QA_LIST:-"result@recipient.address"}
 
     # Whether to use 64b build
     export USE_64=${USE_64:-1}
 
     # Directory where to write all the output data (around 650MiB for each run)
     export TEST_OUTPUT=${TEST_OUTPUT:-"$HOME/out"}
 
-    # How many threads to use in selfserv_9513 and strsclnt (max. 10)
+    # How many threads to use in selfserv and strsclnt (max. 10)
     export THREADS=${THREADS:-10}
 
     # If true, do not build tthe tested version of NSS
     export NO_BUILD_TEST=${NO_BUILD_TEST:-"false"}
 
     # If true, do not build the special NSS version for NISCC
     export NO_BUILD_HACK=${NO_BUILD_HACK:-"false"}
 
@@ -571,30 +571,30 @@ ssl_simple_client_auth()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=10
     else
         export STOP_AT=106160
     fi
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${TESTTOOLS}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog01" 2>&1 &
+    "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog01" 2>&1 &
 
     export NISCC_TEST="$TEST/simple_client"
     export LD_LIBRARY_PATH="$HACKLIB"
 
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         START_AT=$START \
         STOP_AT=$(($START+$THREADS)) \
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${HACKBIN}/strsclnt" $VERBOSE -d "$CLIENT" -n client_crt -p $PORT -t $THREADS -c $THREADS -o -N -w test $HOST >> "$TEST_OUTPUT/nisccLog02" 2>&1
     done
 
     unset NISCC_TEST
-    echo "starting tstclnt to shutdown simple client selfserv_9513 process"
+    echo "starting tstclnt to shutdown simple client selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${HACKBIN}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog02" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
@@ -614,26 +614,26 @@ ssl_simple_server_auth()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=00000010
     else
         export STOP_AT=00106167
     fi
     export LD_LIBRARY_PATH="$HACKLIB"
     export NISCC_TEST="$TEST/simple_server"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${HACKBIN}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog03" 2>&1 &
+    "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog03" 2>&1 &
 
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog04" 2>&1
     done
 
-    echo "starting tstclnt to shutdown simple server selfserv_9513 process"
+    echo "starting tstclnt to shutdown simple server selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog04" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
@@ -653,26 +653,26 @@ ssl_simple_rootca()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=10
     else
         export STOP_AT=106190
     fi
     export LD_LIBRARY_PATH="$HACKLIB"
     export NISCC_TEST="$TEST/simple_rootca"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${HACKBIN}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog05" 2>&1 &
+    "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog05" 2>&1 &
 
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog06" 2>&1
     done
 
-    echo "starting tstclnt to shutdown simple rootca selfserv_9513 process"
+    echo "starting tstclnt to shutdown simple rootca selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog06" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
@@ -692,30 +692,30 @@ ssl_resigned_client_auth()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=9
     else
         export STOP_AT=99981
     fi
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${TESTTOOLS}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog07" 2>&1 &
+    "${TESTTOOLS}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -rr -t $THREADS -w test > "$TEST_OUTPUT/nisccLog07" 2>&1 &
 
     export NISCC_TEST="$TEST/resigned_client"
     export LD_LIBRARY_PATH="$HACKLIB"
 
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         START_AT=$START \
         STOP_AT=$(($START+$THREADS)) \
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${HACKBIN}/strsclnt" $VERBOSE -d "$CLIENT" -n client_crt -p $PORT -t $THREADS -c $THREADS -o -N -w test $HOST >> "$TEST_OUTPUT/nisccLog08" 2>&1
     done
 
     unset NISCC_TEST
-    echo "starting tstclnt to shutdown resigned client selfserv_9513 process"
+    echo "starting tstclnt to shutdown resigned client selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${HACKBIN}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog08" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
@@ -735,26 +735,26 @@ ssl_resigned_server_auth()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=9
     else
         export STOP_AT=100068
     fi
     export LD_LIBRARY_PATH="$HACKLIB"
     export NISCC_TEST="$TEST/resigned_server"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${HACKBIN}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog09" 2>&1 &
+    "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog09" 2>&1 &
 
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog10" 2>&1
     done
 
-    echo "starting tstclnt to shutdown resigned server selfserv_9513 process"
+    echo "starting tstclnt to shutdown resigned server selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog10" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
@@ -774,26 +774,26 @@ ssl_resigned_rootca()
     if [ "$SMALLSET" = "true" ]; then
         export STOP_AT=9
     else
         export STOP_AT=99959
     fi
     export LD_LIBRARY_PATH="$HACKLIB"
     export NISCC_TEST="$TEST/resigned_rootca"
     LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
-    "${HACKBIN}/selfserv_9513" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog11" 2>&1 &
+    "${HACKBIN}/selfserv" $VERBOSE -p $PORT -d "$SERVER" -n server_crt -t $THREADS -w test > "$TEST_OUTPUT/nisccLog11" 2>&1 &
 
     unset NISCC_TEST
     export LD_LIBRARY_PATH="$TESTLIB"
     for START in `seq $START_AT $THREADS $STOP_AT`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/strsclnt" $VERBOSE -d "$CLIENT" -p $PORT -t $THREADS -c $THREADS -o -N $HOST >> "$TEST_OUTPUT/nisccLog12" 2>&1
     done
 
-    echo "starting tstclnt to shutdown resigned rootca selfserv_9513 process"
+    echo "starting tstclnt to shutdown resigned rootca selfserv process"
     for i in `seq 5`; do
         LD_PRELOAD=${FAKETIMELIB} NO_FAKE_STAT=1 FAKETIME="@2004-03-29 14:14:14" \
         "${TESTTOOLS}/tstclnt" -h $HOST -p $PORT -d "$CLIENT" -n client_crt -o -f -w test < "$CLIENT/stop.txt" >> "$TEST_OUTPUT/nisccLog12" 2>&1
     done
 
     unset LD_LIBRARY_PATH
 
     sleep 1
--- a/tests/ssl/ssl.sh
+++ b/tests/ssl/ssl.sh
@@ -100,49 +100,49 @@ ssl_init()
 
 ########################### is_selfserv_alive ##########################
 # local shell function to exit with a fatal error if selfserver is not
 # running
 ########################################################################
 is_selfserv_alive()
 {
   if [ ! -f "${SERVERPID}" ]; then
-      echo "$SCRIPTNAME: Error - selfserv_9727 PID file ${SERVERPID} doesn't exist"
+      echo "$SCRIPTNAME: Error - selfserv PID file ${SERVERPID} doesn't exist"
       sleep 5
       if [ ! -f "${SERVERPID}" ]; then
-          Exit 9 "Fatal - selfserv_9727 pid file ${SERVERPID} does not exist"
+          Exit 9 "Fatal - selfserv pid file ${SERVERPID} does not exist"
       fi
   fi
   
   if [ "${OS_ARCH}" = "WINNT" ] && \
      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
       PID=${SHELL_SERVERPID}
   else
       PID=`cat ${SERVERPID}`
   fi
 
   echo "kill -0 ${PID} >/dev/null 2>/dev/null" 
-  kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv_9727 process not detectable"
+  kill -0 ${PID} >/dev/null 2>/dev/null || Exit 10 "Fatal - selfserv process not detectable"
 
-  echo "selfserv_9727 with PID ${PID} found at `date`"
+  echo "selfserv with PID ${PID} found at `date`"
 }
 
 ########################### wait_for_selfserv ##########################
 # local shell function to wait until selfserver is running and initialized
 ########################################################################
 wait_for_selfserv()
 {
-  echo "trying to connect to selfserv_9727 at `date`"
+  echo "trying to connect to selfserv at `date`"
   echo "tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \\"
   echo "        -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}"
   ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
           -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
   if [ $? -ne 0 ]; then
       sleep 5
-      echo "retrying to connect to selfserv_9727 at `date`"
+      echo "retrying to connect to selfserv at `date`"
       echo "tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \\"
       echo "        -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}"
       ${BINDIR}/tstclnt -p ${PORT} -h ${HOSTADDR} ${CLIENT_OPTIONS} -q \
               -d ${P_R_CLIENTDIR} -v < ${REQUEST_FILE}
       if [ $? -ne 0 ]; then
           html_failed "Waiting for Server"
       fi
   fi
@@ -156,41 +156,41 @@ kill_selfserv()
 {
   if [ "${OS_ARCH}" = "WINNT" ] && \
      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
       PID=${SHELL_SERVERPID}
   else
       PID=`cat ${SERVERPID}`
   fi
 
-  echo "trying to kill selfserv_9727 with PID ${PID} at `date`"
+  echo "trying to kill selfserv with PID ${PID} at `date`"
 
   if [ "${OS_ARCH}" = "WINNT" -o "${OS_ARCH}" = "WIN95" -o "${OS_ARCH}" = "OS2" ]; then
       echo "${KILL} ${PID}"
       ${KILL} ${PID}
   else
       echo "${KILL} -USR1 ${PID}"
       ${KILL} -USR1 ${PID}
   fi
   wait ${PID}
   if [ ${fileout} -eq 1 ]; then
       cat ${SERVEROUTFILE}
   fi
 
-  # On Linux selfserv_9727 needs up to 30 seconds to fully die and free
+  # On Linux selfserv needs up to 30 seconds to fully die and free
   # the port.  Wait until the port is free. (Bug 129701)
   if [ "${OS_ARCH}" = "Linux" ]; then
-      echo "selfserv_9727 -b -p ${PORT} 2>/dev/null;"
-      until ${BINDIR}/selfserv_9727 -b -p ${PORT} 2>/dev/null; do
-          echo "RETRY: selfserv_9727 -b -p ${PORT} 2>/dev/null;"
+      echo "selfserv -b -p ${PORT} 2>/dev/null;"
+      until ${BINDIR}/selfserv -b -p ${PORT} 2>/dev/null; do
+          echo "RETRY: selfserv -b -p ${PORT} 2>/dev/null;"
           sleep 1
       done
   fi
 
-  echo "selfserv_9727 with PID ${PID} killed at `date`"
+  echo "selfserv with PID ${PID} killed at `date`"
 
   rm ${SERVERPID}
   html_detect_core "kill_selfserv core detection step"
 }
 
 ########################### start_selfserv #############################
 # local shell function to start the selfserver with the parameters required 
 # for this test and log information (parameters, start time)
@@ -206,36 +206,36 @@ start_selfserv()
      [ -z "$NO_ECC_CERTS" -o "$NO_ECC_CERTS" != "1"  ] ; then
       ECC_OPTIONS="-e ${HOSTADDR}-ec"
   else
       ECC_OPTIONS=""
   fi
   if [ "$1" = "mixed" ]; then
       ECC_OPTIONS="-e ${HOSTADDR}-ecmixed"
   fi
-  echo "selfserv_9727 starting at `date`"
-  echo "selfserv_9727 -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \\"
+  echo "selfserv starting at `date`"
+  echo "selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \\"
   echo "         ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID}\\"
   echo "         $verbose -H 1 &"
   if [ ${fileout} -eq 1 ]; then
-      ${PROFTOOL} ${BINDIR}/selfserv_9727 -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
+      ${PROFTOOL} ${BINDIR}/selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
                ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID} $verbose -H 1 \
                > ${SERVEROUTFILE} 2>&1 &
       RET=$?
   else
-      ${PROFTOOL} ${BINDIR}/selfserv_9727 -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
+      ${PROFTOOL} ${BINDIR}/selfserv -D -p ${PORT} -d ${P_R_SERVERDIR} -n ${HOSTADDR} ${SERVER_OPTIONS} \
                ${ECC_OPTIONS} -S ${HOSTADDR}-dsa -w nss ${sparam} -i ${R_SERVERPID} $verbose -H 1 &
       RET=$?
   fi
 
   # The PID $! returned by the MKS or Cygwin shell is not the PID of
   # the real background process, but rather the PID of a helper
   # process (sh.exe).  MKS's kill command has a bug: invoking kill
   # on the helper process does not terminate the real background
-  # process.  Our workaround has been to have selfserv_9727 save its PID
+  # process.  Our workaround has been to have selfserv save its PID
   # in the ${SERVERPID} file and "kill" that PID instead.  But this
   # doesn't work under Cygwin; its kill command doesn't recognize
   # the PID of the real background process, but it does work on the
   # PID of the helper process.  So we save the value of $! in the
   # SHELL_SERVERPID variable, and use it instead of the ${SERVERPID}
   # file under Cygwin.  (In fact, this should work in any shell
   # other than the MKS shell.)
   SHELL_SERVERPID=$!
@@ -243,17 +243,17 @@ start_selfserv()
 
   if [ "${OS_ARCH}" = "WINNT" ] && \
      [ "$OS_NAME" = "CYGWIN_NT" -o "$OS_NAME" = "MINGW32_NT" ]; then
       PID=${SHELL_SERVERPID}
   else
       PID=`cat ${SERVERPID}`
   fi
 
-  echo "selfserv_9727 with PID ${PID} started at `date`"
+  echo "selfserv with PID ${PID} started at `date`"
 }
 
 ############################## ssl_cov #################################
 # local shell function to perform SSL Cipher Coverage tests
 ########################################################################
 ssl_cov()
 {
   html_head "SSL Cipher Coverage $NORM_EXT - server $SERVER_MODE/client $CLIENT_MODE $ECC_STRING"
@@ -306,19 +306,19 @@ ssl_cov()
           if [ "$testmax" = "TLS11" ]; then
               VMAX="tls1.1"
           fi
           if [ "$testmax" = "TLS12" ]; then
               VMAX="tls1.2"
           fi
 
 # These five tests need an EC cert signed with RSA
-# This requires a different certificate loaded in selfserv_9727
+# This requires a different certificate loaded in selfserv
 # due to a (current) NSS limitation of only loaded one cert
-# per type so the default selfserv_9727 setup will not work.
+# per type so the default selfserv setup will not work.
 #:C00B TLS ECDH RSA WITH NULL SHA
 #:C00C TLS ECDH RSA WITH RC4 128 SHA
 #:C00D TLS ECDH RSA WITH 3DES EDE CBC SHA
 #:C00E TLS ECDH RSA WITH AES 128 CBC SHA
 #:C00F TLS ECDH RSA WITH AES 256 CBC SHA
 
           if [ $mixed -eq 0 ]; then
             if [ "${param}" = ":C00B" -o "${param}" = ":C00C" -o "${param}" = ":C00D" -o "${param}" = ":C00E" -o "${param}" = ":C00F" ]; then
@@ -509,17 +509,17 @@ ssl_stapling()
   html_head "SSL Cert Status (OCSP Stapling) $NORM_EXT - server $SERVER_MODE/client $CLIENT_MODE $ECC_STRING"
 
   # tstclnt Exit code:
   # 0: have fresh and valid revocation data, status good
   # 1: cert failed to verify, prior to revocation checking
   # 2: missing, old or invalid revocation data
   # 3: have fresh and valid revocation data, status revoked
 
-  # selfserv_9727 modes
+  # selfserv modes
   # good, revoked, unkown: Include locally signed response. Requires: -A
   # failure: Include OCSP failure status, such as "try later" (unsigned)
   # badsig: use a good status but with an invalid signature
   # corrupted: stapled cert status is an invalid block of data
 
   ssl_stapling_sub "OCSP stapling, signed response, good status"     "-A TestCA -T good"      0
   ssl_stapling_sub "OCSP stapling, signed response, revoked status"  "-A TestCA -T revoked"   3
   ssl_stapling_sub "OCSP stapling, signed response, unknown status"  "-A TestCA -T unknown"   2
@@ -614,33 +614,33 @@ ssl_stress()
           p=`echo "$sparam" | sed -e "s/\(.*\)\(-c_:C0..\)\(.*\)/\2/"`;
           if [ "$p" = "-c_:C00E" ]; then
               start_selfserv mixed
           else
               start_selfserv
           fi
 
           if [ "`uname -n`" = "sjsu" ] ; then
-              echo "debugging disapering selfserv_9727... ps -ef | grep selfserv_9727"
-              ps -ef | grep selfserv_9727
+              echo "debugging disapering selfserv... ps -ef | grep selfserv"
+              ps -ef | grep selfserv
           fi
 
           echo "strsclnt -q -p ${PORT} -d ${P_R_CLIENTDIR} ${CLIENT_OPTIONS} -w nss $cparam \\"
           echo "         $verbose ${HOSTADDR}"
           echo "strsclnt started at `date`"
           ${PROFTOOL} ${BINDIR}/strsclnt -q -p ${PORT} -d ${P_R_CLIENTDIR} ${CLIENT_OPTIONS} -w nss $cparam \
                    $verbose ${HOSTADDR}
           ret=$?
           echo "strsclnt completed at `date`"
           html_msg $ret $value \
                    "${testname}" \
                    "produced a returncode of $ret, expected is $value. "
           if [ "`uname -n`" = "sjsu" ] ; then
-              echo "debugging disapering selfserv_9727... ps -ef | grep selfserv_9727"
-              ps -ef | grep selfserv_9727
+              echo "debugging disapering selfserv... ps -ef | grep selfserv"
+              ps -ef | grep selfserv
           fi
           kill_selfserv
       fi
   done
 
   html "</TABLE><BR>"
 }
 
@@ -809,17 +809,17 @@ GET crl://${SERVERDIR}/root.crl_${grpBeg
 
         cat ${OUTFILE_TMP}
         grep "CRL ReCache Error" ${OUTFILE_TMP}
         if [ $? -eq 0 ]; then
             ret=1
             return 1
         fi
     else
-        echo "=== Updating DB for group $grpBegin - $grpEnd and restarting selfserv_9727 ====="
+        echo "=== Updating DB for group $grpBegin - $grpEnd and restarting selfserv ====="
 
         kill_selfserv
         CU_ACTION="Importing ${eccomment}CRL for groups $grpBegin - $grpEnd"
         crlu -d ${R_SERVERDIR} -I -i ${SERVERDIR}/root.crl_${grpBegin}-${grpEnd}${ecsuffix} \
              -p ../tests.pw.928
         ret=$?
         if [ "$ret" -eq 0 ]; then
 	    html_passed "${CU_ACTION}"
@@ -912,32 +912,32 @@ ssl_crl_cache()
             fi
 
             is_selfserv_alive
             ss_status=$?
             if [ "$ss_status" -ne 0 ]; then
                 html_msg $ret $modvalue \
                     "${testname}(cert ${USER_NICKNAME} - $testAddMsg)" \
                     "produced a returncode of $ret, expected is $modvalue. " \
-                    "selfserv_9727 is not alive!"
+                    "selfserv is not alive!"
             else
                 html_msg $ret $modvalue \
                     "${testname}(cert ${USER_NICKNAME} - $testAddMsg)" \
                     "produced a returncode of $ret, expected is $modvalue"
             fi
           done
           LOADED_GRP=`expr $LOADED_GRP + 1`
           TEMP_NUM=0
           if [ "$LOADED_GRP" -le "$TOTAL_GRP_NUM" ]; then
               load_group_crl $LOADED_GRP $ectype
               html_msg $ret 0 "Load group $LOADED_GRP ${eccomment}crl " \
                   "produced a returncode of $ret, expected is 0"
           fi
         done
-        # Restart selfserv_9727 to roll back to two initial group 1 crls
+        # Restart selfserv to roll back to two initial group 1 crls
         # TestCA CRL and TestCA-ec CRL 
         kill_selfserv
         start_selfserv
       fi
     done
     kill_selfserv
     SERV_ARG="${SERV_ARG}_-r"
     rm -f ${SSLAUTH_TMP}