diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -3,6 +3,9 @@ | |||
3 | - markus@cvs.openbsd.org 2005/09/07 08:53:53 | 3 | - markus@cvs.openbsd.org 2005/09/07 08:53:53 |
4 | [channels.c] | 4 | [channels.c] |
5 | enforce chanid != NULL; ok djm | 5 | enforce chanid != NULL; ok djm |
6 | - markus@cvs.openbsd.org 2005/09/09 19:18:05 | ||
7 | [clientloop.c] | ||
8 | typo; from mark at mcs.vuw.ac.nz, bug #1082 | ||
6 | 9 | ||
7 | 20050930 | 10 | 20050930 |
8 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype | 11 | - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype |
@@ -3043,4 +3046,4 @@ | |||
3043 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3046 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3044 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3047 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3045 | 3048 | ||
3046 | $Id: ChangeLog,v 1.3902 2005/10/03 08:03:05 dtucker Exp $ | 3049 | $Id: ChangeLog,v 1.3903 2005/10/03 08:05:26 dtucker Exp $ |
diff --git a/clientloop.c b/clientloop.c index 47f3c7ecd..da5bfd7bd 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.141 2005/07/16 01:35:24 djm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.142 2005/09/09 19:18:05 markus Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -266,7 +266,7 @@ client_x11_get_proto(const char *display, const char *xauth_path, | |||
266 | } | 266 | } |
267 | } | 267 | } |
268 | snprintf(cmd, sizeof(cmd), | 268 | snprintf(cmd, sizeof(cmd), |
269 | "%s %s%s list %s . 2>" _PATH_DEVNULL, | 269 | "%s %s%s list %s 2>" _PATH_DEVNULL, |
270 | xauth_path, | 270 | xauth_path, |
271 | generated ? "-f " : "" , | 271 | generated ? "-f " : "" , |
272 | generated ? xauthfile : "", | 272 | generated ? xauthfile : "", |