tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
set ownership and modes, so avoid explicitly setting them
This commit is contained in:
Damien Miller 2009-02-12 12:19:20 +11:00
parent 642ebe5b51
commit 2de762456e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 20090201
- (dtucker) [defines.h sshconnect.c] INET6_ADDRSTRLEN is now needed in - (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 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 OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

9
sshpty.c
View File

@ -46,6 +46,13 @@
#define O_NOCTTY 0 #define O_NOCTTY 0
#endif #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 * 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 * 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 void
pty_release(const char *tty) pty_release(const char *tty)
{ {
#ifndef __APPLE_PRIVPTY__
if (chown(tty, (uid_t) 0, (gid_t) 0) < 0) if (chown(tty, (uid_t) 0, (gid_t) 0) < 0)
error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno)); error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno));
if (chmod(tty, (mode_t) 0666) < 0) if (chmod(tty, (mode_t) 0666) < 0)
error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno)); 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. */ /* Makes the tty the process's controlling tty and sets it to sane modes. */