[Pkg-shadow-devel] [PATCH] Suppress pwconv passwd- chmod failure message

Duncan Eastoe deastoe at Brocade.com
Mon Feb 9 14:39:31 UTC 2015


Prevent chmod failure message from displaying if the failure
was due to the backup file not existing.

If there is no backup file present and if no changes have been
made, then this error would always appear since the backup
file isn't created in this situation.

Signed-off-by: Duncan Eastoe <deastoe at Brocade.com>
---
 src/pwconv.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pwconv.c b/src/pwconv.c
index 515eba1..d41d5dd 100644
--- a/src/pwconv.c
+++ b/src/pwconv.c
@@ -305,7 +305,8 @@ int main (int argc, char **argv)
 	}
 
 	/* /etc/passwd- (backup file) */
-	if (chmod (PASSWD_FILE "-", 0600) != 0) {
+	errno = 0;
+	if ((chmod (PASSWD_FILE "-", 0600) != 0) && (errno != ENOENT)) {
 		fprintf (stderr,
 		         _("%s: failed to change the mode of %s to 0600\n"),
 		         Prog, PASSWD_FILE "-");
-- 
1.7.10.4




More information about the Pkg-shadow-devel mailing list