summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--session.c13
-rw-r--r--sshd.c2
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0628bb08e..a4e0d739e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120000520
2 - Xauth fix from Markus Friedl <markus.friedl@informatik.uni-erlangen.de>
3
120000518 420000518
2 - Include Andre Lucas' fixprogs script. Forgot to "cvs add" it yesterday 5 - Include Andre Lucas' fixprogs script. Forgot to "cvs add" it yesterday
3 - OpenBSD CVS updates: 6 - OpenBSD CVS updates:
diff --git a/session.c b/session.c
index 23c566050..4b7404f73 100644
--- a/session.c
+++ b/session.c
@@ -1035,13 +1035,20 @@ do_child(const char *command, struct passwd * pw, const char *term,
1035 else { 1035 else {
1036 /* Add authority data to .Xauthority if appropriate. */ 1036 /* Add authority data to .Xauthority if appropriate. */
1037 if (auth_proto != NULL && auth_data != NULL) { 1037 if (auth_proto != NULL && auth_data != NULL) {
1038 if (debug_flag) 1038 char *screen = strchr(display, ':');
1039 if (debug_flag) {
1039 fprintf(stderr, "Running %.100s add %.100s %.100s %.100s\n", 1040 fprintf(stderr, "Running %.100s add %.100s %.100s %.100s\n",
1040 XAUTH_PATH, display, auth_proto, auth_data); 1041 XAUTH_PATH, display, auth_proto, auth_data);
1041 1042 if (screen != NULL)
1043 fprintf(stderr, "Adding %.*s/unix%s %s %s\n",
1044 screen-display, display, screen, auth_proto, auth_data);
1045 }
1042 f = popen(XAUTH_PATH " -q -", "w"); 1046 f = popen(XAUTH_PATH " -q -", "w");
1043 if (f) { 1047 if (f) {
1044 fprintf(f, "add %s %s %s\n", display, auth_proto, auth_data); 1048 fprintf(f, "add %s %s %s\n", display, auth_proto, auth_data);
1049 if (screen != NULL)
1050 fprintf(f, "add %.*s/unix%s %s %s\n",
1051 screen-display, display, screen, auth_proto, auth_data);
1045 pclose(f); 1052 pclose(f);
1046 } else 1053 } else
1047 fprintf(stderr, "Could not run %s -q -\n", XAUTH_PATH); 1054 fprintf(stderr, "Could not run %s -q -\n", XAUTH_PATH);
diff --git a/sshd.c b/sshd.c
index 256018f61..39fbcba40 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sshd.c,v 1.116 2000/05/17 08:20:16 markus Exp $"); 17RCSID("$OpenBSD: sshd.c,v 1.117 2000/05/18 13:27:36 djm Exp $");
18 18
19#include "xmalloc.h" 19#include "xmalloc.h"
20#include "rsa.h" 20#include "rsa.h"