Merge branch 'fix-compiler-warnings-2' of https://github.com/enaess/ppp

[ppp.git] / pppd / tty.c

diff --git a/pppd/tty.c b/pppd/tty.c
index 41328fbaacdbb202c68a80a4f75b1e8887a85506..7e208badaff078c20c3ed8345c12778c769f5fbf 100644 (file)
--- a/pppd/tty.c
+++ b/pppd/tty.c
@@ -909,7 +909,7 @@ open_socket(char *dest)
 static int
 start_charshunt(int ifd, int ofd)
 {
-    int cpid;
+    int cpid, ret;
 
     cpid = safe_fork(ifd, ofd, (log_to_fd >= 0? log_to_fd: 2));
     if (cpid == -1) {
@@ -923,10 +923,14 @@ start_charshunt(int ifd, int ofd)
            log_to_fd = -1;
        else if (log_to_fd >= 0)
            log_to_fd = 2;
-       setgid(getgid());
-       setuid(uid);
-       if (getuid() != uid)
-           fatal("setuid failed");
+       ret = setgid(getgid());
+       if (ret != 0) {
+               fatal("setgid failed, %m");
+       }
+       ret = setuid(uid);
+       if (ret != 0 || getuid() != uid) {
+               fatal("setuid failed, %m");
+       }
        charshunt(0, 1, record_file);
        exit(0);
     }