summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e41fef034..4427664b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 [auth-krb5.c auth1.c hostfile.h monitor_wrap.c sftp-client.c sftp-int.c ssh-add.c ssh-rsa.c 20 [auth-krb5.c auth1.c hostfile.h monitor_wrap.c sftp-client.c sftp-int.c ssh-add.c ssh-rsa.c
21 sshconnect.c] 21 sshconnect.c]
22 KNF 22 KNF
23 - markus@cvs.openbsd.org 2002/11/21 23:04:33
24 [ssh.c]
25 debug->debug2
23 26
2420021205 2720021205
25 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org 28 - (djm) PERL-free fixpaths from stuge-openssh-unix-dev@cdy.org
@@ -855,4 +858,4 @@
855 save auth method before monitor_reset_key_state(); bugzilla bug #284; 858 save auth method before monitor_reset_key_state(); bugzilla bug #284;
856 ok provos@ 859 ok provos@
857 860
858$Id: ChangeLog,v 1.2520 2002/12/23 02:06:19 mouring Exp $ 861$Id: ChangeLog,v 1.2521 2002/12/23 02:08:57 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 2c589de82..ac1c1db4a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.186 2002/09/19 01:58:18 djm Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.187 2002/11/21 23:04:33 markus Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -1026,7 +1026,7 @@ ssh_session2_setup(int id, void *arg)
1026 int interactive = 0; 1026 int interactive = 0;
1027 struct termios tio; 1027 struct termios tio;
1028 1028
1029 debug("ssh_session2_setup: id %d", id); 1029 debug2("ssh_session2_setup: id %d", id);
1030 1030
1031 if (tty_flag) { 1031 if (tty_flag) {
1032 struct winsize ws; 1032 struct winsize ws;