summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-09-11 15:18:05 +1000
committerDamien Miller <djm@mindrot.org>2004-09-11 15:18:05 +1000
commit928a19ad9e82d2098c9309553e7f6c97d7665322 (patch)
tree5e2735693b75d20e588c6bcd0d04bc926f777a7e /ssh-agent.c
parent25a1234ef71c48e52e1aa43e8af37d1261aaf937 (diff)
- (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c8
1 files changed, 0 insertions, 8 deletions
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)
1010#ifdef HAVE_SETRLIMIT 1010#ifdef HAVE_SETRLIMIT
1011 struct rlimit rlim; 1011 struct rlimit rlim;
1012#endif 1012#endif
1013#ifdef HAVE_CYGWIN
1014 int prev_mask; 1013 int prev_mask;
1015#endif
1016 extern int optind; 1014 extern int optind;
1017 extern char *optarg; 1015 extern char *optarg;
1018 pid_t pid; 1016 pid_t pid;
@@ -1129,19 +1127,13 @@ main(int ac, char **av)
1129 memset(&sunaddr, 0, sizeof(sunaddr)); 1127 memset(&sunaddr, 0, sizeof(sunaddr));
1130 sunaddr.sun_family = AF_UNIX; 1128 sunaddr.sun_family = AF_UNIX;
1131 strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path)); 1129 strlcpy(sunaddr.sun_path, socket_name, sizeof(sunaddr.sun_path));
1132#ifdef HAVE_CYGWIN
1133 prev_mask = umask(0177); 1130 prev_mask = umask(0177);
1134#endif
1135 if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) { 1131 if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) {
1136 perror("bind"); 1132 perror("bind");
1137#ifdef HAVE_CYGWIN
1138 umask(prev_mask); 1133 umask(prev_mask);
1139#endif
1140 cleanup_exit(1); 1134 cleanup_exit(1);
1141 } 1135 }
1142#ifdef HAVE_CYGWIN
1143 umask(prev_mask); 1136 umask(prev_mask);
1144#endif
1145 if (listen(sock, SSH_LISTEN_BACKLOG) < 0) { 1137 if (listen(sock, SSH_LISTEN_BACKLOG) < 0) {
1146 perror("listen"); 1138 perror("listen");
1147 cleanup_exit(1); 1139 cleanup_exit(1);