From: Eivind Næss <eivnaes@yahoo.com>
Date: Mon, 20 Sep 2021 16:52:22 +0000 (-0700)
Subject: Fixing GCC warning -Wunused-result with setgid in winbind.c
X-Git-Tag: ppp-2.5.0~56^2~17
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=69c516a36ddeac5fd41d4ef8879f16fd5db88266

Fixing GCC warning -Wunused-result with setgid in winbind.c

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---

diff --git a/pppd/plugins/winbind.c b/pppd/plugins/winbind.c
index 8c98e2a..86b5198 100644
--- a/pppd/plugins/winbind.c
+++ b/pppd/plugins/winbind.c
@@ -299,15 +299,20 @@ unsigned int run_ntlm_auth(const char *username,
 	if (forkret == 0) {
 		/* child process */
 		uid_t uid;
+		gid_t gid;
 
 		close(child_out[0]);
 		close(child_in[1]);
 
 		/* run winbind as the user that invoked pppd */
-		setgid(getgid());
+		gid = getgid();
+		if (setgid(gid) == -1 || getgid() != gid) {
+			fatal("pppd/winbind: could not setgid to %d: %m", gid);
+		}
 		uid = getuid();
-		if (setuid(uid) == -1 || getuid() != uid)
+		if (setuid(uid) == -1 || getuid() != uid) {
 			fatal("pppd/winbind: could not setuid to %d: %m", uid);
+		}
 		execl("/bin/sh", "sh", "-c", ntlm_auth, NULL);  
 		fatal("pppd/winbind: could not exec /bin/sh: %m");
 	}