Fix merge problems from CVS. This version should now compile and work.

security/nss/cmd/certutil/certutil.c

@@ -1919,7 +1919,6 @@ CreateCert(
 	int     serialNumber, 
 	int     warpmonths,
 	int     validitylength,
-	void	*pwarg,
 	PRBool  selfsign,
 	PRBool	keyUsage, 
 	PRBool  extKeyUsage,
@@ -2586,15 +2585,10 @@ main(int argc, char **argv)
     /*  Create a certificate (-C or -S).  */
     if (certutil.commands[cmd_CreateAndAddCert].activated ||
          certutil.commands[cmd_CreateNewCert].activated) {
-	if ( certutil.options[opt_PasswordFile].arg) {
-	    pwdata.source = PW_FROMFILE;
-	    pwdata.data = certutil.options[opt_PasswordFile].arg;
-	}
 	rv = CreateCert(certHandle, 
 	                certutil.options[opt_IssuerName].arg,
 	                inFile, outFile, privkey, &pwdata,
 	                serialNumber, warpmonths, validitylength,
-			&pwdata,
 	                certutil.options[opt_SelfSign].activated,
 	                certutil.options[opt_AddKeyUsageExt].activated,
 	                certutil.options[opt_AddExtKeyUsageExt].activated,