From 6ec213cd8cf1e65d3c912f8f8eba663a2bf93fb5 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Sat, 13 Apr 2024 19:43:54 +0200
Subject: [PATCH] Don't abort startup when setgid/setuid() fails with EINVAL

Both setgid(2) as well as setuid(2) can fail with EINVAL in addition to
EPERM, their manual pages state "EINVAL: The user/group ID specified in
uid/gid is not valid in this user namespace ".

So not only treat EPERM as an "acceptable error" and continue with
logging the error, but do the same for EINVAL.

This was triggered by the Void Linux xbps-uunshare(1) tool used for
building "XBPS source packages" and reported by luca in #ngircd. Thanks!
---
 src/ngircd/ngircd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index b0610392..c2169c43 100644
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -722,7 +722,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 			Log(LOG_ERR, "Can't change group ID to %s(%u): %s!",
 			    grp ? grp->gr_name : "?", Conf_GID,
 			    strerror(real_errno));
-			if (real_errno != EPERM)
+			if (real_errno != EPERM && real_errno != EINVAL)
 				goto out;
 		}
 #ifdef HAVE_SETGROUPS
@@ -748,7 +748,7 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
 			Log(LOG_ERR, "Can't change user ID to %s(%u): %s!",
 			    pwd ? pwd->pw_name : "?", Conf_UID,
 			    strerror(real_errno));
-			if (real_errno != EPERM)
+			if (real_errno != EPERM && real_errno != EINVAL)
 				goto out;
 		}
 	}
-- 
2.39.2

