Debian release 3.5p1-1.

32 files changed, 964 insertions, 215 deletions

diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 3e09cfefe..5229e7e20 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.21 2002/02/19 20:27:57 mouring Exp $
+# $Id: Makefile.in,v 1.23 2002/09/12 00:33:02 djm Exp $
 
 sysconfdir=@sysconfdir@
 piddir=@piddir@
@@ -18,7 +18,7 @@ LDFLAGS=-L. @LDFLAGS@
 
 OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o
 
-COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o
+COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o xmmap.o
 
 PORTS=port-irix.o port-aix.o
 
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c
index d12b993b7..005170b80 100644
--- a/openbsd-compat/base64.c
+++ b/openbsd-compat/base64.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $      */
+/*      $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -42,7 +42,7 @@
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
 
@@ -60,6 +60,7 @@
 
 #include "base64.h"
 
+/* XXX abort illegal in library */
 #define Assert(Cond) if (!(Cond)) abort()
 
 static const char Base64[] =
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 332bcb016..620f980ed 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -29,7 +29,7 @@
  * Mountain View, California  94043
  */
 
-#include "config.h"
+#include "includes.h"
 
 #ifndef HAVE_BINDRESVPORT_SA
 
diff --git a/openbsd-compat/bsd-cray.c b/openbsd-compat/bsd-cray.c
index 9bab75b41..edb3112b3 100644
--- a/openbsd-compat/bsd-cray.c
+++ b/openbsd-compat/bsd-cray.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.c,v 1.6 2002/05/15 16:39:51 mouring Exp $
+ * $Id: bsd-cray.c,v 1.8 2002/09/26 00:38:51 tim Exp $
  *
  * bsd-cray.c
  *
@@ -34,8 +34,8 @@
  * on UNICOS systems.
  *
  */
+#ifdef _UNICOS
 
-#ifdef _CRAY
 #include <udb.h>
 #include <tmpdir.h>
 #include <unistd.h>
@@ -45,19 +45,33 @@
 #include <signal.h>
 #include <sys/priv.h>
 #include <sys/secparm.h>
+#include <sys/tfm.h>
 #include <sys/usrv.h>
 #include <sys/sysv.h>
 #include <sys/sectab.h>
+#include <sys/secstat.h>
 #include <sys/stat.h>
+#include <sys/session.h>
 #include <stdlib.h>
 #include <pwd.h>
 #include <fcntl.h>
 #include <errno.h>
-
+#include <ia.h>
+#include <urm.h>
+#include "ssh.h"
+#include "log.h"
+#include "servconf.h"
 #include "bsd-cray.h"
 
+#define MAXACID 80
+
+extern ServerOptions options;
+
 char cray_tmpdir[TPATHSIZ+1];               /* job TMPDIR path */
 
+struct          sysv sysv;      /* system security structure */
+struct          usrv usrv;      /* user   security structure */
+
 /*
  * Functions.
  */
@@ -65,68 +79,538 @@ void cray_retain_utmp(struct utmp *, int);
 void cray_delete_tmpdir(char *, int, uid_t);
 void cray_init_job(struct passwd *);
 void cray_set_tmpdir(struct utmp *);
+void cray_login_failure(char *, int);
+int cray_setup(uid_t, char *, const char *);
+int cray_access_denied(char *);
+
+void
+cray_login_failure(char *username, int errcode)
+{
+        struct udb      *ueptr;         /* UDB pointer for username */
+        ia_failure_t    fsent;          /* ia_failure structure */
+        ia_failure_ret_t fret;          /* ia_failure return stuff */
+        struct jtab     jtab;           /* job table structure */
+        int             jid = 0;        /* job id */
+
+        if ((jid = getjtab(&jtab)) < 0) {
+                debug("cray_login_failure(): getjtab error");
+        }
+        getsysudb();
+        if ((ueptr = getudbnam(username)) == UDB_NULL) {
+                debug("cray_login_failure(): getudbname() returned NULL");
+        }
+        endudb();
+        fsent.revision  = 0;
+        fsent.uname     = username;
+        fsent.host      = (char *)get_canonical_hostname(options.verify_reverse_mapping);
+        fsent.ttyn      = "sshd";
+        fsent.caller    = IA_SSHD;
+        fsent.flags     = IA_INTERACTIVE;
+        fsent.ueptr     = ueptr;
+        fsent.jid       = jid;
+        fsent.errcode   = errcode;
+        fsent.pwdp      = NULL;
+        fsent.exitcode  = 0;    /* dont exit in ia_failure() */
+
+        fret.revision   = 0;
+        fret.normal     = 0;
 
+        /*
+         * Call ia_failure because of an login failure.
+         */
+        ia_failure(&fsent,&fret);
+}
 
 /*
- * Orignal written by:
- *     Wayne Schroeder
- *     San Diego Supercomputer Center
- *     schroeder@sdsc.edu
-*/
-void
-cray_setup(uid_t uid, char *username)
+ *  Cray access denied
+ */
+int
+cray_access_denied(char *username)
 {
-        struct udb *p;
+        struct udb      *ueptr;         /* UDB pointer for username */
+        int             errcode;        /* IA errorcode */
+
+        errcode = 0;
+        getsysudb();
+        if ((ueptr = getudbnam(username)) == UDB_NULL) {
+                debug("cray_login_failure(): getudbname() returned NULL");
+        }
+        endudb();
+        if (ueptr && ueptr->ue_disabled)
+                errcode = IA_DISABLED;
+        if (errcode)
+                cray_login_failure(username, errcode);
+        return (errcode);
+}
+
+int
+cray_setup (uid_t uid, char *username, const char *command)
+{
+        extern struct udb *getudb();
         extern char *setlimits();
-        int i, j;
-        int accts[MAXVIDS];
-        int naccts;
-        int err;
-        char *sr;
-        int pid;
-        struct jtab jbuf;
-        int jid;
 
-        if ((jid = getjtab(&jbuf)) < 0)
-                fatal("getjtab: no jid");
-
-        err = setudb();    /* open and rewind the Cray User DataBase */
-        if (err != 0)
-                fatal("UDB open failure");
-        naccts = 0;
-        p = getudbnam(username);
-        if (p == NULL)
-                fatal("No UDB entry for %.100s", username);
-        if (uid != p->ue_uid)
-                fatal("UDB entry %.100s uid(%d) does not match uid %d",
-                    username, (int) p->ue_uid, (int) uid);
-        for (j = 0; p->ue_acids[j] != -1 && j < MAXVIDS; j++) {
-                accts[naccts] = p->ue_acids[j];
-                naccts++;
+        int err;                      /* error return */
+        time_t          system_time;    /* current system clock */
+        time_t          expiration_time; /* password expiration time */
+        int             maxattempts;    /* maximum no. of failed login attempts */
+        int             SecureSys;      /* unicos security flag */
+        int             minslevel = 0;  /* system minimum security level */
+        int             i, j;
+        int             valid_acct = -1; /* flag for reading valid acct */
+        char acct_name[MAXACID]  = { "" }; /* used to read acct name */
+        struct          jtab jtab;      /* Job table struct */
+        struct          udb ue;         /* udb entry for logging-in user */
+        struct          udb *up;        /* pointer to UDB entry */
+        struct          secstat secinfo; /* file  security attributes */
+        struct          servprov init_info; /* used for sesscntl() call */
+        int             jid;            /* job ID */
+        int             pid;            /* process ID */
+        char            *sr;            /* status return from setlimits() */
+        char            *ttyn = NULL;   /* ttyname or command name*/
+        char            hostname[MAXHOSTNAMELEN];
+        passwd_t        pwdacm,
+                        pwddialup,
+                        pwdudb,
+                        pwdwal,
+                        pwddce;         /* passwd stuff for ia_user */
+        ia_user_ret_t   uret;           /* stuff returned from ia_user */
+        ia_user_t       usent;          /* ia_user main structure */
+        int             ia_rcode;       /* ia_user return code */
+        ia_failure_t    fsent;          /* ia_failure structure */
+        ia_failure_ret_t fret;          /* ia_failure return stuff */
+        ia_success_t    ssent;          /* ia_success structure */
+        ia_success_ret_t sret;          /* ia_success return stuff */
+        int             ia_mlsrcode;    /* ia_mlsuser return code */
+        int             secstatrc;      /* [f]secstat return code */
+
+        if (SecureSys = (int)sysconf(_SC_CRAY_SECURE_SYS)) {
+                getsysv(&sysv, sizeof(struct sysv));
+                minslevel = sysv.sy_minlvl;
+                if (getusrv(&usrv) < 0) {
+                        debug("getusrv() failed, errno = %d",errno);
+                        exit(1);
+                }
         }
-        endudb();        /* close the udb */
-
-        if (naccts != 0) {
-                /* Perhaps someday we'll prompt users who have multiple accounts
-                   to let them pick one (like CRI's login does), but for now just set
-                   the account to the first entry. */
-                if (acctid(0, accts[0]) < 0)
-                        fatal("System call acctid failed, accts[0]=%d", accts[0]);
+        hostname[0] = '\0';
+        strncpy(hostname,
+           (char *)get_canonical_hostname(options.verify_reverse_mapping),
+           MAXHOSTNAMELEN);
+        /*
+         *  Fetch user's UDB entry.
+         */
+        getsysudb();
+        if ((up = getudbnam(username)) == UDB_NULL) {
+                debug("cannot fetch user's UDB entry");
+                exit(1);
+        }
+
+        /*
+         *  Prevent any possible fudging so perform a data
+         *  safety check and compare the supplied uid against
+         *  the udb's uid.
+         */
+        if (up->ue_uid != uid) {
+                debug("IA uid missmatch");
+                exit(1);
+        }
+        endudb();
+
+        if ((jid = getjtab (&jtab)) < 0) {
+                debug("getjtab");
+                return -1;
+        }
+        pid = getpid();
+        ttyn = ttyname(0);
+        if (SecureSys) {
+                if (ttyn) {
+                        secstatrc = secstat(ttyn, &secinfo);
+                } else {
+                        secstatrc = fsecstat(1, &secinfo);
+                }
+                if (secstatrc == 0) {
+                        debug("[f]secstat() successful");
+                } else {
+                        debug("[f]secstat() error, rc = %d", secstatrc);
+                        exit(1);
+                }
+        }
+        if ((ttyn == NULL) && ((char *)command != NULL))
+                ttyn = (char *)command;
+        /*
+         *  Initialize all structures to call ia_user
+         */
+        usent.revision = 0;
+        usent.uname    = username;
+        usent.host     = hostname;
+        usent.ttyn     = ttyn;
+        usent.caller   = IA_SSHD; 
+        usent.pswdlist = &pwdacm;
+        usent.ueptr    = &ue;
+        usent.flags    = IA_INTERACTIVE | IA_FFLAG;
+        pwdacm.atype   = IA_SECURID;
+        pwdacm.pwdp    = NULL;
+        pwdacm.next    = &pwdudb;
+
+        pwdudb.atype   = IA_UDB;
+        pwdudb.pwdp    = NULL;
+        pwdudb.next    = &pwddce;
+
+        pwddce.atype   = IA_DCE;
+        pwddce.pwdp    = NULL;
+        pwddce.next    = &pwddialup;
+
+        pwddialup.atype = IA_DIALUP;
+        pwddialup.pwdp  = NULL;
+        /* pwddialup.next  = &pwdwal; */
+        pwddialup.next  = NULL;
+
+        pwdwal.atype = IA_WAL;
+        pwdwal.pwdp  = NULL;
+        pwdwal.next  = NULL;
+
+        uret.revision = 0;
+        uret.pswd     = NULL;
+        uret.normal   = 0;
+
+        ia_rcode = ia_user(&usent, &uret);
+
+        switch (ia_rcode) {
+                /*
+                 *  These are acceptable return codes from ia_user()
+                 */
+                case IA_UDBWEEK:        /* Password Expires in 1 week */
+                     expiration_time = ue.ue_pwage.time + ue.ue_pwage.maxage;
+                     printf ("WARNING - your current password will expire %s\n",
+                     ctime((const time_t *)&expiration_time));
+                     break;
+                case IA_UDBEXPIRED:
+                     if (ttyname(0) != NULL) {
+                     /* Force a password change */
+                         printf("Your password has expired; Choose a new one.\n");
+                         execl("/bin/passwd", "passwd", username, 0);
+                         exit(9);
+                     }
+
+                     break;
+                case IA_NORMAL:         /* Normal Return Code */
+                     break;
+                case IA_BACKDOOR:
+                     strcpy(ue.ue_name, "root");
+                     strcpy(ue.ue_passwd, "");
+                     strcpy(ue.ue_dir, "/");
+                     strcpy(ue.ue_shell, "/bin/sh");
+                     strcpy(ue.ue_age, "");
+                     strcpy(ue.ue_comment, "");
+                     strcpy(ue.ue_loghost, "");
+                     strcpy(ue.ue_logline, "");
+                     ue.ue_uid=-1;
+                     ue.ue_nice[UDBRC_INTER]=0;
+                     for (i=0;i<MAXVIDS;i++)
+                         ue.ue_gids[i]=0;
+                     ue.ue_logfails=0;
+                     ue.ue_minlvl=minslevel; 
+                     ue.ue_maxlvl=minslevel;
+                     ue.ue_deflvl=minslevel;
+                     ue.ue_defcomps=0;
+                     ue.ue_comparts=0;
+                     ue.ue_permits=0;
+                     ue.ue_trap=0;
+                     ue.ue_disabled=0;
+                     ue.ue_logtime=0;
+                     break;
+                case IA_CONSOLE:        /* Superuser not from Console */
+                case IA_TRUSTED:        /* Trusted user */
+                     if (options.permit_root_login > PERMIT_NO)
+                        break;          /* Accept root login */
+                default:
+                /*
+                 *  These are failed return codes from ia_user()
+                 */
+                     switch (ia_rcode) 
+                       {
+                       case IA_BADAUTH:
+                         printf ("Bad authorization, access denied.\n");
+                         break;
+                       case IA_DIALUPERR:
+                         break;
+                       case IA_DISABLED:
+                         printf ("Your login has been disabled. Contact the system ");
+                         printf ("administrator for assistance.\n");
+                         break;
+                       case IA_GETSYSV:
+                         printf ("getsysv() failed - errno = %d\n", errno);
+                         break;
+                       case IA_LOCALHOST:
+                         break;
+                       case IA_MAXLOGS:
+                         printf ("Maximum number of failed login attempts exceeded.\n");
+                         printf ("Access denied.\n");
+                         break;
+                       case IA_NOPASS:
+                         break;
+                       case IA_PUBLIC:
+                         break;
+                       case IA_SECURIDERR:
+                         break;
+                       case IA_CONSOLE:
+                         break;
+                       case IA_TRUSTED:
+                         break;
+                       case IA_UDBERR:
+                         break;
+                       case IA_UDBPWDNULL:
+                         /* 
+                          * NULL password not allowed on MLS systems
+                          */
+                         if (SecureSys) {
+                           printf("NULL Password not allowed on MLS systems.\n");
+                         }
+                         break;
+                       case IA_UNKNOWN:
+                         break;
+                       case IA_UNKNOWNYP:
+                         break;
+                       case IA_WALERR:
+                         break;
+                       default:
+                         /* nothing special */
+                         ;
+                       }   /* 2. switch  (ia_rcode) */
+                     /*
+                      *  Authentication failed.
+                      */
+                     printf("sshd: Login incorrect, (0%o)\n",
+                            ia_rcode-IA_ERRORCODE);
+                     
+                     /*
+                      *  Initialize structure for ia_failure
+                      *  which will exit.
+                      */
+                     fsent.revision = 0;
+                     fsent.uname    = username;
+                     fsent.host     = hostname;
+                     fsent.ttyn     = ttyn;
+                     fsent.caller   = IA_SSHD;
+                     fsent.flags    = IA_INTERACTIVE;
+                     fsent.ueptr    = &ue;
+                     fsent.jid      = jid;
+                     fsent.errcode  = ia_rcode;
+                     fsent.pwdp     = uret.pswd;
+                     fsent.exitcode = 1;
+                     
+                     fret.revision  = 0;
+                     fret.normal    = 0;
+                     
+                     /*
+                      *  Call ia_failure because of an IA failure.
+                      *  There is no return because ia_failure exits.
+                      */
+        
+                     ia_failure(&fsent,&fret);
+
+                     exit(1); 
+        }   /* 1. switch  (ia_rcode) */
+        ia_mlsrcode = IA_NORMAL;
+        if (SecureSys) {
+                debug("calling ia_mlsuser()");
+                ia_mlsrcode = ia_mlsuser (&ue, &secinfo, &usrv, NULL, 0);
+        }
+        if (ia_mlsrcode != IA_NORMAL) {
+                printf("sshd: Login incorrect, (0%o)\n",
+                ia_mlsrcode-IA_ERRORCODE);
+                /*
+                 *  Initialize structure for ia_failure
+                 *  which will exit.
+                */
+                fsent.revision = 0;
+                fsent.uname    = username;
+                fsent.host     = hostname;
+                fsent.ttyn     = ttyn;
+                fsent.caller   = IA_SSHD;
+                fsent.flags    = IA_INTERACTIVE;
+                fsent.ueptr    = &ue;
+                fsent.jid      = jid;
+                fsent.errcode  = ia_mlsrcode;
+                fsent.pwdp     = uret.pswd;
+                fsent.exitcode = 1;
+                fret.revision  = 0;
+                fret.normal    = 0;
+
+                /*
+                *  Call ia_failure because of an IA failure.
+                *  There is no return because ia_failure exits.
+                */
+                ia_failure(&fsent,&fret);
+                exit(1); 
         }
 
-        /* Now set limits, including CPU time for the (interactive) job and process,
-           and set up permissions (for chown etc), etc.  This is via an internal CRI
-           routine, setlimits, used by CRI's login. */
+        /* Provide login status information */
+        if (options.print_lastlog && ue.ue_logtime != 0) {
+            printf("Last successful login was : %.*s ",
+                    19, (char *)ctime(&ue.ue_logtime));
+  
+           if (*ue.ue_loghost != '\0')
+                printf("from %.*s\n", sizeof(ue.ue_loghost), ue.ue_loghost);
+ 
+            else printf("on %.*s\n", sizeof(ue.ue_logline), ue.ue_logline);
+ 
+            if ( SecureSys && (ue.ue_logfails != 0)) 
+                printf("  followed by %d failed attempts\n", ue.ue_logfails);
+        }
+
+        
+        /*
+         * Call ia_success to process successful I/A.
+         */
+        ssent.revision = 0;
+        ssent.uname = username;
+        ssent.host = hostname;
+        ssent.ttyn = ttyn;
+        ssent.caller = IA_SSHD;
+        ssent.flags = IA_INTERACTIVE;
+        ssent.ueptr = &ue;
+        ssent.jid = jid;
+        ssent.errcode = ia_rcode;
+        ssent.us = NULL;
+        ssent.time = 1;                  /* Set ue_logtime */
+
+        sret.revision = 0;
+        sret.normal = 0;
+
+        ia_success(&ssent,&sret);
+
+        /*
+         * Query for account, iff > 1 valid acid & askacid permbit
+         */
+        if (((ue.ue_permbits & PERMBITS_ACCTID) ||
+             (ue.ue_acids[0] >= 0) && (ue.ue_acids[1] >= 0)) &&
+            ue.ue_permbits & PERMBITS_ASKACID) {
+                if (ttyname(0) != NULL) {
+                  debug("cray_setup: ttyname true case, %.100s", ttyname);
+                  while (valid_acct == -1) {
+                        printf("Account (? for available accounts)"
+                               " [%s]: ", acid2nam(ue.ue_acids[0]));
+                        gets(acct_name);
+                        switch (acct_name[0]) {
+                        case EOF:
+                                exit(0);
+                                break;
+                        case '\0':
+                                valid_acct = ue.ue_acids[0];
+                                strcpy(acct_name, acid2nam(valid_acct));
+                                break;
+                        case '?':
+                                /* Print the list 3 wide */
+                                for (i = 0, j = 0; i < MAXVIDS; i++) {
+                                        if (ue.ue_acids[i] == -1) {
+                                                printf("\n");
+                                                break;
+                                        }
+                                        if (++j == 4) {
+                                                j = 1;
+                                                printf("\n");
+                                        }
+                                        printf(" %s",
+                                               acid2nam(ue.ue_acids[i]));
+                                }
+                                if (ue.ue_permbits & PERMBITS_ACCTID)
+                                        printf("\"acctid\" permbit also allows"
+                                               " you to select any valid "
+                                               "account name.\n");
+                                printf("\n");
+                                break;
+                        default:
+                                if ((valid_acct = nam2acid(acct_name)) == -1)                                        printf("Account id not found for"
+                                               " account name \"%s\"\n\n",
+                                               acct_name);
+                                break;
+                        }
+                        /*
+                         * If an account was given, search the user's
+                         * acids array to verify they can use this account.
+                         */
+                        if ((valid_acct != -1) &&
+                            !(ue.ue_permbits & PERMBITS_ACCTID)) {
+                                for (i = 0; i < MAXVIDS; i++) {
+                                        if (ue.ue_acids[i] == -1)
+                                                break;
+                                        if (valid_acct == ue.ue_acids[i])
+                                                break;
+                                }
+                                if (i == MAXVIDS ||
+                                    ue.ue_acids[i] == -1) {
+                                        fprintf(stderr, "Cannot set"
+                                                " account name to "
+                                                "\"%s\", permission "
+                                                "denied\n\n", acct_name);
+                                        valid_acct = -1;
+                                }
+                        }
+                  }
+                } else {
+                        /*
+                         * The client isn't connected to a terminal and can't
+                         * respond to an acid prompt.  Use default acid.
+                         */
+                        debug("cray_setup: ttyname false case, %.100s", ttyname);
+                        valid_acct = ue.ue_acids[0];
+                }
+        } else {
+                /*
+                 * The user doesn't have the askacid permbit set or
+                 * only has one valid account to use.
+                 */
+                valid_acct = ue.ue_acids[0];
+        }
+        if (acctid(0, valid_acct) < 0) {
+                printf ("Bad account id: %d\n", valid_acct);
+                exit(1);
+        }
+
+/* set up shares and quotas */
+/* Now set shares, quotas, limits, including CPU time for the (interactive) 
+ * job and process, and set up permissions (for chown etc), etc.
+ */
+        if (setshares(ue.ue_uid, valid_acct, printf, 0, 0)) {
+                printf("Unable to give %d shares to <%s>(%d/%d)\n", ue.ue_shares, ue.ue_name, ue.ue_uid, valid_acct);
+                exit(1);
+        }
 
-        pid = getpid();
         sr = setlimits(username, C_PROC, pid, UDBRC_INTER);
-        if (sr != NULL)
-                fatal("%.200s", sr);
-
+        if (sr != NULL) {
+                debug("%.200s", sr);
+                exit(1);
+        }
         sr = setlimits(username, C_JOB, jid, UDBRC_INTER);
-        if (sr != NULL)
-                fatal("%.200s", sr);
+        if (sr != NULL) {
+                debug("%.200s", sr);
+                exit(1);
+        }
+        /*
+         * Place the service provider information into
+         * the session table (Unicos) or job table (Unicos/mk).
+         * There exist double defines for the job/session table in
+         * unicos/mk (jtab.h) so no need for a compile time switch.
+         */
+        bzero((char *)&init_info, sizeof(struct servprov));
+        init_info.s_sessinit.si_id  = URM_SPT_LOGIN;
+        init_info.s_sessinit.si_pid = getpid();
+        init_info.s_sessinit.si_sid = jid;
+        init_info.s_routing.seqno = 0;
+        init_info.s_routing.iadrs = 0;
+        sesscntl(0, S_SETSERVPO, (int)&init_info);
 
+        /*
+         * Set user and controlling tty security attributes.
+         */
+        if (SecureSys) {
+                if (setusrv(&usrv) == -1) {
+                        debug("setusrv() failed, errno = %d",errno);
+                        exit(1);
+                }
+        }
+
+        return(0);
 }
 
 /*
@@ -143,7 +627,6 @@ drop_cray_privs()
         int                       result;
         extern      int           priv_set_proc();
         extern      priv_proc_t*  priv_init_proc();
-        struct      usrv          usrv;
 
         /*
          * If ether of theses two flags are not set
@@ -154,9 +637,23 @@ drop_cray_privs()
         if (!sysconf(_SC_CRAY_POSIX_PRIV))
                 fatal("Not POSIX_PRIV.");
 
-        debug("Dropping privileges.");
+        debug("Setting MLS labels.");;
+
+        if (sysconf(_SC_CRAY_SECURE_MAC)) {
+                usrv.sv_minlvl = SYSLOW;
+                usrv.sv_actlvl = SYSHIGH;
+                usrv.sv_maxlvl = SYSHIGH;
+        } else {
+                usrv.sv_minlvl = sysv.sy_minlvl;
+                usrv.sv_actlvl = sysv.sy_minlvl;
+                usrv.sv_maxlvl = sysv.sy_maxlvl;
+        }       
+        usrv.sv_actcmp = 0;
+        usrv.sv_valcmp = sysv.sy_valcmp;
+
+        usrv.sv_intcat = TFM_SYSTEM;
+        usrv.sv_valcat |= (TFM_SYSTEM | TFM_SYSFILE);
 
-        memset(&usrv, 0, sizeof(usrv));
         if (setusrv(&usrv) < 0)
                 fatal("%s(%d): setusrv(): %s", __FILE__, __LINE__,
                     strerror(errno));
@@ -189,7 +686,6 @@ cray_retain_utmp(struct utmp *ut, int pid)
                 while (read(fd, (char *)&utmp, sizeof(utmp)) == sizeof(utmp)) {
                         if (pid == utmp.ut_pid) {
                                 ut->ut_jid = utmp.ut_jid;
-                                /* XXX: MIN_SIZEOF here? can this go in loginrec? */
                                 strncpy(ut->ut_tpath, utmp.ut_tpath, sizeof(utmp.ut_tpath));
                                 strncpy(ut->ut_host, utmp.ut_host, sizeof(utmp.ut_host));
                                 strncpy(ut->ut_name, utmp.ut_name, sizeof(utmp.ut_name));
@@ -198,7 +694,8 @@ cray_retain_utmp(struct utmp *ut, int pid)
                 }
                 close(fd);
         }
-        /* XXX: error message? */
+        else
+        fatal("Unable to open utmp file");
 }
 
 /*
@@ -245,7 +742,7 @@ cray_job_termination_handler(int sig)
         char *login = NULL;
         struct jtab jtab;
 
-        debug("Received SIG JOB.");
+        debug("received signal %d",sig);
 
         if ((jid = waitjob(&jtab)) == -1 ||
             (login = uid2nam(jtab.j_uid)) == NULL)
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index 9067a389a..8868b4364 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.h,v 1.3 2002/05/15 16:39:52 mouring Exp $
+ * $Id: bsd-cray.h,v 1.5 2002/09/26 00:38:51 tim Exp $
  *
  * bsd-cray.h
  *
@@ -37,11 +37,18 @@
 #ifndef _BSD_CRAY_H
 #define _BSD_CRAY_H
 
-#ifdef _CRAY
-void    cray_init_job(struct passwd *);         /* init cray job */
-void    cray_job_termination_handler(int);      /* process end of job signal */
-void    cray_setup(uid_t, char *);              /* set cray limits */
+#ifdef _UNICOS
+void cray_init_job(struct passwd *);            /* init cray job */
+void cray_job_termination_handler(int);         /* process end of job signal */
+void cray_login_failure(char *username, int errcode);
+int cray_access_denied(char *username);
 extern  char   cray_tmpdir[];                   /* cray tmpdir */
+#ifndef IA_SSHD
+#define IA_SSHD IA_LOGIN
+#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN  64
+#endif
 #endif
 
 #endif /* _BSD_CRAY_H */
diff --git a/openbsd-compat/bsd-getpeereid.c b/openbsd-compat/bsd-getpeereid.c
new file mode 100644
index 000000000..c7876823d
--- /dev/null
+++ b/openbsd-compat/bsd-getpeereid.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2002 Damien Miller.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "includes.h"
+
+RCSID("$Id: bsd-getpeereid.c,v 1.1 2002/09/12 00:33:02 djm Exp $");
+
+#if !defined(HAVE_GETPEEREID)
+
+#if defined(SO_PEERCRED)
+int
+getpeereid(int s, uid_t *euid, gid_t *gid)
+{
+        struct ucred cred;
+        size_t len = sizeof(cred);
+
+        if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0)
+                return (-1);
+        *euid = cred.uid;
+        *gid = cred.gid;
+
+        return (0);
+}
+#else
+int
+getpeereid(int s, uid_t *euid, gid_t *gid)
+{
+        *euid = geteuid();
+        *gid = getgid();
+
+        return (0);
+}
+#endif /* defined(SO_PEERCRED) */
+
+#endif /* !defined(HAVE_GETPEEREID) */
diff --git a/openbsd-compat/bsd-getpeereid.h b/openbsd-compat/bsd-getpeereid.h
new file mode 100644
index 000000000..2e9f077f9
--- /dev/null
+++ b/openbsd-compat/bsd-getpeereid.h
@@ -0,0 +1,14 @@
+/* $Id: bsd-getpeereid.h,v 1.1 2002/09/12 00:33:02 djm Exp $ */
+
+#ifndef _BSD_GETPEEREID_H
+#define _BSD_GETPEEREID_H
+
+#include "config.h"
+
+#include <sys/types.h> /* For uid_t, gid_t */
+
+#ifndef HAVE_GETPEEREID
+int      getpeereid(int , uid_t *, gid_t *);
+#endif /* HAVE_GETPEEREID */
+
+#endif /* _BSD_GETPEEREID_H */
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index fa48afea9..1c1e43a52 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$Id: bsd-misc.c,v 1.8 2002/06/13 21:34:58 mouring Exp $");
+RCSID("$Id: bsd-misc.c,v 1.10 2002/07/08 21:09:41 mouring Exp $");
 
 char *get_progname(char *argv0)
 {
@@ -93,8 +93,8 @@ int utimes(char *filename, struct timeval *tvp)
 {
         struct utimbuf ub;
 
-        ub.actime = tvp->tv_sec;
-        ub.modtime = tvp->tv_usec;
+        ub.actime = tvp[0].tv_sec;
+        ub.modtime = tvp[1].tv_sec;
         
         return(utime(filename, &ub));
 }
diff --git a/openbsd-compat/dirname.c b/openbsd-compat/dirname.c
index 391b2dd81..35c7d8ec7 100644
--- a/openbsd-compat/dirname.c
+++ b/openbsd-compat/dirname.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: dirname.c,v 1.6 2001/06/28 04:27:19 pjanzen Exp $     */
+/*      $OpenBSD: dirname.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $     */
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -31,7 +31,7 @@
 #ifndef HAVE_DIRNAME
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.6 2001/06/28 04:27:19 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: dirname.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <errno.h>
@@ -47,7 +47,7 @@ dirname(path)
 
         /* Empty or NULL string gets treated as "." */
         if (path == NULL || *path == '\0') {
-                (void)strcpy(bname, ".");
+                (void)strlcpy(bname, ".", sizeof bname);
                 return(bname);
         }
 
@@ -62,7 +62,7 @@ dirname(path)
 
         /* Either the dir is "/" or there are no slashes */
         if (endp == path) {
-                (void)strcpy(bname, *endp == '/' ? "/" : ".");
+                (void)strlcpy(bname, *endp == '/' ? "/" : ".", sizeof bname);
                 return(bname);
         } else {
                 do {
diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c
index de3baccbb..6fd8543a5 100644
--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if !defined(HAVE_GETCWD)
 
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c
index f4fbc9bac..4a5cfe5f0 100644
--- a/openbsd-compat/getopt.c
+++ b/openbsd-compat/getopt.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 365d4334f..e928a2272 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -56,7 +56,7 @@ get_arg_max(void)
 #if 0
 static char sccsid[] = "@(#)glob.c      8.3 (Berkeley) 10/13/93";
 #else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.20 2002/06/14 21:34:58 todd Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -97,6 +97,7 @@ static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $
 #define RBRACKET        ']'
 #define SEP             '/'
 #define STAR            '*'
+#undef TILDE                    /* Some platforms may already define it */
 #define TILDE           '~'
 #define UNDERSCORE      '_'
 #define LBRACE          '{'
@@ -136,32 +137,32 @@ typedef char Char;
 #define ismeta(c)       (((c)&M_QUOTE) != 0)
 
 
-static int       compare __P((const void *, const void *));
-static int       g_Ctoc __P((const Char *, char *, u_int));
-static int       g_lstat __P((Char *, struct stat *, glob_t *));
-static DIR      *g_opendir __P((Char *, glob_t *));
-static Char     *g_strchr __P((Char *, int));
-static int       g_stat __P((Char *, struct stat *, glob_t *));
-static int       glob0 __P((const Char *, glob_t *));
-static int       glob1 __P((Char *, Char *, glob_t *, size_t *));
-static int       glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *,
-                    glob_t *, size_t *));
-static int       glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *,
-                    Char *, Char *, glob_t *, size_t *));
-static int       globextend __P((const Char *, glob_t *, size_t *));
+static int       compare(const void *, const void *);
+static int       g_Ctoc(const Char *, char *, u_int);
+static int       g_lstat(Char *, struct stat *, glob_t *);
+static DIR      *g_opendir(Char *, glob_t *);
+static Char     *g_strchr(Char *, int);
+static int       g_stat(Char *, struct stat *, glob_t *);
+static int       glob0(const Char *, glob_t *);
+static int       glob1(Char *, Char *, glob_t *, size_t *);
+static int       glob2(Char *, Char *, Char *, Char *, Char *, Char *,
+                    glob_t *, size_t *);
+static int       glob3(Char *, Char *, Char *, Char *, Char *, Char *,
+                    Char *, Char *, glob_t *, size_t *);
+static int       globextend(const Char *, glob_t *, size_t *);
 static const Char *
-                 globtilde __P((const Char *, Char *, size_t, glob_t *));
-static int       globexp1 __P((const Char *, glob_t *));
-static int       globexp2 __P((const Char *, const Char *, glob_t *, int *));
-static int       match __P((Char *, Char *, Char *));
+                 globtilde(const Char *, Char *, size_t, glob_t *);
+static int       globexp1(const Char *, glob_t *);
+static int       globexp2(const Char *, const Char *, glob_t *, int *);
+static int       match(Char *, Char *, Char *);
 #ifdef DEBUG
-static void      qprintf __P((const char *, Char *));
+static void      qprintf(const char *, Char *);
 #endif
 
 int
 glob(pattern, flags, errfunc, pglob)
         const char *pattern;
-        int flags, (*errfunc) __P((const char *, int));
+        int flags, (*errfunc)(const char *, int);
         glob_t *pglob;
 {
         const u_char *patnext;
@@ -676,7 +677,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last,
 
 
 /*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
+ * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
  * add the new item, and update gl_pathc.
  *
  * This assumes the BSD realloc, which only copies the block when its size
@@ -821,7 +822,7 @@ g_opendir(str, pglob)
         char buf[MAXPATHLEN];
 
         if (!*str)
-                strcpy(buf, ".");
+                strlcpy(buf, ".", sizeof buf);
         else {
                 if (g_Ctoc(str, buf, sizeof(buf)))
                         return(NULL);
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index b4c8f7aaa..6421f7049 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $        */
+/*      $OpenBSD: glob.h,v 1.7 2002/02/17 19:42:21 millert Exp $        */
 /*      $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $     */
 
 /*
@@ -53,18 +53,18 @@ typedef struct {
         int gl_flags;           /* Copy of flags parameter to glob. */
         char **gl_pathv;        /* List of paths matching pattern. */
                                 /* Copy of errfunc parameter to glob. */
-        int (*gl_errfunc) __P((const char *, int));
+        int (*gl_errfunc)(const char *, int);
 
         /*
          * Alternate filesystem access methods for glob; replacement
          * versions of closedir(3), readdir(3), opendir(3), stat(2)
          * and lstat(2).
          */
-        void (*gl_closedir) __P((void *));
-        struct dirent *(*gl_readdir) __P((void *));     
-        void *(*gl_opendir) __P((const char *));
-        int (*gl_lstat) __P((const char *, struct stat *));
-        int (*gl_stat) __P((const char *, struct stat *));
+        void (*gl_closedir)(void *);
+        struct dirent *(*gl_readdir)(void *);   
+        void *(*gl_opendir)(const char *);
+        int (*gl_lstat)(const char *, struct stat *);
+        int (*gl_stat)(const char *, struct stat *);
 } glob_t;
 
 /* Flags */
@@ -91,8 +91,8 @@ typedef struct {
 #define GLOB_NOSYS      (-4)    /* Function not supported. */
 #define GLOB_ABEND      GLOB_ABORTED
 
-int     glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void    globfree __P((glob_t *));
+int     glob(const char *, int, int (*)(const char *, int), glob_t *);
+void    globfree(glob_t *);
 
 #endif /* !_GLOB_H_ */
 
diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index 8a8b3c846..ac5f56708 100644
--- a/openbsd-compat/inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
@@ -31,12 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if defined(BROKEN_INET_NTOA) || !defined(HAVE_INET_NTOA)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.2 1996/08/19 08:29:16 tholo Exp $";
+static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.3 2002/06/27 10:14:01 itojun Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -57,7 +57,7 @@ char *inet_ntoa(struct in_addr in)
         p = (char *)&in;
 #define UC(b)   (((int)b)&0xff)
         (void)snprintf(b, sizeof(b),
-            "%d.%d.%d.%d", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
+            "%u.%u.%u.%u", UC(p[0]), UC(p[1]), UC(p[2]), UC(p[3]));
         return (b);
 }
 
diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c
index 2b8d31f8d..3bea519af 100644
--- a/openbsd-compat/inet_ntop.c
+++ b/openbsd-compat/inet_ntop.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $    */
+/*      $OpenBSD: inet_ntop.c,v 1.5 2002/08/23 16:27:31 itojun Exp $    */
 
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
@@ -16,7 +16,7 @@
  * SOFTWARE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #ifndef HAVE_INET_NTOP
 
@@ -24,7 +24,7 @@
 #if 0
 static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
 #else
-static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $";
+static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.5 2002/08/23 16:27:31 itojun Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -54,8 +54,8 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Ex
  * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
  */
 
-static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
-static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
+static const char *inet_ntop4(const u_char *src, char *dst, size_t size);
+static const char *inet_ntop6(const u_char *src, char *dst, size_t size);
 
 /* char *
  * inet_ntop(af, src, dst, size)
@@ -103,13 +103,14 @@ inet_ntop4(src, dst, size)
 {
         static const char fmt[] = "%u.%u.%u.%u";
         char tmp[sizeof "255.255.255.255"];
+        int l;
 
-        if (snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2],
-            src[3]) > size) {
+        l = snprintf(tmp, size, fmt, src[0], src[1], src[2], src[3]);
+        if (l <= 0 || l >= size) {
                 errno = ENOSPC;
                 return (NULL);
         }
-        strcpy(dst, tmp);
+        strlcpy(dst, tmp, size);
         return (dst);
 }
 
@@ -132,10 +133,12 @@ inet_ntop6(src, dst, size)
          * Keep this in mind if you think this function should have been coded
          * to use pointer overlays.  All the world's not a VAX.
          */
-        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"];
+        char *tp, *ep;
         struct { int base, len; } best, cur;
         u_int words[IN6ADDRSZ / INT16SZ];
         int i;
+        int advance;
 
         /*
          * Preprocess:
@@ -172,31 +175,45 @@ inet_ntop6(src, dst, size)
          * Format the result.
          */
         tp = tmp;
-        for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
+        ep = tmp + sizeof(tmp);
+        for (i = 0; i < (IN6ADDRSZ / INT16SZ) && tp < ep; i++) {
                 /* Are we inside the best run of 0x00's? */
                 if (best.base != -1 && i >= best.base &&
                     i < (best.base + best.len)) {
-                        if (i == best.base)
+                        if (i == best.base) {
+                                if (tp + 1 >= ep)
+                                        return (NULL);
                                 *tp++ = ':';
+                        }
                         continue;
                 }
                 /* Are we following an initial run of 0x00s or any real hex? */
-                if (i != 0)
+                if (i != 0) {
+                        if (tp + 1 >= ep)
+                                return (NULL);
                         *tp++ = ':';
+                }
                 /* Is this address an encapsulated IPv4? */
                 if (i == 6 && best.base == 0 &&
                     (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
-                        if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+                        if (!inet_ntop4(src+12, tp, (size_t)(ep - tp)))
                                 return (NULL);
                         tp += strlen(tp);
                         break;
                 }
-                snprintf(tp, sizeof(tmp - (tp - tmp)), "%x", words[i]);
-                tp += strlen(tp);
+                advance = snprintf(tp, ep - tp, "%x", words[i]);
+                if (advance <= 0 || advance >= ep - tp)
+                        return (NULL);
+                tp += advance;
         }
         /* Was it a trailing run of 0x00's? */
-        if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))
+        if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) {
+                if (tp + 1 >= ep)
+                        return (NULL);
                 *tp++ = ':';
+        }
+        if (tp + 1 >= ep)
+                return (NULL);
         *tp++ = '\0';
 
         /*
@@ -206,7 +223,7 @@ inet_ntop6(src, dst, size)
                 errno = ENOSPC;
                 return (NULL);
         }
-        strcpy(dst, tmp);
+        strlcpy(dst, tmp, size);
         return (dst);
 }
 
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index d69dc5c24..d256ee448 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -39,7 +39,7 @@
 #ifndef HAVE_MKDTEMP
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2002/01/02 20:18:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mktemp.c,v 1.16 2002/05/27 18:20:45 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #ifdef HAVE_CYGWIN
@@ -102,11 +102,11 @@ _gettemp(path, doopen, domkdir, slen)
                 return (0);
         }
         pid = getpid();
-        while (*trv == 'X' && pid != 0) {
+        while (trv >= path && *trv == 'X' && pid != 0) {
                 *trv-- = (pid % 10) + '0';
                 pid /= 10;
         }
-        while (*trv == 'X') {
+        while (trv >= path && *trv == 'X') {
                 char c;
 
                 pid = (arc4random() & 0xffff) % (26+26);
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 11918443d..ae18afd34 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.16 2002/02/19 20:27:57 mouring Exp $ */
+/* $Id: openbsd-compat.h,v 1.17 2002/09/12 00:33:02 djm Exp $ */
 
 #ifndef _OPENBSD_H
 #define _OPENBSD_H
@@ -29,6 +29,7 @@
 
 /* Home grown routines */
 #include "bsd-arc4random.h"
+#include "bsd-getpeereid.h"
 #include "bsd-misc.h"
 #include "bsd-snprintf.h"
 #include "bsd-waitpid.h"
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index ca0a88e69..4c96a3171 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -1,3 +1,28 @@
+/*
+ *
+ * Copyright (c) 2001 Gert Doering.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 #include "includes.h"
 
 #ifdef _AIX
@@ -6,21 +31,21 @@
 #include <../xmalloc.h>
 
 /*
- * AIX has a "usrinfo" area where logname and
- * other stuff is stored - a few applications
- * actually use this and die if it's not set
+ * AIX has a "usrinfo" area where logname and other stuff is stored - 
+ * a few applications actually use this and die if it's not set
+ *
+ * NOTE: TTY= should be set, but since no one uses it and it's hard to
+ * acquire due to privsep code.  We will just drop support.
  */
 void
-aix_usrinfo(struct passwd *pw, char *tty, int ttyfd) 
+aix_usrinfo(struct passwd *pw)
 {
         u_int i;
-        char *cp=NULL;
+        char *cp;
 
-        if (ttyfd == -1)
-                tty[0] = '\0';
-        cp = xmalloc(22 + strlen(tty) + 2 * strlen(pw->pw_name));
-        i = sprintf(cp, "LOGNAME=%s%cNAME=%s%cTTY=%s%c%c", pw->pw_name, 0, 
-            pw->pw_name, 0, tty, 0, 0);
+        cp = xmalloc(16 + 2 * strlen(pw->pw_name));
+        i = sprintf(cp, "LOGNAME=%s%cNAME=%s%c", pw->pw_name, 0, 
+            pw->pw_name, 0);
         if (usrinfo(SETUINFO, cp, i) == -1)
                 fatal("Couldn't set usrinfo: %s", strerror(errno));
         debug3("AIX/UsrInfo: set len %d", i);
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h
index e4d14f4ae..79570a206 100644
--- a/openbsd-compat/port-aix.h
+++ b/openbsd-compat/port-aix.h
@@ -1,5 +1,29 @@
-#ifdef _AIX
-
-void aix_usrinfo(struct passwd *pw, char *tty, int ttyfd);
+/*
+ *
+ * Copyright (c) 2001 Gert Doering.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 
+#ifdef _AIX
+void aix_usrinfo(struct passwd *pw);
 #endif /* _AIX */
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 8c2f5f841..4e549b62b 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -1,7 +1,7 @@
-/*      $OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $     */
+/*      $OpenBSD: readpassphrase.c,v 1.14 2002/06/28 01:43:58 millert Exp $     */
 
 /*
- * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 2000-2002 Todd C. Miller <Todd.Miller@courtesan.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $";
+static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.14 2002/06/28 01:43:58 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "includes.h"
@@ -60,8 +60,8 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
         int input, output, save_errno;
         char ch, *p, *end;
         struct termios term, oterm;
-        struct sigaction sa, saveint, savehup, savequit, saveterm;
-        struct sigaction savetstp, savettin, savettou;
+        struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
+        struct sigaction savetstp, savettin, savettou, savepipe;
 
         /* I suppose we could alloc on demand in this case (XXX). */
         if (bufsiz == 0) {
@@ -70,11 +70,13 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
         }
 
 restart:
+        signo = 0;
         /*
          * Read and write to /dev/tty if available.  If not, read from
          * stdin and write to stderr unless a tty is required.
          */
-        if ((input = output = open(_PATH_TTY, O_RDWR)) == -1) {
+        if ((flags & RPP_STDIN) ||
+            (input = output = open(_PATH_TTY, O_RDWR)) == -1) {
                 if (flags & RPP_REQUIRE_TTY) {
                         errno = ENOTTY;
                         return(NULL);
@@ -86,13 +88,15 @@ restart:
         /*
          * Catch signals that would otherwise cause the user to end
          * up with echo turned off in the shell.  Don't worry about
-         * things like SIGALRM and SIGPIPE for now.
+         * things like SIGXCPU and SIGVTALRM for now.
          */
         sigemptyset(&sa.sa_mask);
         sa.sa_flags = 0;                /* don't restart system calls */
         sa.sa_handler = handler;
-        (void)sigaction(SIGINT, &sa, &saveint);
+        (void)sigaction(SIGALRM, &sa, &savealrm);
         (void)sigaction(SIGHUP, &sa, &savehup);
+        (void)sigaction(SIGINT, &sa, &saveint);
+        (void)sigaction(SIGPIPE, &sa, &savepipe);
         (void)sigaction(SIGQUIT, &sa, &savequit);
         (void)sigaction(SIGTERM, &sa, &saveterm);
         (void)sigaction(SIGTSTP, &sa, &savetstp);
@@ -100,7 +104,7 @@ restart:
         (void)sigaction(SIGTTOU, &sa, &savettou);
 
         /* Turn off echo if possible. */
-        if (tcgetattr(input, &oterm) == 0) {
+        if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
                 memcpy(&term, &oterm, sizeof(term));
                 if (!(flags & RPP_ECHO_ON))
                         term.c_lflag &= ~(ECHO | ECHONL);
@@ -111,10 +115,13 @@ restart:
                 (void)tcsetattr(input, _T_FLUSH, &term);
         } else {
                 memset(&term, 0, sizeof(term));
+                term.c_lflag |= ECHO;
                 memset(&oterm, 0, sizeof(oterm));
+                oterm.c_lflag |= ECHO;
         }
 
-        (void)write(output, prompt, strlen(prompt));
+        if (!(flags & RPP_STDIN))
+                (void)write(output, prompt, strlen(prompt));
         end = buf + bufsiz - 1;
         for (p = buf; (nr = read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r';) {
                 if (p < end) {
@@ -137,13 +144,14 @@ restart:
         /* Restore old terminal settings and signals. */
         if (memcmp(&term, &oterm, sizeof(term)) != 0)
                 (void)tcsetattr(input, _T_FLUSH, &oterm);
-        (void)sigaction(SIGINT, &saveint, NULL);
+        (void)sigaction(SIGALRM, &savealrm, NULL);
         (void)sigaction(SIGHUP, &savehup, NULL);
+        (void)sigaction(SIGINT, &saveint, NULL);
         (void)sigaction(SIGQUIT, &savequit, NULL);
+        (void)sigaction(SIGPIPE, &savepipe, NULL);
         (void)sigaction(SIGTERM, &saveterm, NULL);
         (void)sigaction(SIGTSTP, &savetstp, NULL);
         (void)sigaction(SIGTTIN, &savettin, NULL);
-        (void)sigaction(SIGTTOU, &savettou, NULL);
         if (input != STDIN_FILENO)
                 (void)close(input);
 
@@ -152,12 +160,11 @@ restart:
          * now that we have restored the signal handlers.
          */
         if (signo) {
-                kill(getpid(), signo); 
+                kill(getpid(), signo);
                 switch (signo) {
                 case SIGTSTP:
                 case SIGTTIN:
                 case SIGTTOU:
-                        signo = 0;
                         goto restart;
                 }
         }
diff --git a/openbsd-compat/readpassphrase.h b/openbsd-compat/readpassphrase.h
index 9077b6e08..92908a489 100644
--- a/openbsd-compat/readpassphrase.h
+++ b/openbsd-compat/readpassphrase.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $      */
+/*      $OpenBSD: readpassphrase.h,v 1.3 2002/06/28 12:32:22 millert Exp $      */
 
 /*
  * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -40,8 +40,9 @@
 #define RPP_FORCELOWER  0x04            /* Force input to lower case. */
 #define RPP_FORCEUPPER  0x08            /* Force input to upper case. */
 #define RPP_SEVENBIT    0x10            /* Strip the high bit from input. */
+#define RPP_STDIN       0x20            /* Read from stdin, not /dev/tty */
 
-char *readpassphrase(const char *, char *, size_t, int);
+char * readpassphrase(const char *, char *, size_t, int);
 
 #endif /* HAVE_READPASSPHRASE */
 
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index b4a05db95..b9035ca22 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -32,7 +32,7 @@
 #if !defined(HAVE_REALPATH) || defined(BROKEN_REALPATH)
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: realpath.c,v 1.6 2002/01/12 16:24:35 millert Exp $";
+static char *rcsid = "$OpenBSD: realpath.c,v 1.7 2002/05/24 21:22:37 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -69,7 +69,7 @@ realpath(const char *path, char *resolved)
         /* Save the starting point. */
         getcwd(start,MAXPATHLEN);       
         if ((fd = open(".", O_RDONLY)) < 0) {
-                (void)strcpy(resolved, ".");
+                (void)strlcpy(resolved, ".", MAXPATHLEN);
                 return (NULL);
         }
         close(fd);
@@ -129,7 +129,7 @@ loop:
          * Save the last component name and get the full pathname of
          * the current directory.
          */
-        (void)strcpy(wbuf, p);
+        (void)strlcpy(wbuf, p, sizeof wbuf);
         if (getcwd(resolved, MAXPATHLEN) == 0)
                 goto err1;
 
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 44eac2036..9f058961d 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #ifndef HAVE_RRESVPORT_AF
 
diff --git a/openbsd-compat/setenv.c b/openbsd-compat/setenv.c
index 6c2d5cd31..1dff15c73 100644
--- a/openbsd-compat/setenv.c
+++ b/openbsd-compat/setenv.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 #ifndef HAVE_SETENV
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/openbsd-compat/sigact.c b/openbsd-compat/sigact.c
index 806eb02b6..35fbab0eb 100644
--- a/openbsd-compat/sigact.c
+++ b/openbsd-compat/sigact.c
@@ -33,7 +33,7 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-#include "config.h"
+#include "includes.h"
 #include <signal.h>
 #include "sigact.h"
 
diff --git a/openbsd-compat/strlcat.c b/openbsd-compat/strlcat.c
index 6ff65c19b..3a9b5d1a7 100644
--- a/openbsd-compat/strlcat.c
+++ b/openbsd-compat/strlcat.c
@@ -27,7 +27,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 #ifndef HAVE_STRLCAT
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/openbsd-compat/strlcpy.c b/openbsd-compat/strlcpy.c
index b5e5a552e..2f87eca44 100644
--- a/openbsd-compat/strlcpy.c
+++ b/openbsd-compat/strlcpy.c
@@ -27,7 +27,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 #ifndef HAVE_STRLCPY
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/openbsd-compat/strsep.c b/openbsd-compat/strsep.c
index c03649cff..d0afc44ae 100644
--- a/openbsd-compat/strsep.c
+++ b/openbsd-compat/strsep.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include "includes.h"
 
 #if !defined(HAVE_STRSEP)
 
diff --git a/openbsd-compat/fake-queue.h b/openbsd-compat/sys-queue.h
index 176fe3174..176fe3174 100644
--- a/openbsd-compat/fake-queue.h
+++ b/openbsd-compat/sys-queue.h
diff --git a/openbsd-compat/tree.h b/openbsd-compat/sys-tree.h
index 30b4a8561..0a58710c9 100644
--- a/openbsd-compat/tree.h
+++ b/openbsd-compat/sys-tree.h
@@ -1,3 +1,4 @@
+/*      $OpenBSD: tree.h,v 1.6 2002/06/11 22:09:52 provos Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -113,8 +114,47 @@ struct {								\
 #define SPLAY_PROTOTYPE(name, type, field, cmp)                         \
 void name##_SPLAY(struct name *, struct type *);                        \
 void name##_SPLAY_MINMAX(struct name *, int);                           \
+struct type *name##_SPLAY_INSERT(struct name *, struct type *);         \
+struct type *name##_SPLAY_REMOVE(struct name *, struct type *);         \
                                                                         \
-static __inline void                                                    \
+/* Finds the node with the same key as elm */                           \
+static __inline struct type *                                           \
+name##_SPLAY_FIND(struct name *head, struct type *elm)                  \
+{                                                                       \
+        if (SPLAY_EMPTY(head))                                          \
+                return(NULL);                                           \
+        name##_SPLAY(head, elm);                                        \
+        if ((cmp)(elm, (head)->sph_root) == 0)                          \
+                return (head->sph_root);                                \
+        return (NULL);                                                  \
+}                                                                       \
+                                                                        \
+static __inline struct type *                                           \
+name##_SPLAY_NEXT(struct name *head, struct type *elm)                  \
+{                                                                       \
+        name##_SPLAY(head, elm);                                        \
+        if (SPLAY_RIGHT(elm, field) != NULL) {                          \
+                elm = SPLAY_RIGHT(elm, field);                          \
+                while (SPLAY_LEFT(elm, field) != NULL) {                \
+                        elm = SPLAY_LEFT(elm, field);                   \
+                }                                                       \
+        } else                                                          \
+                elm = NULL;                                             \
+        return (elm);                                                   \
+}                                                                       \
+                                                                        \
+static __inline struct type *                                           \
+name##_SPLAY_MIN_MAX(struct name *head, int val)                        \
+{                                                                       \
+        name##_SPLAY_MINMAX(head, val);                                 \
+        return (SPLAY_ROOT(head));                                      \
+}
+
+/* Main splay operation.
+ * Moves node close to the key of elm to top
+ */
+#define SPLAY_GENERATE(name, type, field, cmp)                          \
+struct type *                                                           \
 name##_SPLAY_INSERT(struct name *head, struct type *elm)                \
 {                                                                       \
     if (SPLAY_EMPTY(head)) {                                            \
@@ -132,17 +172,18 @@ name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
                     SPLAY_LEFT(elm, field) = (head)->sph_root;          \
                     SPLAY_RIGHT((head)->sph_root, field) = NULL;        \
             } else                                                      \
-                    return;                                             \
+                    return ((head)->sph_root);                          \
     }                                                                   \
     (head)->sph_root = (elm);                                           \
+    return (NULL);                                                      \
 }                                                                       \
                                                                         \
-static __inline void                                                    \
+struct type *                                                           \
 name##_SPLAY_REMOVE(struct name *head, struct type *elm)                \
 {                                                                       \
         struct type *__tmp;                                             \
         if (SPLAY_EMPTY(head))                                          \
-                return;                                                 \
+                return (NULL);                                          \
         name##_SPLAY(head, elm);                                        \
         if ((cmp)(elm, (head)->sph_root) == 0) {                        \
                 if (SPLAY_LEFT((head)->sph_root, field) == NULL) {      \
@@ -153,47 +194,13 @@ name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
                         name##_SPLAY(head, elm);                        \
                         SPLAY_RIGHT((head)->sph_root, field) = __tmp;   \
                 }                                                       \
+                return (elm);                                           \
         }                                                               \
-}                                                                       \
-                                                                        \
-/* Finds the node with the same key as elm */                           \
-static __inline struct type *                                           \
-name##_SPLAY_FIND(struct name *head, struct type *elm)                  \
-{                                                                       \
-        if (SPLAY_EMPTY(head))                                          \
-                return(NULL);                                           \
-        name##_SPLAY(head, elm);                                        \
-        if ((cmp)(elm, (head)->sph_root) == 0)                          \
-                return (head->sph_root);                                \
         return (NULL);                                                  \
 }                                                                       \
                                                                         \
-static __inline struct type *                                           \
-name##_SPLAY_NEXT(struct name *head, struct type *elm)                  \
-{                                                                       \
-        name##_SPLAY(head, elm);                                        \
-        if (SPLAY_RIGHT(elm, field) != NULL) {                          \
-                elm = SPLAY_RIGHT(elm, field);                          \
-                while (SPLAY_LEFT(elm, field) != NULL) {                \
-                        elm = SPLAY_LEFT(elm, field);                   \
-                }                                                       \
-        } else                                                          \
-                elm = NULL;                                             \
-        return (elm);                                                   \
-}                                                                       \
-                                                                        \
-static __inline struct type *                                           \
-name##_SPLAY_MIN_MAX(struct name *head, int val)                        \
-{                                                                       \
-        name##_SPLAY_MINMAX(head, val);                                 \
-        return (SPLAY_ROOT(head));                                      \
-}
-
-/* Main splay operation.
- * Moves node close to the key of elm to top
- */
-#define SPLAY_GENERATE(name, type, field, cmp)                          \
-void name##_SPLAY(struct name *head, struct type *elm)                  \
+void                                                                    \
+name##_SPLAY(struct name *head, struct type *elm)                       \
 {                                                                       \
         struct type __node, *__left, *__right, *__tmp;                  \
         int __comp;                                                     \
@@ -367,7 +374,7 @@ struct {								\
 #define RB_PROTOTYPE(name, type, field, cmp)                            \
 void name##_RB_INSERT_COLOR(struct name *, struct type *);      \
 void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\
-void name##_RB_REMOVE(struct name *, struct type *);                    \
+struct type *name##_RB_REMOVE(struct name *, struct type *);            \
 struct type *name##_RB_INSERT(struct name *, struct type *);            \
 struct type *name##_RB_FIND(struct name *, struct type *);              \
 struct type *name##_RB_NEXT(struct name *, struct type *);              \
@@ -498,17 +505,17 @@ name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm)
                 RB_COLOR(elm, field) = RB_BLACK;                        \
 }                                                                       \
                                                                         \
-void                                                                    \
+struct type *                                                           \
 name##_RB_REMOVE(struct name *head, struct type *elm)                   \
 {                                                                       \
-        struct type *child, *parent;                                    \
+        struct type *child, *parent, *old = elm;                        \
         int color;                                                      \
         if (RB_LEFT(elm, field) == NULL)                                \
                 child = RB_RIGHT(elm, field);                           \
         else if (RB_RIGHT(elm, field) == NULL)                          \
                 child = RB_LEFT(elm, field);                            \
         else {                                                          \
-                struct type *old = elm, *left;                          \
+                struct type *left;                                      \
                 elm = RB_RIGHT(elm, field);                             \
                 while ((left = RB_LEFT(elm, field)))                    \
                         elm = left;                                     \
@@ -562,6 +569,7 @@ name##_RB_REMOVE(struct name *head, struct type *elm)			\
 color:                                                                  \
         if (color == RB_BLACK)                                          \
                 name##_RB_REMOVE_COLOR(head, parent, child);            \
+        return (old);                                                   \
 }                                                                       \
                                                                         \
 /* Inserts a node into the RB tree */                                   \
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
new file mode 100644
index 000000000..8f1d2022c
--- /dev/null
+++ b/openbsd-compat/xmmap.c
@@ -0,0 +1,67 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "includes.h"
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#include "log.h"
+
+void *xmmap(size_t size)
+{
+        void *address;
+
+#ifdef HAVE_MMAP
+# ifdef MAP_ANON
+        address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
+            -1, 0);
+# else
+        address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED,
+            open("/dev/zero", O_RDWR), 0);
+# endif
+
+#define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX"
+        if (address == MAP_FAILED) {
+                char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE;
+                int tmpfd;
+
+                tmpfd = mkstemp(tmpname);
+                if (tmpfd == -1)
+                        fatal("mkstemp(\"%s\"): %s",
+                            MM_SWAP_TEMPLATE, strerror(errno));
+                unlink(tmpname);
+                ftruncate(tmpfd, size);
+                address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED,
+                    tmpfd, 0);
+                close(tmpfd);
+        }
+
+        return (address);
+#else
+        fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
+            __func__);
+#endif /* HAVE_MMAP */
+
+}
+
diff --git a/openbsd-compat/xmmap.h b/openbsd-compat/xmmap.h
new file mode 100644
index 000000000..c0fa04aca
--- /dev/null
+++ b/openbsd-compat/xmmap.h
@@ -0,0 +1,23 @@
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+void *xmmap(size_t size);