unixpwd: getspent_r() is not reentrant (share FILE on shadow), so use more portable getspent()

Signed-off-by: Sebastien Marie <[email protected]>

Author: semarie

unixpwd/c/unixpwd.c

@@ -133,9 +133,7 @@ int
 unixpwd_setspw(const char *user, char *password)
 {
 
-    struct spwd     spw,
-                   *sp;
-    char            buf[BUFLEN];
+    struct spwd    *sp;
     int             tmp;
     FILE           *tmp_file = NULL;
     char            tmp_name[PATH_MAX];
@@ -165,10 +163,7 @@ unixpwd_setspw(const char *user, char *password)
     }
 
     setspent();
-    while (1) {
-        rc = getspent_r(&spw, buf, BUFLEN, &sp);
-        if (rc != 0 || !sp)
-            break;
+    while ((sp = getspent()) != NULL) {
         if (!strcmp(user, sp->sp_namp)) {
             sp->sp_pwdp = password;
             updated++;
@@ -178,11 +173,6 @@ unixpwd_setspw(const char *user, char *password)
     endspent();
 
     fclose(tmp_file);
-    if (rc != ENOENT) {
-        ulckpwdf();
-        unlink(tmp_name);
-        return rc;
-    }
     if (!updated) {
         ulckpwdf();
         unlink(tmp_name);