- (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations.

   Based on patches by Matthias Koeppe and Thomas Baden.  ok djm@

2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 70e03de1..b0d92c04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
      [progressmeter.c]
      don't print trailing \0; bug #709; Robert.Dahlem@siemens.com
      ok millert/deraadt@
+ - (dtucker) [session.c] Fix bus errors on some 64-bit Solaris configurations.
+   Based on patches by Matthias Koeppe and Thomas Baden.  ok djm@
 
 20030925
  - (dtucker) [configure.ac openbsd-compat/xcrypt.c] Bug #633: Remove
@@ -1200,4 +1202,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.2994.2.36 2003/10/02 06:44:13 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.37 2003/10/02 10:09:18 dtucker Exp $
diff --git a/session.c b/session.c
index 2898ac51..73e534b7 100644
--- a/session.c
+++ b/session.c
@@ -915,7 +915,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,
@@ -936,7 +936,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]);