head	1.1;
access;
symbols
	RELEASE_8_3_0:1.1
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1
	RELEASE_6_0_0:1.1;
locks; strict;
comment	@# @;


1.1
date	2005.07.31.00.06.49;	author marcus;	state Exp;
branches;
next	;


desc
@@


1.1
log
@* Update to 3.10 [1]
* Add a target for regression testing, and run that target automatically
  when building on the package build cluster [1]
* Cleanup some portlint nits

Submitted by:	mi [1]
@
text
@--- cmd/modutil/modutil.h	Sun Apr 25 11:02:47 2004
+++ cmd/modutil/modutil.h	Fri Jul 22 17:35:20 2005
@@@@ -53,6 +53,6 @@@@
 #include "error.h"
 
-Error FipsMode(char *arg);
-Error ChkFipsMode(char *arg);
+Error FipsMode(const char *arg);
+Error ChkFipsMode(const char *arg);
 Error AddModule(char *moduleName, char *libFile, char *ciphers,
       char *mechanisms, char* modparms);
--- cmd/modutil/pk11.c	Sun Apr 25 11:02:47 2004
+++ cmd/modutil/pk11.c	Fri Jul 22 17:36:48 2005
@@@@ -53,5 +53,5 @@@@
  */
 Error
-FipsMode(char *arg)
+FipsMode(const char *arg)
 {
     char *internal_name;
@@@@ -62,14 +62,16 @@@@
 		SECMOD_GetInternalModule()->commonName);
 	    if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) {
-		PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError()));
+		PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n", SECU_Strerror(PORT_GetError()), internal_name);
 		PR_smprintf_free(internal_name);
 		PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
 		return FIPS_SWITCH_FAILED_ERR;
 	    }
-	    PR_smprintf_free(internal_name);
 	    if (!PK11_IsFIPS()) {
+		PR_fprintf(PR_STDERR, "FipsMode(true): in module %s", internal_name);
+	        PR_smprintf_free(internal_name);
 		PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
 		return FIPS_SWITCH_FAILED_ERR;
 	    }
+	    PR_smprintf_free(internal_name);
 	    PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
 	} else {
@@@@ -112,5 +114,5 @@@@
  */
 Error
-ChkFipsMode(char *arg)
+ChkFipsMode(const char *arg)
 {
     if(!PORT_Strcasecmp(arg, "true")) {
@
