diff --git a/mozilla/security/nss/cmd/SSLsample/server.c b/mozilla/security/nss/cmd/SSLsample/server.c
index 0e85f8cecc1..83d80fb45d3 100644
--- a/mozilla/security/nss/cmd/SSLsample/server.c
+++ b/mozilla/security/nss/cmd/SSLsample/server.c
@@ -389,7 +389,6 @@ writeDataToSocket(PRFileDesc *sslSocket, DataBuffer *buffer, char *fileName)
 			PORT_Free(fileName);
 			/* Maybe a GET not sent from client.c? */
 			goto writerequest;
-			return SECSuccess;
 		}
 
 		local_file_fd = PR_Open(fileName, PR_RDONLY, 0);
diff --git a/mozilla/security/nss/cmd/SSLsample/sslerror.h b/mozilla/security/nss/cmd/SSLsample/sslerror.h
index fd0275c3758..8ad908569bc 100644
--- a/mozilla/security/nss/cmd/SSLsample/sslerror.h
+++ b/mozilla/security/nss/cmd/SSLsample/sslerror.h
@@ -74,7 +74,7 @@ SSL_Strerror(PRErrorCode errNum) {
      * binary search depends on it.
      */
     if (!initDone) {
-	PRErrorCode lastNum = 0x80000000;
+	PRErrorCode lastNum = (PRInt32)0x80000000;
     	for (i = low; i <= high; ++i) {
 	    num = errStrings[i].errNum;
 	    if (num <= lastNum) {
diff --git a/mozilla/security/nss/cmd/p7content/p7content.c b/mozilla/security/nss/cmd/p7content/p7content.c
index 91dbc3ef1b4..10aba46601d 100644
--- a/mozilla/security/nss/cmd/p7content/p7content.c
+++ b/mozilla/security/nss/cmd/p7content/p7content.c
@@ -34,7 +34,7 @@
 /*
  * p7content -- A command to display pkcs7 content.
  *
- * $Id: p7content.c,v 1.5 2001-02-01 00:54:34 kirke%netscape.com Exp $
+ * $Id: p7content.c,v 1.6 2001-09-20 21:58:33 relyea%netscape.com Exp $
  */
 
 #include "nspr.h"
@@ -127,7 +127,7 @@ DecodeAndPrintFile(FILE *out, PRFileDesc *in, char *progName)
 		SEC_PKCS7DecoderUpdate(dcx, derdata.data + i, 1);
 	}
 #else
-	SEC_PKCS7DecoderUpdate(dcx, derdata.data, derdata.len);
+	SEC_PKCS7DecoderUpdate(dcx, (char *)derdata.data, derdata.len);
 #endif
 	cinfo = SEC_PKCS7DecoderFinish(dcx);
     }
diff --git a/mozilla/security/nss/cmd/tstclnt/tstclnt.c b/mozilla/security/nss/cmd/tstclnt/tstclnt.c
index e5951054944..eaa7bfdf2d7 100644
--- a/mozilla/security/nss/cmd/tstclnt/tstclnt.c
+++ b/mozilla/security/nss/cmd/tstclnt/tstclnt.c
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
 	  case 'v': verbose++;	 			break;
 
 	  case 'w':
-		password = optstate->value;
+		password = PORT_Strdup(optstate->value);
 		useCommandLinePassword = PR_TRUE;
 		break;