From 1b1af0c1d07fe8bc666882b0ae63ef9391e9d376 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 11 Apr 2012 12:52:36 +0200 Subject: [PATCH] login-utils: add missing header, fix setpwnam.c fclose logic Signed-off-by: Karel Zak --- login-utils/setpwnam.c | 5 ++++- login-utils/vipw.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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 #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 #include "c.h" +#include "fileutils.h" #include "closestream.h" #include "nls.h" #include "setpwnam.h" -- 2.47.3