diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:15:57 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-12-23 02:15:57 +0000 |
| commit | 611797ed1533f14ac2c04a2531ad90615afa6174 (patch) | |
| tree | 96ecba14e265263a04cb3970ec45184f87ad156e /session.c | |
| parent | c276c1208e43ed4305d723004ddf602fbe99513b (diff) | |
- stevesk@cvs.openbsd.org 2002/12/04 04:36:47
[session.c]
remove xauth entries before add; PR 2994 from janjaap@stack.nl.
ok markus@
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.150 2002/09/16 19:55:33 stevesk Exp $"); +RCSID("$OpenBSD: session.c,v 1.151 2002/12/04 04:36:47 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1146,8 +1146,10 @@ do_rc_files(Session *s, const char *shell) /* Add authority data to .Xauthority if appropriate. */ if (debug_flag) { fprintf(stderr, - "Running %.500s add " - "%.100s %.100s %.100s\n", + "Running %.500s remove %.100s\n", + options.xauth_location, s->auth_display); + fprintf(stderr, + "%.500s add %.100s %.100s %.100s\n", options.xauth_location, s->auth_display, s->auth_proto, s->auth_data); } @@ -1155,6 +1157,8 @@ do_rc_files(Session *s, const char *shell) options.xauth_location); f = popen(cmd, "w"); if (f) { + fprintf(f, "remove %s\n", + s->auth_display); fprintf(f, "add %s %s %s\n", s->auth_display, s->auth_proto, s->auth_data); |