- (djm) CVS OpenBSD sync:

[openssh.git] / uidswap.c

diff --git a/uidswap.c b/uidswap.c
index 4213d34ecbfa85eb2968a8d14fec36442ad90b8a..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("$OpenBSD: uidswap.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
+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:
@@ -44,15 +52,15 @@ 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 */
 }
 
@@ -65,7 +73,7 @@ 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.
@@ -83,6 +91,14 @@ restore_uid()
 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));
 }