2 files changed, 4 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ffabb0510..dffdd3713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 bc4d8d33a..7bc4c240e 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);