diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | cygwin_util.h | 2 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | ssh.c | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20000931 | ||
2 | - (djm) Cygwin fixes from Corinna Vinschen <vinschen@cygnus.com> | ||
3 | |||
1 | 20000930 | 4 | 20000930 |
2 | - (djm) Irix ssh_prng_cmds path fix from Pekka Savola <pekkas@netcore.fi> | 5 | - (djm) Irix ssh_prng_cmds path fix from Pekka Savola <pekkas@netcore.fi> |
3 | - (djm) Support in bsd-snprintf.c for long long conversions from | 6 | - (djm) Support in bsd-snprintf.c for long long conversions from |
diff --git a/cygwin_util.h b/cygwin_util.h index efd28bfc9..bf90d0293 100644 --- a/cygwin_util.h +++ b/cygwin_util.h | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #ifdef HAVE_CYGWIN | 18 | #ifdef HAVE_CYGWIN |
19 | 19 | ||
20 | int binary_open(const char *filename, int flags, mode_t mode); | 20 | int binary_open(const char *filename, int flags, ...); |
21 | int binary_pipe(int fd[2]); | 21 | int binary_pipe(int fd[2]); |
22 | int check_nt_auth(int pwd_authenticated, uid_t uid); | 22 | int check_nt_auth(int pwd_authenticated, uid_t uid); |
23 | int check_ntsec(const char *filename); | 23 | int check_ntsec(const char *filename); |
@@ -1327,11 +1327,13 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1327 | "Running %.100s add %.100s %.100s %.100s\n", | 1327 | "Running %.100s add %.100s %.100s %.100s\n", |
1328 | options.xauth_location, display, | 1328 | options.xauth_location, display, |
1329 | auth_proto, auth_data); | 1329 | auth_proto, auth_data); |
1330 | #ifndef HAVE_CYGWIN /* Unix sockets are not supported */ | ||
1330 | if (screen != NULL) | 1331 | if (screen != NULL) |
1331 | fprintf(stderr, | 1332 | fprintf(stderr, |
1332 | "Adding %.*s/unix%s %s %s\n", | 1333 | "Adding %.*s/unix%s %s %s\n", |
1333 | (int)(screen-display), display, | 1334 | (int)(screen-display), display, |
1334 | screen, auth_proto, auth_data); | 1335 | screen, auth_proto, auth_data); |
1336 | #endif | ||
1335 | } | 1337 | } |
1336 | snprintf(cmd, sizeof cmd, "%s -q -", | 1338 | snprintf(cmd, sizeof cmd, "%s -q -", |
1337 | options.xauth_location); | 1339 | options.xauth_location); |
@@ -1339,10 +1341,12 @@ do_child(const char *command, struct passwd * pw, const char *term, | |||
1339 | if (f) { | 1341 | if (f) { |
1340 | fprintf(f, "add %s %s %s\n", display, | 1342 | fprintf(f, "add %s %s %s\n", display, |
1341 | auth_proto, auth_data); | 1343 | auth_proto, auth_data); |
1344 | #ifndef HAVE_CYGWIN /* Unix sockets are not supported */ | ||
1342 | if (screen != NULL) | 1345 | if (screen != NULL) |
1343 | fprintf(f, "add %.*s/unix%s %s %s\n", | 1346 | fprintf(f, "add %.*s/unix%s %s %s\n", |
1344 | (int)(screen-display), display, | 1347 | (int)(screen-display), display, |
1345 | screen, auth_proto, auth_data); | 1348 | screen, auth_proto, auth_data); |
1349 | #endif | ||
1346 | pclose(f); | 1350 | pclose(f); |
1347 | } else { | 1351 | } else { |
1348 | fprintf(stderr, "Could not run %s\n", | 1352 | fprintf(stderr, "Could not run %s\n", |
@@ -244,7 +244,7 @@ main(int ac, char **av) | |||
244 | original_real_uid = getuid(); | 244 | original_real_uid = getuid(); |
245 | original_effective_uid = geteuid(); | 245 | original_effective_uid = geteuid(); |
246 | 246 | ||
247 | #if !defined(HAVE_SETRLIMIT) || !defined(HAVE_CYGWIN) | 247 | #ifdef HAVE_SETRLIMIT |
248 | /* If we are installed setuid root be careful to not drop core. */ | 248 | /* If we are installed setuid root be careful to not drop core. */ |
249 | if (original_real_uid != original_effective_uid) { | 249 | if (original_real_uid != original_effective_uid) { |
250 | struct rlimit rlim; | 250 | struct rlimit rlim; |