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

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

View File

@ -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 $

View File

@ -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);