summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2009-08-10 09:13:25 -0400
committerStephen Gallagher <sgallagh@redhat.com>2009-08-10 14:02:43 -0400
commit28bbb2ec4c5f29339488f07f63f55e5c6657e9a1 (patch)
treeec48cb796e5af1726e4642dbd7faccea4534f77b
parent3f36267012d444acabbf0b003af30af4644344bc (diff)
downloadsssd-28bbb2ec4c5f29339488f07f63f55e5c6657e9a1.tar.gz
sssd-28bbb2ec4c5f29339488f07f63f55e5c6657e9a1.tar.bz2
sssd-28bbb2ec4c5f29339488f07f63f55e5c6657e9a1.zip
Do not fail enumerations because of range checks
-rw-r--r--server/db/sysdb_ops.c6
-rw-r--r--server/providers/ldap/sdap_async.c18
2 files changed, 18 insertions, 6 deletions
diff --git a/server/db/sysdb_ops.c b/server/db/sysdb_ops.c
index 8610e634..687c754f 100644
--- a/server/db/sysdb_ops.c
+++ b/server/db/sysdb_ops.c
@@ -1692,14 +1692,14 @@ struct tevent_req *sysdb_add_user_send(TALLOC_CTX *mem_ctx,
(uid < domain->id_min || uid > domain->id_max)) {
DEBUG(2, ("Supplied uid [%d] is not in the allowed range [%d-%d].\n",
uid, domain->id_min, domain->id_max));
- ERROR_OUT(ret, EINVAL, fail);
+ ERROR_OUT(ret, ERANGE, fail);
}
if (domain->id_max != 0 && gid != 0 &&
(gid < domain->id_min || gid > domain->id_max)) {
DEBUG(2, ("Supplied gid [%d] is not in the allowed range [%d-%d].\n",
gid, domain->id_min, domain->id_max));
- ERROR_OUT(ret, EINVAL, fail);
+ ERROR_OUT(ret, ERANGE, fail);
}
if (domain->mpg) {
@@ -2104,7 +2104,7 @@ struct tevent_req *sysdb_add_group_send(TALLOC_CTX *mem_ctx,
(gid < domain->id_min || gid > domain->id_max)) {
DEBUG(2, ("Supplied gid [%d] is not in the allowed range [%d-%d].\n",
gid, domain->id_min, domain->id_max));
- ERROR_OUT(ret, EINVAL, fail);
+ ERROR_OUT(ret, ERANGE, fail);
}
if (domain->mpg) {
diff --git a/server/providers/ldap/sdap_async.c b/server/providers/ldap/sdap_async.c
index a4491d81..b2e0fb21 100644
--- a/server/providers/ldap/sdap_async.c
+++ b/server/providers/ldap/sdap_async.c
@@ -1255,7 +1255,11 @@ static void sdap_get_users_save_done(struct tevent_req *subreq)
ret = sdap_save_user_recv(subreq);
talloc_zfree(subreq);
- if (ret) {
+
+ /* If the configuration has id ranges and the remote user is out
+ * of these ranges we will get back an ERANGE error. In this case
+ * we just ignore the error and go on with the next op */
+ if (ret && (ret != ERANGE)) {
tevent_req_error(req, ret);
return;
}
@@ -1448,7 +1452,11 @@ static void sdap_get_groups_save_done(struct tevent_req *subreq)
ret = sdap_save_group_recv(subreq);
talloc_zfree(subreq);
- if (ret) {
+
+ /* If the configuration has id ranges and the remote user is out
+ * of these ranges we will get back an ERANGE error. In this case
+ * we just ignore the error and go on with the next op */
+ if (ret && (ret != ERANGE)) {
tevent_req_error(req, ret);
return;
}
@@ -1752,7 +1760,11 @@ static void sdap_get_initgr_save_done(struct tevent_req *subreq)
ret = sdap_save_group_recv(subreq);
talloc_zfree(subreq);
- if (ret) {
+
+ /* If the configuration has id ranges and the remote user is out
+ * of these ranges we will get back an ERANGE error. In this case
+ * we just ignore the error and go on with the next op */
+ if (ret && (ret != ERANGE)) {
tevent_req_error(req, ret);
return;
}