summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--session.c10
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1745e7c99..dcddd6c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,10 @@
40 [scp.c sftp.c ssh.c] 40 [scp.c sftp.c ssh.c]
41 allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp; 41 allow usernames with embedded '@', e.g. scp user@vhost@realhost:file /tmp;
42 http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@ 42 http://bugzilla.mindrot.org/show_bug.cgi?id=447; ok mouring@, millert@
43 - stevesk@cvs.openbsd.org 2002/12/04 04:36:47
44 [session.c]
45 remove xauth entries before add; PR 2994 from janjaap@stack.nl.
46 ok markus@
43 47
4420021205 4820021205
45 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org 49 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org
@@ -875,4 +879,4 @@
875 save auth method before monitor_reset_key_state(); bugzilla bug #284; 879 save auth method before monitor_reset_key_state(); bugzilla bug #284;
876 ok provos@ 880 ok provos@
877 881
878$Id: ChangeLog,v 1.2526 2002/12/23 02:14:51 mouring Exp $ 882$Id: ChangeLog,v 1.2527 2002/12/23 02:15:57 mouring Exp $
diff --git a/session.c b/session.c
index 9074525a4..ac1561756 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.150 2002/09/16 19:55:33 stevesk Exp $"); 36RCSID("$OpenBSD: session.c,v 1.151 2002/12/04 04:36:47 stevesk Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1146,8 +1146,10 @@ do_rc_files(Session *s, const char *shell)
1146 /* Add authority data to .Xauthority if appropriate. */ 1146 /* Add authority data to .Xauthority if appropriate. */
1147 if (debug_flag) { 1147 if (debug_flag) {
1148 fprintf(stderr, 1148 fprintf(stderr,
1149 "Running %.500s add " 1149 "Running %.500s remove %.100s\n",
1150 "%.100s %.100s %.100s\n", 1150 options.xauth_location, s->auth_display);
1151 fprintf(stderr,
1152 "%.500s add %.100s %.100s %.100s\n",
1151 options.xauth_location, s->auth_display, 1153 options.xauth_location, s->auth_display,
1152 s->auth_proto, s->auth_data); 1154 s->auth_proto, s->auth_data);
1153 } 1155 }
@@ -1155,6 +1157,8 @@ do_rc_files(Session *s, const char *shell)
1155 options.xauth_location); 1157 options.xauth_location);
1156 f = popen(cmd, "w"); 1158 f = popen(cmd, "w");
1157 if (f) { 1159 if (f) {
1160 fprintf(f, "remove %s\n",
1161 s->auth_display);
1158 fprintf(f, "add %s %s %s\n", 1162 fprintf(f, "add %s %s %s\n",
1159 s->auth_display, s->auth_proto, 1163 s->auth_display, s->auth_proto,
1160 s->auth_data); 1164 s->auth_data);