login-utils: add missing header, fix setpwnam.c fclose logic

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/login-utils/setpwnam.c b/login-utils/setpwnam.c
index ba15bc1317b890f4260605d891295f530c6bfc54..44dda98e73498eaa09f3216ddb16c49a8f0dab8e 100644 (file)
--- a/login-utils/setpwnam.c
+++ b/login-utils/setpwnam.c
@@ -59,6 +59,7 @@
 #include <unistd.h>
 
 #include "c.h"
+#include "fileutils.h"
 #include "closestream.h"
 #include "setpwnam.h"
 
@@ -143,7 +144,9 @@ int setpwnam(struct passwd *pwd)
        /* xfmkstemp is too restrictive by default for passwd file */
        if (fchmod(fileno(fp), 0644) < 0)
                goto fail;
-       if (close_stream(fp) != 0)
+       rc = close_stream(fp);
+       fp = NULL;
+       if (rc != 0)
                goto fail;
 
        fclose(pwf);    /* I don't think I want to know if this failed */

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index 2d16999d28bcd001515d592165b92f6b90b00805..66c682dc038ab8fe4fcf46818276f69da81c006a 100644 (file)
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -72,6 +72,7 @@
 #include <unistd.h>
 
 #include "c.h"
+#include "fileutils.h"
 #include "closestream.h"
 #include "nls.h"
 #include "setpwnam.h"