IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa-kdb: map_groups() consider all results

Browse Source 
Resolves https://fedorahosted.org/freeipa/ticket/5573

Reviewed-By: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Sumit Bose 2015-12-16 12:38:16 +01:00 committed by Petr Vobornik
parent d85d709473
commit 348c400484
1 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
daemons/ipa-kdb/ipa_kdb_mspac.c
View File

@ -1082,68 +1082,72 @@ static int map_groups(TALLOC_CTX *memctx, krb5_context kcontext,
continue; continue;
} }
ldap_derefresponse_free(deref_results); do {
ret = ipadb_ldap_deref_results(ipactx->lcontext, lentry, &deref_results); ldap_derefresponse_free(deref_results);
switch (ret) { ret = ipadb_ldap_deref_results(ipactx->lcontext, lentry, &deref_results);
case ENOENT: switch (ret) {
/* No entry found, try next SID */ case ENOENT:
break; /* No entry found, try next SID */
case 0:
if (deref_results == NULL) {
krb5_klog_syslog(LOG_ERR, "No results.");
break; break;
} case 0:
if (deref_results == NULL) {
krb5_klog_syslog(LOG_ERR, "No results.");
break;
}
for (dres = deref_results; dres; dres = dres->next) { for (dres = deref_results; dres; dres = dres->next) {
count++; count++;
} }
sids = talloc_realloc(memctx, sids, struct dom_sid, count); sids = talloc_realloc(memctx, sids, struct dom_sid, count);
if (sids == NULL) { if (sids == NULL) {
krb5_klog_syslog(LOG_ERR, "talloc_realloc failed."); krb5_klog_syslog(LOG_ERR, "talloc_realloc failed.");
kerr = ENOMEM; kerr = ENOMEM;
goto done;
}
for (dres = deref_results; dres; dres = dres->next) {
gid = 0;
memset(&sid, '\0', sizeof(struct dom_sid));
for (dval = dres->attrVals; dval; dval = dval->next) {
if (strcasecmp(dval->type, "gidNumber") == 0) {
errno = 0;
gid = strtoul((char *)dval->vals[0].bv_val,
&endptr,10);
if (gid == 0 || gid >= UINT32_MAX || errno != 0 ||
*endptr != '\0') {
continue;
}
}
if (strcasecmp(dval->type,
"ipaNTSecurityIdentifier") == 0) {
kerr = string_to_sid((char *)dval->vals[0].bv_val, &sid);
if (kerr != 0) {
continue;
}
}
}
if (gid != 0 && sid.sid_rev_num != 0) {
/* TODO: check if gid maps to sid */
if (sid_index >= count) {
krb5_klog_syslog(LOG_ERR, "Index larger than "
"array, this shoould "
"never happen.");
kerr = EFAULT;
goto done;
}
memcpy(&sids[sid_index], &sid, sizeof(struct dom_sid));
sid_index++;
}
}
break;
default:
goto done; goto done;
} }
for (dres = deref_results; dres; dres = dres->next) { lentry = ldap_next_entry(ipactx->lcontext, lentry);
gid = 0; } while (lentry != NULL);
memset(&sid, '\0', sizeof(struct dom_sid));
for (dval = dres->attrVals; dval; dval = dval->next) {
if (strcasecmp(dval->type, "gidNumber") == 0) {
errno = 0;
gid = strtoul((char *)dval->vals[0].bv_val,
&endptr,10);
if (gid == 0 || gid >= UINT32_MAX || errno != 0 ||
*endptr != '\0') {
continue;
}
}
if (strcasecmp(dval->type,
"ipaNTSecurityIdentifier") == 0) {
kerr = string_to_sid((char *)dval->vals[0].bv_val, &sid);
if (kerr != 0) {
continue;
}
}
}
if (gid != 0 && sid.sid_rev_num != 0) {
/* TODO: check if gid maps to sid */
if (sid_index >= count) {
krb5_klog_syslog(LOG_ERR, "Index larger than "
"array, this shoould "
"never happen.");
kerr = EFAULT;
goto done;
}
memcpy(&sids[sid_index], &sid, sizeof(struct dom_sid));
sid_index++;
}
}
break;
default:
goto done;
}
} }
*_ipa_group_sids_count = sid_index; *_ipa_group_sids_count = sid_index;