diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.23.11/load_policy/load_policy.c
--- nsapolicycoreutils/load_policy/load_policy.c	2005-04-14 07:22:16.000000000 -0400
+++ policycoreutils-1.23.11/load_policy/load_policy.c	2005-05-26 10:49:44.000000000 -0400
@@ -103,7 +103,7 @@
 			if (errno == ENOENT || errno == EINVAL) {
 				/* No booleans file or stale booleans in the file; non-fatal. */
 				if (! quiet) 
-					fprintf(stderr, _("%s:  Warning!  Error while setting booleans from %s:  %s\n"), argv[0], boolpath, strerror(errno));
+					fprintf(stderr, _("%s:  Warning while setting booleans from %s\n"), argv[0], boolpath);
 			} else {
 				fprintf(stderr, _("%s:  Error while setting booleans from %s:  %s\n"), argv[0], boolpath, strerror(errno));
 				exit(2);
@@ -115,7 +115,7 @@
 		if (ret) {
 			/* Possibly ok, as there may be no booleans. */
 			if (! quiet) 
-				fprintf(stderr, _("%s:  Warning!  Error while getting boolean names:  %s\n"), argv[0], strerror(errno));
+				fprintf(stderr, _("%s:  Warning! unable to get boolean names:  %s\n"), argv[0], strerror(errno));
 			goto load;
 		}
 		if (!len)
@@ -137,7 +137,7 @@
 			if (errno == EINVAL) {
 				/* Stale booleans in the file; non-fatal. */
 				if (! quiet) 
-					fprintf(stderr, _("%s:  Warning!  Error while setting booleans:  %s\n"), argv[0], strerror(errno));
+					fprintf(stderr, _("%s:  Warning!  Unable to reset all booleans\n"), argv[0]);
 			} else {
 				fprintf(stderr, _("%s:  Error while setting booleans:  %s\n"), argv[0], strerror(errno));
 				exit(2);
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.23.11/newrole/newrole.c
--- nsapolicycoreutils/newrole/newrole.c	2005-05-20 13:15:12.000000000 -0400
+++ policycoreutils-1.23.11/newrole/newrole.c	2005-05-26 08:46:35.000000000 -0400
@@ -198,6 +198,11 @@
     result = 0;  /* user authenticated OK! */
   }
 
+  /* Ask PAM to verify acct_mgmt */
+  if( PAM_SUCCESS != pam_acct_mgmt(pam_handle,0) ) {
+    result = 0;  /* user authenticated OK! */
+  }
+
   /* We're done with PAM.  Free `pam_handle'. */
   pam_end( pam_handle, PAM_SUCCESS );