- 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@

diff --git a/ChangeLog b/ChangeLog
index 08c53438e88ad93e7ec47f546d3d5a4e1eb260c4..cbbcfd88eb5f997d37fb1b92be145eb1373dc387 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/session.c b/session.c
index 10d803e989c8d747efe44ee54f695f4f8d6310fd..5f5843a3d9582832524c0d7456efaa8c783d59a3 100644 (file)
--- a/session.c
+++ b/session.c
@@ -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);

diff --git a/ssh.c b/ssh.c
index afaf20bec9dfcbaef53df523bf94b0a15b7aaa0f..f442c43af07516ae4e47394f5b83e4630c583293 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -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");