- (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref

when /etc/default/login doesn't exist or isn't readable.  Fixes from
   jparsons-lists at saffron.net and georg.oppenberg at deu mci com.
This commit is contained in:
Darren Tucker 2003-09-19 20:56:51 +10:00
parent 91acbf211c
commit c11b1e8420
2 changed files with 8 additions and 3 deletions

View File

@ -8,6 +8,9 @@
- (djm) Bug #646: Fix location of x11-ssh-askpass; Jim
- (dtucker) [openbsd-compat/port-aix.h] Bug #640: Don't include audit.h
unless required. Reorder to reduce warnings.
- (dtucker) [session.c] Bug #643: Fix size_t -> u_int and fix null deref
when /etc/default/login doesn't exist or isn't readable. Fixes from
jparsons-lists at saffron.net and georg.oppenberg at deu mci com.
20030918
- (djm) Bug #652: Fix empty password auth
@ -1129,4 +1132,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3006 2003/09/19 10:43:38 dtucker Exp $
$Id: ChangeLog,v 1.3007 2003/09/19 10:56:51 dtucker Exp $

View File

@ -912,8 +912,7 @@ static void
read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
{
char **tmpenv = NULL, *var;
u_int i;
size_t tmpenvsize = 0;
u_int i, tmpenvsize = 0;
mode_t mask;
/*
@ -923,6 +922,9 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid)
*/
read_environment_file(&tmpenv, &tmpenvsize, "/etc/default/login");
if (tmpenv == NULL)
return;
if (uid == 0)
var = child_get_env(tmpenv, "SUPATH");
else