diff options
author | Damien Miller <djm@mindrot.org> | 2009-02-12 12:19:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-02-12 12:19:20 +1100 |
commit | 2de762456e8cdb92b85c1e573cbf2b4b70eee847 (patch) | |
tree | 3c24fb62c3391fdbdb684390b563d97426287e90 /sshpty.c | |
parent | 642ebe5b51112862f4c041abf6064fe711f56009 (diff) | |
download | openssh-git-2de762456e8cdb92b85c1e573cbf2b4b70eee847.tar.gz |
- (djm) [sshpty.c] bz#1419: OSX uses cloning ptys that automagically
set ownership and modes, so avoid explicitly setting them
Diffstat (limited to 'sshpty.c')
-rw-r--r-- | sshpty.c | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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. */ |