1 files changed, 2 insertions, 1 deletions

diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index c9c6283cc..360b187af 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -82,7 +82,8 @@ pick_salt(void)
         strlcpy(salt, "xx", sizeof(salt));
         setpwent();
         while ((pw = getpwent()) != NULL) {
-                passwd = shadow_pw(pw);
+                if ((passwd = shadow_pw(pw)) == NULL)
+                        continue;
                 if (passwd[0] == '$' && (p = strrchr(passwd+1, '$')) != NULL) {
                         typelen = p - passwd + 1;
                         strlcpy(salt, passwd, MIN(typelen, sizeof(salt)));