3 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/cmd/idmap/idmapd/adutils.c b/usr/src/cmd/idmap/idmapd/adutils.c
index 4cfa56e073..f15f81c676 100644
--- a/usr/src/cmd/idmap/idmapd/adutils.c
+++ b/usr/src/cmd/idmap/idmapd/adutils.c
@@ -1473,17 +1473,16 @@ idmap_name2sid_batch_add1(idmap_query_state_t *state,
 	 * Handle optional domain parameter and default domain
 	 * semantics.  The get a basedn from the domainname.
 	 */
-	if (dname == NULL || *dname != '\0') {
+	samAcctNameLen = strlen(name);
+	if (dname == NULL || *dname == '\0') {
 		/* domain name not given separately */
 		if ((cp = strchr(name, '@')) == NULL) {
 			/* nor is the name qualified */
 			dname = state->qadh->owner->dflt_w2k_dom;
 			basedn = state->qadh->owner->basedn;
-			samAcctNameLen = strlen(name);
 		} else {
 			/* the name is qualified */
-			/* LINTED */
-			samAcctNameLen = cp - name;
+			samAcctNameLen -= strlen(cp);
 			dname = cp + 1;
 		}
 	}
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.c b/usr/src/cmd/idmap/idmapd/idmapd.c
index 650d367609..c3baeb6a83 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.c
+++ b/usr/src/cmd/idmap/idmapd/idmapd.c
@@ -263,7 +263,7 @@ main(int argc, char **argv)
 static void
 init_idmapd() {
 	int	error;
-	int connmaxrec = RPC_MAX_SIZE;
+	int connmaxrec = IDMAP_MAX_DOOR_RPC;
 
 	/* create directories as root and chown to daemon uid */
 	if (create_directory(IDMAP_DBDIR, DAEMON_UID, DAEMON_GID) < 0)
@@ -303,7 +303,7 @@ init_idmapd() {
 		exit(1);
 	}
 
-	xprt = svc_door_create(idmap_prog_1, IDMAP_PROG, IDMAP_V1, 0);
+	xprt = svc_door_create(idmap_prog_1, IDMAP_PROG, IDMAP_V1, connmaxrec);
 	if (xprt == NULL) {
 		idmapdlog(LOG_ERR,
 		"idmapd: unable to create door RPC service");
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.h b/usr/src/cmd/idmap/idmapd/idmapd.h
index 7ead846242..9ad4328335 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.h
+++ b/usr/src/cmd/idmap/idmapd/idmapd.h
@@ -141,7 +141,6 @@ typedef struct wksids_table {
 #define	IDMAP_DBNAME	IDMAP_DBDIR "/idmap.db"
 #define	IDMAP_CACHENAME	IDMAP_CACHEDIR "/idmap.db"
 #define	IDMAP_CACHENAME	IDMAP_CACHEDIR "/idmap.db"
-#define	RPC_MAX_SIZE	65536
 
 #define	EMPTY_STRING(str)	(str == NULL || *str == 0)