diff options
| author | Damien Miller <djm@mindrot.org> | 2004-09-11 15:18:05 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-09-11 15:18:05 +1000 |
| commit | 928a19ad9e82d2098c9309553e7f6c97d7665322 (patch) | |
| tree | 5e2735693b75d20e588c6bcd0d04bc926f777a7e | |
| parent | 25a1234ef71c48e52e1aa43e8af37d1261aaf937 (diff) | |
- (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh-agent.c | 8 |
2 files changed, 4 insertions, 9 deletions
@@ -1,3 +1,6 @@ +20040911 + - (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@ + 20040830 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only copy required environment variables on Cygwin. Patch from vinschen at @@ -1716,4 +1719,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ diff --git a/ssh-agent.c b/ssh-agent.c index bc4d8d33..7bc4c240 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1010,9 +1010,7 @@ main(int ac, char **av) #ifdef HAVE_SETRLIMIT struct rlimit rlim; #endif -#ifdef HAVE_CYGWIN int prev_mask; -#endif extern int optind; extern char *optarg; pid_t pid; @@ -1129,19 +1127,13 @@ main(int ac, char **av) memset(&sunaddr, 0, sizeof(sunaddr)); sunaddr.sun_family = AF_UNIX; strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path)); -#ifdef HAVE_CYGWIN prev_mask = umask(0177); -#endif if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { perror("bind"); -#ifdef HAVE_CYGWIN umask(prev_mask); -#endif cleanup_exit(1); } -#ifdef HAVE_CYGWIN umask(prev_mask); -#endif if (listen(sock, SSH_LISTEN_BACKLOG) < 0) { perror("listen"); cleanup_exit(1); |