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

- (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@

Browse Source
This commit is contained in:
Damien Miller 2004-09-11 15:18:05 +10:00
parent 25a1234ef7
commit 928a19ad9e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20040911
- (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@
20040830 20040830
- (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
copy required environment variables on Cygwin. Patch from vinschen at copy required environment variables on Cygwin. Patch from vinschen at
@ -1716,4 +1719,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3539 2004/08/30 11:33:02 dtucker Exp $ $Id: ChangeLog,v 1.3540 2004/09/11 05:18:05 djm Exp $

8
ssh-agent.c
View File

@ -1010,9 +1010,7 @@ main(int ac, char **av)
#ifdef HAVE_SETRLIMIT #ifdef HAVE_SETRLIMIT
struct rlimit rlim; struct rlimit rlim;
#endif #endif
#ifdef HAVE_CYGWIN
int prev_mask; int prev_mask;
#endif
extern int optind; extern int optind;
extern char *optarg; extern char *optarg;
pid_t pid; pid_t pid;
@ -1129,19 +1127,13 @@ main(int ac, char **av)
memset(&sunaddr, 0, sizeof(sunaddr)); memset(&sunaddr, 0, sizeof(sunaddr));
sunaddr.sun_family = AF_UNIX; sunaddr.sun_family = AF_UNIX;
strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path)); strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));
#ifdef HAVE_CYGWIN
prev_mask = umask(0177); prev_mask = umask(0177);
#endif
if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) {
perror("bind"); perror("bind");
#ifdef HAVE_CYGWIN
umask(prev_mask); umask(prev_mask);
#endif
cleanup_exit(1); cleanup_exit(1);
} }
#ifdef HAVE_CYGWIN
umask(prev_mask); umask(prev_mask);
#endif
if (listen(sock, SSH_LISTEN_BACKLOG) < 0) { if (listen(sock, SSH_LISTEN_BACKLOG) < 0) {
perror("listen"); perror("listen");
cleanup_exit(1); cleanup_exit(1);