summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--session.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 13a82b507..d823c60f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 we do already trust $HOME/.ssh 16 we do already trust $HOME/.ssh
17 you can use .ssh/sshrc and .ssh/environment if you want to customize 17 you can use .ssh/sshrc and .ssh/environment if you want to customize
18 the location of the xauth cookies 18 the location of the xauth cookies
19 - markus@cvs.openbsd.org 2001/06/12 21:30:57
20 [session.c]
21 unused
19 22
2020010612 2320010612
21 - scp.c ID update (upstream synced vfsprintf() from us) 24 - scp.c ID update (upstream synced vfsprintf() from us)
@@ -5635,4 +5638,4 @@
5635 - Wrote replacements for strlcpy and mkdtemp 5638 - Wrote replacements for strlcpy and mkdtemp
5636 - Released 1.0pre1 5639 - Released 1.0pre1
5637 5640
5638$Id: ChangeLog,v 1.1284 2001/06/13 04:41:41 mouring Exp $ 5641$Id: ChangeLog,v 1.1285 2001/06/13 04:43:52 mouring Exp $
diff --git a/session.c b/session.c
index 49db53d1d..25ad3f978 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.87 2001/06/12 21:21:29 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.88 2001/06/12 21:30:57 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1960,7 +1960,6 @@ session_proctitle(Session *s)
1960int 1960int
1961session_setup_x11fwd(Session *s) 1961session_setup_x11fwd(Session *s)
1962{ 1962{
1963 int fd;
1964 struct stat st; 1963 struct stat st;
1965 1964
1966 if (no_x11_forwarding_flag) { 1965 if (no_x11_forwarding_flag) {