tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Merged changes from OpenBSD CVS 

- [sshd.c] session_key_int may be zero
This commit is contained in:
Damien Miller 1999-11-12 08:49:09 +11:00
parent 7c64ba3fc5
commit 776af5de4f
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,7 @@
19991112
- Merged changes from OpenBSD CVS
- [sshd.c] session_key_int may be zero
19991111 19991111
- Added (untested) Entropy Gathering Daemon (EGD) support - Added (untested) Entropy Gathering Daemon (EGD) support
- Fixed fd leak - Fixed fd leak
@ -15,7 +19,12 @@
[ssh.1 ssh.c ssh.h sshd.8] [ssh.1 ssh.c ssh.h sshd.8]
add LogLevel {QUIET, FATAL, ERROR, INFO, CHAT, DEBUG} to ssh/sshd, add LogLevel {QUIET, FATAL, ERROR, INFO, CHAT, DEBUG} to ssh/sshd,
obsoletes QuietMode and FascistLogging in sshd. obsoletes QuietMode and FascistLogging in sshd.
- [sshd.c] fix fatal/assert() bug reported by damien@ibs.com.au:
allow session_key_int != sizeof(session_key)
[this should fix the pre-assert-removal-core-files]
- Updated default config file to use new LogLevel option and to improve
readability
19991110 19991110
- Merged several minor fixed: - Merged several minor fixed:
- ssh-agent commandline parsing - ssh-agent commandline parsing

2
configure.in
View File

@ -59,7 +59,7 @@ AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h)
dnl Checks for library functions. dnl Checks for library functions.
AC_PROG_GCC_TRADITIONAL AC_PROG_GCC_TRADITIONAL
AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle) AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin)
dnl Check for ut_host field in utmp dnl Check for ut_host field in utmp
AC_MSG_CHECKING([whether utmp.h has ut_host field]) AC_MSG_CHECKING([whether utmp.h has ut_host field])

25
sshd.c
View File

@ -18,7 +18,7 @@ agent connections.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: sshd.c,v 1.14 1999/11/11 09:44:05 damien Exp $"); RCSID("$Id: sshd.c,v 1.15 1999/11/11 21:49:09 damien Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "rsa.h" #include "rsa.h"
@ -1025,7 +1025,7 @@ void do_connection(int privileged_port)
key is in the highest bits. */ key is in the highest bits. */
BN_mask_bits(session_key_int, sizeof(session_key) * 8); BN_mask_bits(session_key_int, sizeof(session_key) * 8);
len = BN_num_bytes(session_key_int); len = BN_num_bytes(session_key_int);
if (len <= 0 || len > sizeof(session_key)) if (len < 0 || len > sizeof(session_key))
fatal("do_connection: bad len: session_key_int %d > sizeof(session_key) %d", fatal("do_connection: bad len: session_key_int %d > sizeof(session_key) %d",
len, sizeof(session_key)); len, sizeof(session_key));
memset(session_key, 0, sizeof(session_key)); memset(session_key, 0, sizeof(session_key));
@ -1516,11 +1516,11 @@ do_authentication(char *user, int privileged_port)
packet_disconnect("Too many authentication failures for %.100s from %.200s", packet_disconnect("Too many authentication failures for %.100s from %.200s",
pw->pw_name, get_canonical_hostname()); pw->pw_name, get_canonical_hostname());
} }
/* Send a message indicating that the authentication attempt failed. */ /* Send a message indicating that the authentication attempt failed. */
packet_start(SSH_SMSG_FAILURE); packet_start(SSH_SMSG_FAILURE);
packet_send(); packet_send();
packet_write_wait(); packet_write_wait();
} }
/* Check if the user is logging in as root and root logins are disallowed. */ /* Check if the user is logging in as root and root logins are disallowed. */
@ -2296,7 +2296,13 @@ void do_child(const char *command, struct passwd *pw, const char *term,
if (pw->pw_uid != 0) if (pw->pw_uid != 0)
exit(254); exit(254);
} }
#endif #endif /* HAVE_LIBPAM */
#ifdef HAVE_SETLOGIN
/* Set login name in the kernel. */
if (setlogin(pw->pw_name) < 0)
error("setlogin failed: %s", strerror(errno));
#endif /* HAVE_SETLOGIN */
/* Set uid, gid, and groups. */ /* Set uid, gid, and groups. */
/* Login(1) does this as well, and it needs uid 0 for the "-h" switch, /* Login(1) does this as well, and it needs uid 0 for the "-h" switch,
@ -2403,10 +2409,10 @@ void do_child(const char *command, struct passwd *pw, const char *term,
#ifdef KRB4 #ifdef KRB4
{ {
extern char *ticket; extern char *ticket;
if (ticket) if (ticket)
child_set_env(&env, &envsize, "KRBTKFILE", ticket); child_set_env(&env, &envsize, "KRBTKFILE", ticket);
} }
#endif /* KRB4 */ #endif /* KRB4 */
@ -2440,7 +2446,7 @@ void do_child(const char *command, struct passwd *pw, const char *term,
if (auth_get_socket_name() != NULL) if (auth_get_socket_name() != NULL)
child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME, child_set_env(&env, &envsize, SSH_AUTHSOCKET_ENV_NAME,
auth_get_socket_name()); auth_get_socket_name());
/* Read $HOME/.ssh/environment. */ /* Read $HOME/.ssh/environment. */
if(!options.use_login) { if(!options.use_login) {
snprintf(buf, sizeof buf, "%.200s/.ssh/environment", pw->pw_dir); snprintf(buf, sizeof buf, "%.200s/.ssh/environment", pw->pw_dir);
@ -2578,7 +2584,6 @@ void do_child(const char *command, struct passwd *pw, const char *term,
} }
} }
} }
/* Start the shell. Set initial character to '-'. */ /* Start the shell. Set initial character to '-'. */
buf[0] = '-'; buf[0] = '-';
strncpy(buf + 1, cp, sizeof(buf) - 1); strncpy(buf + 1, cp, sizeof(buf) - 1);