From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 24 Dec 2025 10:19:37 +0000 (+0100)
Subject: lib/copydir.c: error_acl(): Preserve errno
X-Git-Tag: 4.20.0-rc3~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1087780d1a8fcd8482ef11e68354c534931a05fe;p=thirdparty%2Fshadow.git

lib/copydir.c: error_acl(): Preserve errno

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/copydir.c b/lib/copydir.c
index 3976bf8e3..47ea9f281 100644
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -33,7 +33,6 @@
 #include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
 #include "string/strcmp/strprefix.h"
-#include "string/strerrno.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -93,7 +92,8 @@ format_attr(printf, 2, 3)
 static void
 error_acl(MAYBE_UNUSED struct error_context *_1, const char *fmt, ...)
 {
-	va_list ap;
+	int      e;
+	va_list  ap;
 
 	/* ignore the case when destination does not support ACLs
 	 * or extended attributes */
@@ -102,13 +102,17 @@ error_acl(MAYBE_UNUSED struct error_context *_1, const char *fmt, ...)
 		return;
 	}
 
+	e = errno;
+
 	va_start (ap, fmt);
 	(void) fprintf (log_get_logfd(), _("%s: "), log_get_progname());
 	if (vfprintf (log_get_logfd(), fmt, ap) != 0) {
 		(void) fputs (_(": "), log_get_logfd());
 	}
-	(void) fprintf(log_get_logfd(), "%s\n", strerrno());
+	(void) fprintf(log_get_logfd(), "%s\n", strerror(e));
 	va_end (ap);
+
+	errno = e;
 }
 
 static struct error_context ctx = {