From: Karel Zak <kzak@redhat.com>
Date: Wed, 11 Apr 2012 10:52:36 +0000 (+0200)
Subject: login-utils: add missing header, fix setpwnam.c fclose logic
X-Git-Tag: v2.22-rc1~538
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b1af0c1d07fe8bc666882b0ae63ef9391e9d376;p=thirdparty%2Futil-linux.git

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 ba15bc1317..44dda98e73 100644
--- 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 2d16999d28..66c682dc03 100644
--- 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"