summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-06 19:49:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-06 19:49:54 +0000
commitfac7769f64b3c5873d3d34f82364a353b1fec864 (patch)
tree6e7e84483fe4125fdda3d54522dbda049deaa737
parent6a2464136520a36be29fc64ebcf39ab59a599fad (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--ChangeLog6
-rw-r--r--session.c4
-rw-r--r--ssh.c6
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 83fd9d6f8..9c232e411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
6 - markus@cvs.openbsd.org 2002/05/16 22:02:50 6 - markus@cvs.openbsd.org 2002/05/16 22:02:50
7 [cipher.c kex.h mac.c] 7 [cipher.c kex.h mac.c]
8 fix warnings (openssl 0.9.7 requires const) 8 fix warnings (openssl 0.9.7 requires const)
9 - stevesk@cvs.openbsd.org 2002/05/16 22:09:59
10 [session.c ssh.c]
11 don't limit xauth pathlen on client side and longer print length on
12 server when debug; ok markus@
9 13
1020020604 1420020604
11 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 15 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -690,4 +694,4 @@
690 - (stevesk) entropy.c: typo in debug message 694 - (stevesk) entropy.c: typo in debug message
691 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 695 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
692 696
693$Id: ChangeLog,v 1.2145 2002/06/06 19:48:16 mouring Exp $ 697$Id: ChangeLog,v 1.2146 2002/06/06 19:49:54 mouring Exp $
diff --git a/session.c b/session.c
index 10d803e98..5f5843a3d 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.134 2002/03/29 18:59:31 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.135 2002/05/16 22:09:59 stevesk Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1014,7 +1014,7 @@ do_rc_files(Session *s, const char *shell)
1014 /* Add authority data to .Xauthority if appropriate. */ 1014 /* Add authority data to .Xauthority if appropriate. */
1015 if (debug_flag) { 1015 if (debug_flag) {
1016 fprintf(stderr, 1016 fprintf(stderr,
1017 "Running %.100s add " 1017 "Running %.500s add "
1018 "%.100s %.100s %.100s\n", 1018 "%.100s %.100s %.100s\n",
1019 options.xauth_location, s->auth_display, 1019 options.xauth_location, s->auth_display,
1020 s->auth_proto, s->auth_data); 1020 s->auth_proto, s->auth_data);
diff --git a/ssh.c b/ssh.c
index afaf20bec..f442c43af 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.170 2002/04/22 21:04:52 markus Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.171 2002/05/16 22:09:59 stevesk Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -811,10 +811,10 @@ x11_get_proto(char **_proto, char **_data)
811 * XXX: "localhost" match to determine FamilyLocal 811 * XXX: "localhost" match to determine FamilyLocal
812 * is not perfect. 812 * is not perfect.
813 */ 813 */
814 snprintf(line, sizeof line, "%.100s list unix:%s 2>" 814 snprintf(line, sizeof line, "%s list unix:%s 2>"
815 _PATH_DEVNULL, options.xauth_location, display+10); 815 _PATH_DEVNULL, options.xauth_location, display+10);
816 else 816 else
817 snprintf(line, sizeof line, "%.100s list %.200s 2>" 817 snprintf(line, sizeof line, "%s list %.200s 2>"
818 _PATH_DEVNULL, options.xauth_location, display); 818 _PATH_DEVNULL, options.xauth_location, display);
819 debug2("x11_get_proto %s", line); 819 debug2("x11_get_proto %s", line);
820 f = popen(line, "r"); 820 f = popen(line, "r");