6424438 Winchester: ID mapping for AD Interoperability

--HG--
rename : usr/src/cmd/svc/configd/sqlite/src/shell.c => usr/src/cmd/sqlite/shell.c
rename : usr/src/cmd/svc/configd/sqlite/Makefile => usr/src/lib/libsqlite/Makefile.com
rename : usr/src/cmd/svc/configd/sqlite/inc.flg => usr/src/lib/libsqlite/inc.flg
rename : usr/src/cmd/svc/configd/sqlite/llib-lsqlite => usr/src/lib/libsqlite/llib-lsqlite
rename : usr/src/cmd/svc/configd/sqlite/main.mk => usr/src/lib/libsqlite/main.mk
rename : usr/src/cmd/svc/configd/sqlite/mapfile-sqlite => usr/src/lib/libsqlite/mapfile-sqlite
rename : usr/src/cmd/svc/configd/sqlite/sqlite-misc.h => usr/src/lib/libsqlite/sqlite-misc.h
rename : usr/src/cmd/svc/configd/sqlite/src/attach.c => usr/src/lib/libsqlite/src/attach.c
rename : usr/src/cmd/svc/configd/sqlite/src/auth.c => usr/src/lib/libsqlite/src/auth.c
rename : usr/src/cmd/svc/configd/sqlite/src/btree.c => usr/src/lib/libsqlite/src/btree.c
rename : usr/src/cmd/svc/configd/sqlite/src/btree.h => usr/src/lib/libsqlite/src/btree.h
rename : usr/src/cmd/svc/configd/sqlite/src/btree_rb.c => usr/src/lib/libsqlite/src/btree_rb.c
rename : usr/src/cmd/svc/configd/sqlite/src/build.c => usr/src/lib/libsqlite/src/build.c
rename : usr/src/cmd/svc/configd/sqlite/src/config.h => usr/src/lib/libsqlite/src/config.h
rename : usr/src/cmd/svc/configd/sqlite/src/copy.c => usr/src/lib/libsqlite/src/copy.c
rename : usr/src/cmd/svc/configd/sqlite/src/date.c => usr/src/lib/libsqlite/src/date.c
rename : usr/src/cmd/svc/configd/sqlite/src/delete.c => usr/src/lib/libsqlite/src/delete.c
rename : usr/src/cmd/svc/configd/sqlite/src/encode.c => usr/src/lib/libsqlite/src/encode.c
rename : usr/src/cmd/svc/configd/sqlite/src/expr.c => usr/src/lib/libsqlite/src/expr.c
rename : usr/src/cmd/svc/configd/sqlite/src/func.c => usr/src/lib/libsqlite/src/func.c
rename : usr/src/cmd/svc/configd/sqlite/src/hash.c => usr/src/lib/libsqlite/src/hash.c
rename : usr/src/cmd/svc/configd/sqlite/src/hash.h => usr/src/lib/libsqlite/src/hash.h
rename : usr/src/cmd/svc/configd/sqlite/src/insert.c => usr/src/lib/libsqlite/src/insert.c
rename : usr/src/cmd/svc/configd/sqlite/src/main.c => usr/src/lib/libsqlite/src/main.c
rename : usr/src/cmd/svc/configd/sqlite/src/md5.c => usr/src/lib/libsqlite/src/md5.c
rename : usr/src/cmd/svc/configd/sqlite/src/os.c => usr/src/lib/libsqlite/src/os.c
rename : usr/src/cmd/svc/configd/sqlite/src/os.h => usr/src/lib/libsqlite/src/os.h
rename : usr/src/cmd/svc/configd/sqlite/src/pager.c => usr/src/lib/libsqlite/src/pager.c
rename : usr/src/cmd/svc/configd/sqlite/src/pager.h => usr/src/lib/libsqlite/src/pager.h
rename : usr/src/cmd/svc/configd/sqlite/src/parse.y => usr/src/lib/libsqlite/src/parse.y
rename : usr/src/cmd/svc/configd/sqlite/src/pragma.c => usr/src/lib/libsqlite/src/pragma.c
rename : usr/src/cmd/svc/configd/sqlite/src/printf.c => usr/src/lib/libsqlite/src/printf.c
rename : usr/src/cmd/svc/configd/sqlite/src/random.c => usr/src/lib/libsqlite/src/random.c
rename : usr/src/cmd/svc/configd/sqlite/src/select.c => usr/src/lib/libsqlite/src/select.c
rename : usr/src/cmd/svc/configd/sqlite/src/sqlite.h.in => usr/src/lib/libsqlite/src/sqlite.h.in
rename : usr/src/cmd/svc/configd/sqlite/src/sqliteInt.h => usr/src/lib/libsqlite/src/sqliteInt.h
rename : usr/src/cmd/svc/configd/sqlite/src/table.c => usr/src/lib/libsqlite/src/table.c
rename : usr/src/cmd/svc/configd/sqlite/src/tclsqlite.c => usr/src/lib/libsqlite/src/tclsqlite.c
rename : usr/src/cmd/svc/configd/sqlite/src/test1.c => usr/src/lib/libsqlite/src/test1.c
rename : usr/src/cmd/svc/configd/sqlite/src/test2.c => usr/src/lib/libsqlite/src/test2.c
rename : usr/src/cmd/svc/configd/sqlite/src/test3.c => usr/src/lib/libsqlite/src/test3.c
rename : usr/src/cmd/svc/configd/sqlite/src/test4.c => usr/src/lib/libsqlite/src/test4.c
rename : usr/src/cmd/svc/configd/sqlite/src/tokenize.c => usr/src/lib/libsqlite/src/tokenize.c
rename : usr/src/cmd/svc/configd/sqlite/src/trigger.c => usr/src/lib/libsqlite/src/trigger.c
rename : usr/src/cmd/svc/configd/sqlite/src/update.c => usr/src/lib/libsqlite/src/update.c
rename : usr/src/cmd/svc/configd/sqlite/src/util.c => usr/src/lib/libsqlite/src/util.c
rename : usr/src/cmd/svc/configd/sqlite/src/vacuum.c => usr/src/lib/libsqlite/src/vacuum.c
rename : usr/src/cmd/svc/configd/sqlite/src/vdbe.c => usr/src/lib/libsqlite/src/vdbe.c
rename : usr/src/cmd/svc/configd/sqlite/src/vdbe.h => usr/src/lib/libsqlite/src/vdbe.h
rename : usr/src/cmd/svc/configd/sqlite/src/vdbeInt.h => usr/src/lib/libsqlite/src/vdbeInt.h
rename : usr/src/cmd/svc/configd/sqlite/src/vdbeaux.c => usr/src/lib/libsqlite/src/vdbeaux.c
rename : usr/src/cmd/svc/configd/sqlite/src/where.c => usr/src/lib/libsqlite/src/where.c
rename : usr/src/cmd/svc/configd/sqlite/test/all.test => usr/src/lib/libsqlite/test/all.test
rename : usr/src/cmd/svc/configd/sqlite/test/attach.test => usr/src/lib/libsqlite/test/attach.test
rename : usr/src/cmd/svc/configd/sqlite/test/attach2.test => usr/src/lib/libsqlite/test/attach2.test
rename : usr/src/cmd/svc/configd/sqlite/test/auth.test => usr/src/lib/libsqlite/test/auth.test
rename : usr/src/cmd/svc/configd/sqlite/test/bigfile.test => usr/src/lib/libsqlite/test/bigfile.test
rename : usr/src/cmd/svc/configd/sqlite/test/bigrow.test => usr/src/lib/libsqlite/test/bigrow.test
rename : usr/src/cmd/svc/configd/sqlite/test/bind.test => usr/src/lib/libsqlite/test/bind.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree.test => usr/src/lib/libsqlite/test/btree.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree2.test => usr/src/lib/libsqlite/test/btree2.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree3.test => usr/src/lib/libsqlite/test/btree3.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree3rb.test => usr/src/lib/libsqlite/test/btree3rb.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree4.test => usr/src/lib/libsqlite/test/btree4.test
rename : usr/src/cmd/svc/configd/sqlite/test/btree4rb.test => usr/src/lib/libsqlite/test/btree4rb.test
rename : usr/src/cmd/svc/configd/sqlite/test/capi2.test => usr/src/lib/libsqlite/test/capi2.test
rename : usr/src/cmd/svc/configd/sqlite/test/conflict.test => usr/src/lib/libsqlite/test/conflict.test
rename : usr/src/cmd/svc/configd/sqlite/test/copy.test => usr/src/lib/libsqlite/test/copy.test
rename : usr/src/cmd/svc/configd/sqlite/test/crashme2.off => usr/src/lib/libsqlite/test/crashme2.off
rename : usr/src/cmd/svc/configd/sqlite/test/crashtest1.c => usr/src/lib/libsqlite/test/crashtest1.c
rename : usr/src/cmd/svc/configd/sqlite/test/date.test => usr/src/lib/libsqlite/test/date.test
rename : usr/src/cmd/svc/configd/sqlite/test/delete.test => usr/src/lib/libsqlite/test/delete.test
rename : usr/src/cmd/svc/configd/sqlite/test/expr.test => usr/src/lib/libsqlite/test/expr.test
rename : usr/src/cmd/svc/configd/sqlite/test/fkey1.test => usr/src/lib/libsqlite/test/fkey1.test
rename : usr/src/cmd/svc/configd/sqlite/test/format3.test => usr/src/lib/libsqlite/test/format3.test
rename : usr/src/cmd/svc/configd/sqlite/test/func.test => usr/src/lib/libsqlite/test/func.test
rename : usr/src/cmd/svc/configd/sqlite/test/hook.test => usr/src/lib/libsqlite/test/hook.test
rename : usr/src/cmd/svc/configd/sqlite/test/in.test => usr/src/lib/libsqlite/test/in.test
rename : usr/src/cmd/svc/configd/sqlite/test/index.test => usr/src/lib/libsqlite/test/index.test
rename : usr/src/cmd/svc/configd/sqlite/test/insert.test => usr/src/lib/libsqlite/test/insert.test
rename : usr/src/cmd/svc/configd/sqlite/test/insert2.test => usr/src/lib/libsqlite/test/insert2.test
rename : usr/src/cmd/svc/configd/sqlite/test/interrupt.test => usr/src/lib/libsqlite/test/interrupt.test
rename : usr/src/cmd/svc/configd/sqlite/test/intpkey.test => usr/src/lib/libsqlite/test/intpkey.test
rename : usr/src/cmd/svc/configd/sqlite/test/ioerr.test => usr/src/lib/libsqlite/test/ioerr.test
rename : usr/src/cmd/svc/configd/sqlite/test/join.test => usr/src/lib/libsqlite/test/join.test
rename : usr/src/cmd/svc/configd/sqlite/test/join2.test => usr/src/lib/libsqlite/test/join2.test
rename : usr/src/cmd/svc/configd/sqlite/test/join3_28.test => usr/src/lib/libsqlite/test/join3_28.test
rename : usr/src/cmd/svc/configd/sqlite/test/join4_28.test => usr/src/lib/libsqlite/test/join4_28.test
rename : usr/src/cmd/svc/configd/sqlite/test/lastinsert.test => usr/src/lib/libsqlite/test/lastinsert.test
rename : usr/src/cmd/svc/configd/sqlite/test/laststmtchanges.test => usr/src/lib/libsqlite/test/laststmtchanges.test
rename : usr/src/cmd/svc/configd/sqlite/test/limit.test => usr/src/lib/libsqlite/test/limit.test
rename : usr/src/cmd/svc/configd/sqlite/test/lock.test => usr/src/lib/libsqlite/test/lock.test
rename : usr/src/cmd/svc/configd/sqlite/test/main.test => usr/src/lib/libsqlite/test/main.test
rename : usr/src/cmd/svc/configd/sqlite/test/malloc.test => usr/src/lib/libsqlite/test/malloc.test
rename : usr/src/cmd/svc/configd/sqlite/test/memdb.test => usr/src/lib/libsqlite/test/memdb.test
rename : usr/src/cmd/svc/configd/sqlite/test/memleak.test => usr/src/lib/libsqlite/test/memleak.test
rename : usr/src/cmd/svc/configd/sqlite/test/minmax.test => usr/src/lib/libsqlite/test/minmax.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc1.test => usr/src/lib/libsqlite/test/misc1.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc2.test => usr/src/lib/libsqlite/test/misc2.test
rename : usr/src/cmd/svc/configd/sqlite/test/misc3.test => usr/src/lib/libsqlite/test/misc3.test
rename : usr/src/cmd/svc/configd/sqlite/test/misuse.test => usr/src/lib/libsqlite/test/misuse.test
rename : usr/src/cmd/svc/configd/sqlite/test/notnull.test => usr/src/lib/libsqlite/test/notnull.test
rename : usr/src/cmd/svc/configd/sqlite/test/null.test => usr/src/lib/libsqlite/test/null.test
rename : usr/src/cmd/svc/configd/sqlite/test/pager.test => usr/src/lib/libsqlite/test/pager.test
rename : usr/src/cmd/svc/configd/sqlite/test/pragma.test => usr/src/lib/libsqlite/test/pragma.test
rename : usr/src/cmd/svc/configd/sqlite/test/printf.test => usr/src/lib/libsqlite/test/printf.test
rename : usr/src/cmd/svc/configd/sqlite/test/progress.test => usr/src/lib/libsqlite/test/progress.test
rename : usr/src/cmd/svc/configd/sqlite/test/quick.test => usr/src/lib/libsqlite/test/quick.test
rename : usr/src/cmd/svc/configd/sqlite/test/quote.test => usr/src/lib/libsqlite/test/quote.test
rename : usr/src/cmd/svc/configd/sqlite/test/rowid.test => usr/src/lib/libsqlite/test/rowid.test
rename : usr/src/cmd/svc/configd/sqlite/test/select1.test => usr/src/lib/libsqlite/test/select1.test
rename : usr/src/cmd/svc/configd/sqlite/test/select2.test => usr/src/lib/libsqlite/test/select2.test
rename : usr/src/cmd/svc/configd/sqlite/test/select3.test => usr/src/lib/libsqlite/test/select3.test
rename : usr/src/cmd/svc/configd/sqlite/test/select4.test => usr/src/lib/libsqlite/test/select4.test
rename : usr/src/cmd/svc/configd/sqlite/test/select5.test => usr/src/lib/libsqlite/test/select5.test
rename : usr/src/cmd/svc/configd/sqlite/test/select6.test => usr/src/lib/libsqlite/test/select6.test
rename : usr/src/cmd/svc/configd/sqlite/test/sort.test => usr/src/lib/libsqlite/test/sort.test
rename : usr/src/cmd/svc/configd/sqlite/test/subselect.test => usr/src/lib/libsqlite/test/subselect.test
rename : usr/src/cmd/svc/configd/sqlite/test/table.test => usr/src/lib/libsqlite/test/table.test
rename : usr/src/cmd/svc/configd/sqlite/test/tableapi.test => usr/src/lib/libsqlite/test/tableapi.test
rename : usr/src/cmd/svc/configd/sqlite/test/tclsqlite.test => usr/src/lib/libsqlite/test/tclsqlite.test
rename : usr/src/cmd/svc/configd/sqlite/test/temptable.test => usr/src/lib/libsqlite/test/temptable.test
rename : usr/src/cmd/svc/configd/sqlite/test/tester.tcl => usr/src/lib/libsqlite/test/tester.tcl
rename : usr/src/cmd/svc/configd/sqlite/test/thread1.test => usr/src/lib/libsqlite/test/thread1.test
rename : usr/src/cmd/svc/configd/sqlite/test/threadtest1.c => usr/src/lib/libsqlite/test/threadtest1.c
rename : usr/src/cmd/svc/configd/sqlite/test/threadtest2.c => usr/src/lib/libsqlite/test/threadtest2.c
rename : usr/src/cmd/svc/configd/sqlite/test/trans.test => usr/src/lib/libsqlite/test/trans.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger1.test => usr/src/lib/libsqlite/test/trigger1.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger2.test => usr/src/lib/libsqlite/test/trigger2.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger3.test => usr/src/lib/libsqlite/test/trigger3.test
rename : usr/src/cmd/svc/configd/sqlite/test/trigger4.test => usr/src/lib/libsqlite/test/trigger4.test
rename : usr/src/cmd/svc/configd/sqlite/test/unique.test => usr/src/lib/libsqlite/test/unique.test
rename : usr/src/cmd/svc/configd/sqlite/test/update.test => usr/src/lib/libsqlite/test/update.test
rename : usr/src/cmd/svc/configd/sqlite/test/vacuum.test => usr/src/lib/libsqlite/test/vacuum.test
rename : usr/src/cmd/svc/configd/sqlite/test/version.test => usr/src/lib/libsqlite/test/version.test
rename : usr/src/cmd/svc/configd/sqlite/test/view.test => usr/src/lib/libsqlite/test/view.test
rename : usr/src/cmd/svc/configd/sqlite/test/where.test => usr/src/lib/libsqlite/test/where.test
rename : usr/src/cmd/svc/configd/sqlite/tool/diffdb.c => usr/src/lib/libsqlite/tool/diffdb.c
rename : usr/src/cmd/svc/configd/sqlite/tool/lemon.c => usr/src/lib/libsqlite/tool/lemon.c
rename : usr/src/cmd/svc/configd/sqlite/tool/lempar.c => usr/src/lib/libsqlite/tool/lempar.c
rename : usr/src/cmd/svc/configd/sqlite/tool/memleak.awk => usr/src/lib/libsqlite/tool/memleak.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/memleak2.awk => usr/src/lib/libsqlite/tool/memleak2.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/mkopts.tcl => usr/src/lib/libsqlite/tool/mkopts.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/opcodeDoc.awk => usr/src/lib/libsqlite/tool/opcodeDoc.awk
rename : usr/src/cmd/svc/configd/sqlite/tool/report1.txt => usr/src/lib/libsqlite/tool/report1.txt
rename : usr/src/cmd/svc/configd/sqlite/tool/showdb.c => usr/src/lib/libsqlite/tool/showdb.c
rename : usr/src/cmd/svc/configd/sqlite/tool/showjournal.c => usr/src/lib/libsqlite/tool/showjournal.c
rename : usr/src/cmd/svc/configd/sqlite/tool/space_used.tcl => usr/src/lib/libsqlite/tool/space_used.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/spaceanal.tcl => usr/src/lib/libsqlite/tool/spaceanal.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/speedtest.tcl => usr/src/lib/libsqlite/tool/speedtest.tcl
rename : usr/src/cmd/svc/configd/sqlite/tool/speedtest2.tcl => usr/src/lib/libsqlite/tool/speedtest2.tcl

3 files changed, 38 insertions, 206 deletions

diff --git a/usr/src/uts/common/syscall/gid.c b/usr/src/uts/common/syscall/gid.c
index 388225b600..4ea9660cc3 100644
--- a/usr/src/uts/common/syscall/gid.c
+++ b/usr/src/uts/common/syscall/gid.c
@@ -53,7 +53,7 @@ setgid(gid_t gid)
 		return (set_errno(EINVAL));
 
 	if (gid > MAXUID) {
-		if (ksid_lookup(gid, &ksid) != 0)
+		if (ksid_lookupbygid(gid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {
@@ -137,7 +137,7 @@ setegid(gid_t gid)
 		return (set_errno(EINVAL));
 
 	if (gid > MAXUID) {
-		if (ksid_lookup(gid, &ksid) != 0)
+		if (ksid_lookupbygid(gid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {
@@ -205,7 +205,7 @@ setregid(gid_t rgid, gid_t egid)
 		return (set_errno(EINVAL));
 
 	if (egid != -1 && egid > MAXUID) {
-		if (ksid_lookup(egid, &ksid) != 0)
+		if (ksid_lookupbygid(egid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {
diff --git a/usr/src/uts/common/syscall/sidsys.c b/usr/src/uts/common/syscall/sidsys.c
index bcb749cadc..9e51fe170c 100644
--- a/usr/src/uts/common/syscall/sidsys.c
+++ b/usr/src/uts/common/syscall/sidsys.c
@@ -36,148 +36,53 @@
 #include <sys/systm.h>
 #include <sys/policy.h>
 #include <sys/door.h>
+#include <sys/kidmap.h>
+#include <sys/proc.h>
 
-static kmutex_t idmap_mutex;
-
-typedef struct idmap_reg {
-	door_handle_t 	idmap_door;
-	int		idmap_flags;
-	int		idmap_ref;
-} idmap_reg_t;
-
-static idmap_reg_t *idmap_ptr;
-
-static int idmap_unreg_dh(door_handle_t);
-
-static void
-idmap_freeone(idmap_reg_t *p)
-{
-	ASSERT(p->idmap_ref == 0);
-	ASSERT(MUTEX_HELD(&idmap_mutex));
-
-	door_ki_rele(p->idmap_door);
-	if (idmap_ptr == p)
-		idmap_ptr = NULL;
-
-	kmem_free(p, sizeof (*p));
-}
-
-static int
-idmap_do_call(sidmap_call_t *callp, size_t callsz, void **resp, size_t *respsz)
-{
-	door_arg_t da;
-	idmap_reg_t *p;
-	int ret;
-	int dres;
-
-	mutex_enter(&idmap_mutex);
-	p = idmap_ptr;
-	if (p != NULL) {
-		p->idmap_ref++;
-	} else {
-		mutex_exit(&idmap_mutex);
-		return (-1);
-	}
-	mutex_exit(&idmap_mutex);
-
-	da.data_ptr = (char *)callp;
-	da.data_size = callsz;
-	da.desc_ptr = NULL;
-	da.desc_num = 0;
-	da.rbuf = *resp;
-	da.rsize = *respsz;
-
-	while ((dres = door_ki_upcall(p->idmap_door, &da)) != 0) {
-		switch (dres) {
-		case EINTR:
-		case EAGAIN:
-			delay(1);
-			continue;
-		case EINVAL:
-		case EBADF:
-			(void) idmap_unreg_dh(p->idmap_door);
-			/* FALLTHROUGH */
-		default:
-			ret = -1;
-			goto out;
-		}
-	}
-	*resp = da.rbuf;
-	*respsz = da.rsize;
-	ret = 0;
-out:
-	mutex_enter(&idmap_mutex);
-	if (--p->idmap_ref == 0)
-		idmap_freeone(p);
-	mutex_exit(&idmap_mutex);
-	return (ret);
-}
-
-/*
- * Current code only attempts to map ids to sids.
- */
-int
-idmap_call_byid(uid_t id, ksid_t *ksid)
+static uint64_t
+allocids(int flag, int nuids, int ngids)
 {
-	sidmap_call_t call;
-	domsid_t res, *resp = &res;
-	size_t respsz = sizeof (res);
-
-	call.sc_type = SIDSYS_ID2SID;
-	call.sc_val.sc_id = id;
-
-	if (idmap_do_call(&call, sizeof (call), (void **)&resp, &respsz) != 0)
-		return (-1);
-
-	ksid->ks_domain = ksid_lookupdomain(resp->ds_dom);
-	ksid->ks_rid = resp->ds_rid;
+	rval_t r;
+	uid_t su = 0;
+	gid_t sg = 0;
+	struct door_info di;
+	door_handle_t dh;
+	idmap_reg_t *reg;
+	int err;
 
-	/* Larger SID return value; this usually happens */
-	if (resp != &res)
-		kmem_free(resp, respsz);
+	idmap_get_door(&reg, &dh);
 
-	return (0);
-}
+	if (reg == NULL || dh == NULL)
+		return (set_errno(EPERM));
 
-uid_t
-idmap_call_bysid(ksid_t *ksid)
-{
-	ksiddomain_t *domp = ksid->ks_domain;
-	sidmap_call_t *callp;
-	uid_t res = (uid_t)-1;
-	uid_t *resp = &res;
-	size_t callsz;
-	size_t respsz = sizeof (res);
+	if ((err = door_ki_info(dh, &di)) != 0)
+		return (set_errno(err));
 
-	callsz = sizeof (sidmap_call_t) + domp->kd_len;
+	if (curproc->p_pid != di.di_target)
+		return (set_errno(EPERM));
 
-	callp = kmem_alloc(callsz, KM_SLEEP);
-	callp->sc_type = SIDSYS_SID2ID;
-	bcopy(domp->kd_name, callp->sc_val.sc_sid.ds_dom, domp->kd_len);
-	callp->sc_val.sc_sid.ds_rid = ksid->ks_rid;
+	idmap_release_door(reg);
 
-	if (idmap_do_call(callp, callsz, (void **)&resp, &respsz) != 0)
-		goto out;
+	if (nuids < 0 || ngids < 0)
+		return (set_errno(EINVAL));
 
-	/* Should never happen; the original buffer should be large enough */
-	if (resp != &res) {
-		kmem_free(resp, respsz);
-		goto out;
-	}
+	if (flag != 0 || nuids > 0)
+		err = eph_uid_alloc(flag, &su, nuids);
+	if (err == 0 && (flag != 0 || ngids > 0))
+		err = eph_gid_alloc(flag, &sg, ngids);
 
-	if (respsz != sizeof (uid_t))
-		res = (uid_t)-1;
+	if (err != 0)
+		return (set_errno(EOVERFLOW));
 
-out:
-	kmem_free(callp, callsz);
-	return (res);
+	r.r_val1 = su;
+	r.r_val2 = sg;
+	return (r.r_vals);
 }
 
 static int
 idmap_reg(int did)
 {
 	door_handle_t dh;
-	idmap_reg_t *idmp;
 	int err;
 
 	if ((err = secpolicy_idmap(CRED())) != 0)
@@ -188,39 +93,9 @@ idmap_reg(int did)
 	if (dh == NULL)
 		return (set_errno(EBADF));
 
-	idmp = kmem_alloc(sizeof (*idmp), KM_SLEEP);
-
-	idmp->idmap_door = dh;
-	mutex_enter(&idmap_mutex);
-	if (idmap_ptr != NULL) {
-		if (--idmap_ptr->idmap_ref == 0)
-			idmap_freeone(idmap_ptr);
-	}
-	idmp->idmap_flags = 0;
-	idmp->idmap_ref = 1;
-	idmap_ptr = idmp;
-	mutex_exit(&idmap_mutex);
-	return (0);
-}
-
-static int
-idmap_unreg_dh(door_handle_t dh)
-{
-	mutex_enter(&idmap_mutex);
-	if (idmap_ptr == NULL || idmap_ptr->idmap_door != dh) {
-		mutex_exit(&idmap_mutex);
-		return (EINVAL);
-	}
+	err = idmap_reg_dh(dh);
 
-	if (idmap_ptr->idmap_flags != 0) {
-		mutex_exit(&idmap_mutex);
-		return (EAGAIN);
-	}
-	idmap_ptr->idmap_flags = 1;
-	if (--idmap_ptr->idmap_ref == 0)
-		idmap_freeone(idmap_ptr);
-	mutex_exit(&idmap_mutex);
-	return (0);
+	return (err);
 }
 
 static int
@@ -240,49 +115,6 @@ idmap_unreg(int did)
 	return (0);
 }
 
-static boolean_t
-its_my_door(void)
-{
-	mutex_enter(&idmap_mutex);
-	if (idmap_ptr != NULL) {
-		struct door_info info;
-		int err = door_ki_info(idmap_ptr->idmap_door, &info);
-		if (err == 0 && info.di_target == curproc->p_pid) {
-			mutex_exit(&idmap_mutex);
-			return (B_TRUE);
-		}
-	}
-	mutex_exit(&idmap_mutex);
-	return (B_FALSE);
-}
-
-static uint64_t
-allocids(int flag, int nuids, int ngids)
-{
-	rval_t r;
-	uid_t su = 0;
-	gid_t sg = 0;
-	int err;
-
-	if (!its_my_door())
-		return (set_errno(EPERM));
-
-	if (nuids < 0 || ngids < 0)
-		return (set_errno(EINVAL));
-
-	if (flag != 0 || nuids > 0)
-		err = eph_uid_alloc(flag, &su, nuids);
-	if (err == 0 && (flag != 0 || ngids > 0))
-		err = eph_gid_alloc(flag, &sg, ngids);
-
-	if (err != 0)
-		return (set_errno(EOVERFLOW));
-
-	r.r_val1 = su;
-	r.r_val2 = sg;
-	return (r.r_vals);
-}
-
 uint64_t
 sidsys(int op, int flag, int nuids, int ngids)
 {
diff --git a/usr/src/uts/common/syscall/uid.c b/usr/src/uts/common/syscall/uid.c
index 24e1e92f82..ef96933ba3 100644
--- a/usr/src/uts/common/syscall/uid.c
+++ b/usr/src/uts/common/syscall/uid.c
@@ -59,7 +59,7 @@ setuid(uid_t uid)
 		return (set_errno(EINVAL));
 
 	if (uid > MAXUID) {
-		if (ksid_lookup(uid, &ksid) != 0)
+		if (ksid_lookupbyuid(uid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {
@@ -178,7 +178,7 @@ seteuid(uid_t uid)
 		return (set_errno(EINVAL));
 
 	if (uid > MAXUID) {
-		if (ksid_lookup(uid, &ksid) != 0)
+		if (ksid_lookupbyuid(uid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {
@@ -252,7 +252,7 @@ setreuid(uid_t ruid, uid_t euid)
 		return (set_errno(EINVAL));
 
 	if (euid != -1 && euid > MAXUID) {
-		if (ksid_lookup(euid, &ksid) != 0)
+		if (ksid_lookupbyuid(euid, &ksid) != 0)
 			return (set_errno(EINVAL));
 		ksp = &ksid;
 	} else {