diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 19:49:54 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-06 19:49:54 +0000 |
commit | fac7769f64b3c5873d3d34f82364a353b1fec864 (patch) | |
tree | 6e7e84483fe4125fdda3d54522dbda049deaa737 | |
parent | 6a2464136520a36be29fc64ebcf39ab59a599fad (diff) |
- stevesk@cvs.openbsd.org 2002/05/16 22:09:59
[session.c ssh.c]
don't limit xauth pathlen on client side and longer print length on
server when debug; ok markus@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | ssh.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -6,6 +6,10 @@ - markus@cvs.openbsd.org 2002/05/16 22:02:50 [cipher.c kex.h mac.c] fix warnings (openssl 0.9.7 requires const) + - stevesk@cvs.openbsd.org 2002/05/16 22:09:59 + [session.c ssh.c] + don't limit xauth pathlen on client side and longer print length on + server when debug; ok markus@ 20020604 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed @@ -690,4 +694,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2145 2002/06/06 19:48:16 mouring Exp $ +$Id: ChangeLog,v 1.2146 2002/06/06 19:49:54 mouring Exp $ @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.134 2002/03/29 18:59:31 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.135 2002/05/16 22:09:59 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1014,7 +1014,7 @@ do_rc_files(Session *s, const char *shell) /* Add authority data to .Xauthority if appropriate. */ if (debug_flag) { fprintf(stderr, - "Running %.100s add " + "Running %.500s add " "%.100s %.100s %.100s\n", options.xauth_location, s->auth_display, s->auth_proto, s->auth_data); @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.170 2002/04/22 21:04:52 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.171 2002/05/16 22:09:59 stevesk Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -811,10 +811,10 @@ x11_get_proto(char **_proto, char **_data) * XXX: "localhost" match to determine FamilyLocal * is not perfect. */ - snprintf(line, sizeof line, "%.100s list unix:%s 2>" + snprintf(line, sizeof line, "%s list unix:%s 2>" _PATH_DEVNULL, options.xauth_location, display+10); else - snprintf(line, sizeof line, "%.100s list %.200s 2>" + snprintf(line, sizeof line, "%s list %.200s 2>" _PATH_DEVNULL, options.xauth_location, display); debug2("x11_get_proto %s", line); f = popen(line, "r"); |