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

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

diff --git a/ChangeLog b/ChangeLog
index 692e7a6bbab1217406898d9db7a46cace00719fa..4e1430e03a6df00d35929b92357c1004d6a5b688 100644 (file)
--- 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

diff --git a/session.c b/session.c
index 647be401ef15d759bb744db62cae62ea4789d3c3..ccdc4249f3cf79bc6a91579a24e0531c8ffed148 100644 (file)
--- 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]);