diff -Naur pw.orig/pwupd.c pw/pwupd.c
--- pw.orig/pwupd.c	2008-07-07 10:28:52.000000000 +0800
+++ pw/pwupd.c	2008-07-07 11:27:37.000000000 +0800
@@ -139,7 +139,7 @@
 static int
 pw_update(struct passwd * pwd, char const * user, int mode)
 {
-	int             rc = 0;
+	int rc;
 
 	ENDPWENT();
 
@@ -148,7 +148,8 @@
 	 * Note: -C is only available in FreeBSD 2.2 and above
 	 */
 #ifdef HAVE_PWDB_C
-	if (pwdb("-C", (char *)NULL) == 0) {	/* Check only */
+	rc = pwdb("-C", (char *)NULL); /* Check only */
+	if (rc == 0) {
 #else
 	{				/* No -C */
 #endif