- (djm) CVS OpenBSD sync:

[openssh.git] / uidswap.c

diff --git a/uidswap.c b/uidswap.c
index 95ff18d6c6d892a9e51a18eaa711e54d720578ca..48026b9b4efca53750f36a2c2a0103484dc435b2 100644 (file)
--- a/uidswap.c
+++ b/uidswap.c
@@ -2,15 +2,23 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * Created: Sat Sep  9 01:56:14 1995 ylo
  * Code for uid-swapping.
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: uidswap.c,v 1.9 2000/09/07 20:27:55 deraadt Exp $");
 
 #include "ssh.h"
 #include "uidswap.h"
+#ifdef WITH_IRIX_AUDIT
+#include <sat.h>
+#endif /* WITH_IRIX_AUDIT */
 
 /*
  * Note: all these functions must work in all of the following cases:
@@ -25,16 +33,17 @@ RCSID("$Id$");
 /* Lets assume that posix saved ids also work with seteuid, even though that
    is not part of the posix specification. */
 #define SAVED_IDS_WORK_WITH_SETEUID
-#endif /* _POSIX_SAVED_IDS */
 
 /* Saved effective uid. */
 static uid_t saved_euid = 0;
 
+#endif /* _POSIX_SAVED_IDS */
+
 /*
  * Temporarily changes to the given uid.  If the effective user
  * id is not root, this does nothing.  This call cannot be nested.
  */
-void 
+void
 temporarily_use_uid(uid_t uid)
 {
 #ifdef SAVED_IDS_WORK_WITH_SETEUID
@@ -43,33 +52,34 @@ temporarily_use_uid(uid_t uid)
 
        /* Set the effective uid to the given (unprivileged) uid. */
        if (seteuid(uid) == -1)
-               debug("seteuid %d: %.100s", (int) uid, strerror(errno));
+               debug("seteuid %u: %.100s", (u_int) uid, strerror(errno));
 #else /* SAVED_IDS_WORK_WITH_SETUID */
        /* Propagate the privileged uid to all of our uids. */
        if (setuid(geteuid()) < 0)
-               debug("setuid %d: %.100s", (int) geteuid(), strerror(errno));
+               debug("setuid %u: %.100s", (u_int) geteuid(), strerror(errno));
 
        /* Set the effective uid to the given (unprivileged) uid. */
        if (seteuid(uid) == -1)
-               debug("seteuid %d: %.100s", (int) uid, strerror(errno));
+               debug("seteuid %u: %.100s", (u_int) uid, strerror(errno));
 #endif /* SAVED_IDS_WORK_WITH_SETEUID */
 }
 
 /*
  * Restores to the original uid.
  */
-void 
+void
 restore_uid()
 {
 #ifdef SAVED_IDS_WORK_WITH_SETEUID
        /* Set the effective uid back to the saved uid. */
        if (seteuid(saved_euid) < 0)
-               debug("seteuid %d: %.100s", (int) saved_euid, strerror(errno));
+               debug("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno));
 #else /* SAVED_IDS_WORK_WITH_SETEUID */
-       /* We are unable to restore the real uid to its unprivileged
-          value. */
-       /* Propagate the real uid (usually more privileged) to effective
-          uid as well. */
+       /*
+        * We are unable to restore the real uid to its unprivileged value.
+        * Propagate the real uid (usually more privileged) to effective uid
+        * as well.
+        */
        setuid(getuid());
 #endif /* SAVED_IDS_WORK_WITH_SETEUID */
 }
@@ -78,9 +88,17 @@ restore_uid()
  * Permanently sets all uids to the given uid.  This cannot be
  * called while temporarily_use_uid is effective.
  */
-void 
+void
 permanently_set_uid(uid_t uid)
 {
+#ifdef WITH_IRIX_AUDIT
+       if (sysconf(_SC_AUDIT)) {
+               debug("Setting sat id to %d", (int) uid);
+               if (satsetid(uid))
+                       debug("error setting satid: %.100s", strerror(errno));
+       }
+#endif /* WITH_IRIX_AUDIT */
+
        if (setuid(uid) < 0)
-               debug("setuid %d: %.100s", (int) uid, strerror(errno));
+               debug("setuid %u: %.100s", (u_int) uid, strerror(errno));
 }