From f391ba673043ceb9b385f8e2f068c18d88a9c987 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 2 Oct 2003 20:07:09 +1000 Subject: [PATCH] - (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations. Based on patches by Matthias Koeppe and Thomas Baden. ok djm@ --- ChangeLog | 4 +++- session.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9183c8959..188d68e94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,8 @@ - (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring --with-pam. ok djm@ - (dtucker) [ssh-gss.h] Prototype change missed in sync. + - (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations. + Based on patches by Matthias Koeppe and Thomas Baden. ok djm@ 20030930 - (bal) Fix issues in openbsd-compat/realpath.c @@ -1266,4 +1268,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.3052 2003/10/02 07:32:30 dtucker Exp $ +$Id: ChangeLog,v 1.3053 2003/10/02 10:07:09 dtucker Exp $ diff --git a/session.c b/session.c index 647be401e..ccdc4249f 100644 --- a/session.c +++ b/session.c @@ -906,7 +906,7 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid) { char **tmpenv = NULL, *var; u_int i, tmpenvsize = 0; - mode_t mask; + u_long mask; /* * We don't want to copy the whole file to the child's environment, @@ -927,7 +927,7 @@ read_etc_default_login(char ***env, u_int *envsize, uid_t uid) if ((var = child_get_env(tmpenv, "UMASK")) != NULL) if (sscanf(var, "%5lo", &mask) == 1) - umask(mask); + umask((mode_t)mask); for (i = 0; tmpenv[i] != NULL; i++) xfree(tmpenv[i]);