From d3a612ca42c17c3baa6c96ded00f98db349cc881 Mon Sep 17 00:00:00 2001 From: nw141292 Date: Thu, 11 Oct 2007 10:47:49 -0700 Subject: 6592411 large request/response can cause RPC layer of idmap to fail 6613041 trusted domain issues: idmap_name2sid_batch_add1() ignores the domain of the given name --- usr/src/cmd/idmap/idmapd/adutils.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'usr/src/cmd/idmap/idmapd/adutils.c') 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; } } -- cgit v1.2.3