Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync up with 2.5.1. 

this fixes backward compatibility breakage against 1.2.18 - 1.2.22.
This commit is contained in:
itojun 2001-02-19 12:13:04 +00:00
parent 10400c1d11
commit 1317273fae
5 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/dist/ssh/scp.c vendored
View File

@ -75,7 +75,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: scp.c,v 1.58 2001/02/10 15:14:11 danh Exp $");
RCSID("$OpenBSD: scp.c,v 1.59 2001/02/19 10:36:25 deraadt Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@ -785,16 +785,16 @@ sink(argc, argv)
}
vect[0] = xstrdup(np);
sink(1, vect);
if (vect[0])
xfree(vect[0]);
if (setimes) {
setimes = 0;
if (utimes(np, tv) < 0)
if (utimes(vect[0], tv) < 0)
run_err("%s: set times: %s",
np, strerror(errno));
vect[0], strerror(errno));
}
if (mod_flag)
(void) chmod(np, mode);
(void) chmod(vect[0], mode);
if (vect[0])
xfree(vect[0]);
continue;
}
omode = mode;

8
crypto/dist/ssh/serverloop.c vendored
View File

@ -35,7 +35,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.49 2001/02/15 23:19:59 markus Exp $");
RCSID("$OpenBSD: serverloop.c,v 1.50 2001/02/19 09:53:32 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
@ -70,6 +70,7 @@ static long fdout_bytes = 0; /* Number of stdout bytes read from program. */
static int stdin_eof = 0; /* EOF message received from client. */
static int fdout_eof = 0; /* EOF encountered reading from fdout. */
static int fderr_eof = 0; /* EOF encountered readung from fderr. */
static int fdin_is_tty = 0; /* fdin points to a tty. */
static int connection_in; /* Connection to client (input). */
static int connection_out; /* Connection to client (output). */
static u_int buffer_high;/* "Soft" max buffer size. */
@ -338,7 +339,7 @@ process_output(fd_set * writeset)
fdin = -1;
} else {
/* Successful write. */
if (tcgetattr(fdin, &tio) == 0 &&
if (fdin_is_tty && tcgetattr(fdin, &tio) == 0 &&
!(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
/*
* Simulate echo to reduce the impact of
@ -434,6 +435,9 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
if (fderr != -1)
set_nonblock(fderr);
if (!(datafellows & SSH_BUG_IGNOREMSG) && isatty(fdin))
fdin_is_tty = 1;
connection_in = packet_get_connection_in();
connection_out = packet_get_connection_out();

9
crypto/dist/ssh/ssh.c vendored
View File

@ -39,7 +39,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.95 2001/02/11 12:59:25 markus Exp $");
RCSID("$OpenBSD: ssh.c,v 1.96 2001/02/17 23:28:58 deraadt Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@ -378,11 +378,12 @@ main(int ac, char **av)
}
/* fallthrough */
case 'V':
fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n",
fprintf(stderr,
"%s, SSH protocols %d.%d/%d.%d, OpenSSL 0x%8.8lx\n",
SSH_VERSION,
PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1,
PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2);
fprintf(stderr, "Compiled with SSL (0x%8.8lx).\n", SSLeay());
PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
SSLeay());
if (opt == 'V')
exit(0);
break;

4
crypto/dist/ssh/sshd.8 vendored
View File

@ -34,13 +34,13 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\" $OpenBSD: sshd.8,v 1.94 2001/02/12 16:16:24 markus Exp $
.\" $OpenBSD: sshd.8,v 1.95 2001/02/17 23:48:48 deraadt Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
.Sh NAME
.Nm sshd
.Nd secure shell daemon
.Nd OpenSSH secure shell daemon
.Sh SYNOPSIS
.Nm sshd
.Op Fl diqD46

6
crypto/dist/ssh/version.h vendored
View File

@ -1,7 +1,7 @@
/* $OpenBSD: version.h,v 1.18 2001/02/16 14:26:57 markus Exp $ */
/* $OpenBSD: version.h,v 1.19 2001/02/19 10:35:23 markus Exp $ */
#define __OPENSSH_VERSION "OpenSSH_2.5.0"
#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20010217"
#define __OPENSSH_VERSION "OpenSSH_2.5.1"
#define __NETBSDSSH_VERSION "NetBSD_Secure_Shell-20010219"
/*
* it is important to retain OpenSSH version identification part, it is