diff --git a/ChangeLog b/ChangeLog
index b0556a71..f2196f2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* src/chsh.c: Before pam_end(), the return value of the previous
 	pam API was already checked. No need to validate it again.
 	* src/chsh.c: Avoid implicit brackets.
+	* src/chsh.c: Avoid assignments in comparisons.
 
 2007-12-31  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/chsh.c b/src/chsh.c
index 1bb97cbf..f120b53b 100644
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -153,11 +153,14 @@ static int check_shell (const char *sh)
 	}
 	endusershell ();
 #else
-	if ((fp = fopen (SHELLS_FILE, "r")) == (FILE *) 0)
+	fp = fopen (SHELLS_FILE, "r");
+	if (NULL == fp) {
 		return 0;
+	}
 
 	while (fgets (buf, sizeof (buf), fp)) {
-		if ((cp = strrchr (buf, '\n'))) {
+		cp = strrchr (buf, '\n');
+		if (NULL != cp) {
 			*cp = '\0';
 		}