- (dtucker) [auth-sia.c configure.ac] Tru64 update from cmadams at hiwaay.net.

   Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA
   is enabled, rely on SIA to check for locked accounts if enabled.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index 4cce54758b109cc793437e12b00a8522d514a9e7..42d73f5f90fa2a14e65482bcca3fdd9b14010268 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
  - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c openbsd-compat/port-aix.h]
    Move AIX specific password authentication code to port-aix.c, call
    authenticate() until reenter flag is clear.
+ - (dtucker) [auth-sia.c configure.ac] Tru64 update from cmadams at hiwaay.net.
+   Use permanently_set_uid for SIA, only define DISABLE_FD_PASSING when SIA
+   is enabled, rely on SIA to check for locked accounts if enabled.  ok djm@
 
 20031121
  - (djm) OpenBSD CVS Sync

diff --git a/auth-sia.c b/auth-sia.c
index cdd39d670a0cbc0c064ee25a6d4cc7f0efe1af9b..cd2dcb8406552a445d488565d73f7f7a73751fd5 100644 (file)
--- a/auth-sia.c
+++ b/auth-sia.c
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "servconf.h"
 #include "canohost.h"
+#include "uidswap.h"
 
 #include <sia.h>
 #include <siad.h>
@@ -103,8 +104,8 @@ session_setup_sia(struct passwd *pw, char *tty)
 
        sia_ses_release(&ent);
 
-       if (setreuid(geteuid(), geteuid()) < 0)
-               fatal("setreuid: %s", strerror(errno));
+       setuid(0);
+       permanently_set_uid(pw);
 }
 
 #endif /* HAVE_OSF_SIA */

diff --git a/configure.ac b/configure.ac
index d6bcc96a9424f8e6d5042d67c498a7b5c66a1ddf..2fe49dde6ffbb6590061fcbf8d64e7d7568f68dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -409,14 +409,13 @@ mips-sony-bsd|mips-sony-newsos4)
                        LIBS="$LIBS -lsecurity -ldb -lm -laud"
                else
                        AC_MSG_RESULT(no)
+                       AC_DEFINE(LOCKED_PASSWD_SUBSTR, "Nologin")
                fi
        fi
-       AC_DEFINE(DISABLE_FD_PASSING)
        AC_DEFINE(BROKEN_GETADDRINFO)
        AC_DEFINE(SETEUID_BREAKS_SETUID)
        AC_DEFINE(BROKEN_SETREUID)
        AC_DEFINE(BROKEN_SETREGID)
-       AC_DEFINE(LOCKED_PASSWD_SUBSTR, "Nologin")
        ;;
 
 *-*-nto-qnx)