зеркало из https://github.com/Azure/sonic-openssh.git
- (djm) OpenBSD CVS Updates:
- deraadt@cvs.openbsd.org 2000/07/11 02:11:34 [session.c sshd.c ] make MaxStartups code still work with -d; djm - deraadt@cvs.openbsd.org 2000/07/11 13:17:45 [readconf.c ssh_config] disable FallBackToRsh by default
This commit is contained in:
Родитель
b2dc28e9c8
Коммит
182ee6e6d9
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
20000712
|
||||
- Remove -lresolve for Reliant Unix
|
||||
- (djm) OpenBSD CVS Updates:
|
||||
- deraadt@cvs.openbsd.org 2000/07/11 02:11:34
|
||||
[session.c sshd.c ]
|
||||
make MaxStartups code still work with -d; djm
|
||||
- deraadt@cvs.openbsd.org 2000/07/11 13:17:45
|
||||
[readconf.c ssh_config]
|
||||
disable FallBackToRsh by default
|
||||
|
||||
20000711
|
||||
- (djm) Fixup for AIX getuserattr() support from Tom Bertelson
|
||||
<tbert@abac.com>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: readconf.c,v 1.40 2000/07/10 16:27:05 ho Exp $");
|
||||
RCSID("$OpenBSD: readconf.c,v 1.41 2000/07/11 19:17:44 deraadt Exp $");
|
||||
|
||||
#include "ssh.h"
|
||||
#include "cipher.h"
|
||||
|
@ -739,7 +739,7 @@ fill_default_options(Options * options)
|
|||
if (options->rhosts_rsa_authentication == -1)
|
||||
options->rhosts_rsa_authentication = 1;
|
||||
if (options->fallback_to_rsh == -1)
|
||||
options->fallback_to_rsh = 1;
|
||||
options->fallback_to_rsh = 0;
|
||||
if (options->use_rsh == -1)
|
||||
options->use_rsh = 0;
|
||||
if (options->batch_mode == -1)
|
||||
|
|
10
session.c
10
session.c
|
@ -8,7 +8,7 @@
|
|||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: session.c,v 1.22 2000/07/05 20:18:07 deraadt Exp $");
|
||||
RCSID("$OpenBSD: session.c,v 1.23 2000/07/11 08:11:33 deraadt Exp $");
|
||||
|
||||
#include "xmalloc.h"
|
||||
#include "ssh.h"
|
||||
|
@ -169,8 +169,10 @@ do_authenticated(struct passwd * pw)
|
|||
* authentication.
|
||||
*/
|
||||
alarm(0);
|
||||
if (startup_pipe != -1)
|
||||
if (startup_pipe != -1) {
|
||||
close(startup_pipe);
|
||||
startup_pipe = -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Inform the channel mechanism that we are the server side and that
|
||||
|
@ -1793,8 +1795,10 @@ do_authenticated2(void)
|
|||
* authentication.
|
||||
*/
|
||||
alarm(0);
|
||||
if (startup_pipe != -1)
|
||||
if (startup_pipe != -1) {
|
||||
close(startup_pipe);
|
||||
startup_pipe = -1;
|
||||
}
|
||||
server_loop2();
|
||||
if (xauthfile)
|
||||
xauthfile_cleanup_proc(NULL);
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# RhostsRSAAuthentication yes
|
||||
# RSAAuthentication yes
|
||||
# PasswordAuthentication yes
|
||||
# FallBackToRsh yes
|
||||
# FallBackToRsh no
|
||||
# UseRsh no
|
||||
# BatchMode no
|
||||
# CheckHostIP yes
|
||||
|
|
4
sshd.c
4
sshd.c
|
@ -14,7 +14,7 @@
|
|||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshd.c,v 1.121 2000/07/05 21:35:56 provos Exp $");
|
||||
RCSID("$OpenBSD: sshd.c,v 1.122 2000/07/11 08:11:34 deraadt Exp $");
|
||||
|
||||
#include "xmalloc.h"
|
||||
#include "rsa.h"
|
||||
|
@ -854,8 +854,8 @@ main(int ac, char **av)
|
|||
close_listen_socks();
|
||||
sock_in = newsock;
|
||||
sock_out = newsock;
|
||||
pid = getpid();
|
||||
startup_pipe = -1;
|
||||
pid = getpid();
|
||||
break;
|
||||
} else {
|
||||
/*
|
||||
|
|
Загрузка…
Ссылка в новой задаче