- (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
set ownership and modes, so avoid explicitly setting them
diff --git a/sshpty.c b/sshpty.c
index 5a0d1a7..bbbc0fe 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -46,6 +46,13 @@
#define O_NOCTTY 0
#endif
+#ifdef __APPLE__
+# include <AvailabilityMacros.h>
+# if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+# define __APPLE_PRIVPTY__
+# endif
+#endif
+
/*
* Allocates and opens a pty. Returns 0 if no pty could be allocated, or
* nonzero if a pty was successfully allocated. On success, open file
@@ -78,10 +85,12 @@
void
pty_release(const char *tty)
{
+#ifndef __APPLE_PRIVPTY__
if (chown(tty, (uid_t) 0, (gid_t) 0) < 0)
error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno));
if (chmod(tty, (mode_t) 0666) < 0)
error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno));
+#endif /* __APPLE_PRIVPTY__ */
}
/* Makes the tty the process's controlling tty and sets it to sane modes. */