X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/34826e4ae9c6255d70c702704f5f6c3874b1e3ff..04b4cc614d1778b6e9ccfd490ed4e7ff7e2baf8a:/unix/uxpty.c

diff --git a/unix/uxpty.c b/unix/uxpty.c
index 36a05fcc..2bfb85b5 100644
--- a/unix/uxpty.c
+++ b/unix/uxpty.c
@@ -335,12 +335,28 @@ static void pty_open_master(Pty pty)
     chown(pty->name, getuid(), gp ? gp->gr_gid : -1);
     chmod(pty->name, 0600);
 #else
-    pty->master_fd = open("/dev/ptmx", O_RDWR);
+
+    const int flags = O_RDWR
+#ifdef O_NOCTTY
+        | O_NOCTTY
+#endif
+        ;
+
+#ifdef HAVE_POSIX_OPENPT
+    pty->master_fd = posix_openpt(flags);
+
+    if (pty->master_fd < 0) {
+	perror("posix_openpt");
+	exit(1);
+    }
+#else
+    pty->master_fd = open("/dev/ptmx", flags);
 
     if (pty->master_fd < 0) {
 	perror("/dev/ptmx: open");
 	exit(1);
     }
+#endif
 
     if (grantpt(pty->master_fd) < 0) {
 	perror("grantpt");
@@ -515,11 +531,23 @@ void pty_pre_init(void)
 	int gid = getgid(), uid = getuid();
 	int setresgid(gid_t, gid_t, gid_t);
 	int setresuid(uid_t, uid_t, uid_t);
-	setresgid(gid, gid, gid);
-	setresuid(uid, uid, uid);
+	if (setresgid(gid, gid, gid) < 0) {
+            perror("setresgid");
+            exit(1);
+        }
+	if (setresuid(uid, uid, uid) < 0) {
+            perror("setresuid");
+            exit(1);
+        }
 #else
-	setgid(getgid());
-	setuid(getuid());
+	if (setgid(getgid()) < 0) {
+            perror("setgid");
+            exit(1);
+        }
+	if (setuid(getuid()) < 0) {
+            perror("setuid");
+            exit(1);
+        }
 #endif
     }
 }
@@ -732,21 +760,23 @@ static const char *pty_init(void *frontend, void **backend_handle, Conf *conf,
      * Stamp utmp (that is, tell the utmp helper process to do so),
      * or not.
      */
-    if (!conf_get_int(conf, CONF_stamp_utmp)) {
-	close(pty_utmp_helper_pipe);   /* just let the child process die */
-	pty_utmp_helper_pipe = -1;
-    } else if (pty_utmp_helper_pipe >= 0) {
-	char *location = get_x_display(pty->frontend);
-	int len = strlen(location)+1, pos = 0;   /* +1 to include NUL */
-	while (pos < len) {
-	    int ret = write(pty_utmp_helper_pipe, location+pos, len - pos);
-	    if (ret < 0) {
-		perror("pterm: writing to utmp helper process");
-		close(pty_utmp_helper_pipe);   /* arrgh, just give up */
-		pty_utmp_helper_pipe = -1;
-		break;
-	    }
-	    pos += ret;
+    if (pty_utmp_helper_pipe >= 0) {   /* if it's < 0, we can't anyway */
+        if (!conf_get_int(conf, CONF_stamp_utmp)) {
+            close(pty_utmp_helper_pipe);   /* just let the child process die */
+            pty_utmp_helper_pipe = -1;
+        } else {
+            char *location = get_x_display(pty->frontend);
+            int len = strlen(location)+1, pos = 0;   /* +1 to include NUL */
+            while (pos < len) {
+                int ret = write(pty_utmp_helper_pipe, location+pos, len - pos);
+                if (ret < 0) {
+                    perror("pterm: writing to utmp helper process");
+                    close(pty_utmp_helper_pipe);   /* arrgh, just give up */
+                    pty_utmp_helper_pipe = -1;
+                    break;
+                }
+                pos += ret;
+            }
 	}
     }
 #endif