- (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically

   set ownership and modes, so avoid explicitly setting them

2 files changed, 14 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5e7570484..8bec9d153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20090212
+ - (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
+   set ownership and modes, so avoid explicitly setting them
+
 20090201
  - (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in
    channels.c too, so move the definition for non-IP6 platforms to defines.h
@@ -5114,5 +5118,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5183 2009/02/01 11:19:54 dtucker Exp $
+$Id: ChangeLog,v 1.5184 2009/02/12 01:19:20 djm Exp $
 
diff --git a/sshpty.c b/sshpty.c
index 5a0d1a7ad..bbbc0fefe 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 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen)
 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. */