diff options
| author | Sumit Bose <sbose@redhat.com> | 2010-11-26 10:46:11 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-12-02 09:38:10 -0500 |
| commit | d1571f8c173ca9172fa295e6aac48b8c0c367950 (patch) | |
| tree | ac2208fa402a2718bf0023cd06d7c4d986565213 /src/providers/proxy/proxy_id.c | |
| parent | c99f085747aabafc4a440b5bfd1d9a6bea995620 (diff) | |
| download | sssd-d1571f8c173ca9172fa295e6aac48b8c0c367950.tar.gz sssd-d1571f8c173ca9172fa295e6aac48b8c0c367950.tar.xz sssd-d1571f8c173ca9172fa295e6aac48b8c0c367950.zip | |
Add a special filter type to handle enumerations
Diffstat (limited to 'src/providers/proxy/proxy_id.c')
| -rw-r--r-- | src/providers/proxy/proxy_id.c | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 71541386f..4fd656fed 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -1045,6 +1045,7 @@ void proxy_get_account_info(struct be_req *breq) uid_t uid; gid_t gid; int ret; + char *endptr; ar = talloc_get_type(breq->req_data, struct be_acct_req); ctx = talloc_get_type(breq->be_ctx->bet_info[BET_ID].pvt_bet_data, @@ -1064,27 +1065,21 @@ void proxy_get_account_info(struct be_req *breq) switch (ar->entry_type & 0xFFF) { case BE_REQ_USER: /* user */ switch (ar->filter_type) { + case BE_FILTER_ENUM: + ret = enum_users(breq, ctx, sysdb, domain); + break; + case BE_FILTER_NAME: - if (strchr(ar->filter_value, '*')) { - ret = enum_users(breq, ctx, sysdb, domain); - } else { - ret = get_pw_name(breq, ctx, sysdb, domain, ar->filter_value); - } + ret = get_pw_name(breq, ctx, sysdb, domain, ar->filter_value); break; case BE_FILTER_IDNUM: - if (strchr(ar->filter_value, '*')) { + uid = (uid_t) strtouint32(ar->filter_value, &endptr, 0); + if (errno || *endptr || (ar->filter_value == endptr)) { return proxy_reply(breq, DP_ERR_FATAL, EINVAL, "Invalid attr type"); - } else { - char *endptr; - uid = (uid_t) strtouint32(ar->filter_value, &endptr, 0); - if (errno || *endptr || (ar->filter_value == endptr)) { - return proxy_reply(breq, DP_ERR_FATAL, - EINVAL, "Invalid attr type"); - } - ret = get_pw_uid(breq, ctx, sysdb, domain, uid); } + ret = get_pw_uid(breq, ctx, sysdb, domain, uid); break; default: return proxy_reply(breq, DP_ERR_FATAL, @@ -1094,26 +1089,19 @@ void proxy_get_account_info(struct be_req *breq) case BE_REQ_GROUP: /* group */ switch (ar->filter_type) { + case BE_FILTER_ENUM: + ret = enum_groups(breq, ctx, sysdb, domain); + break; case BE_FILTER_NAME: - if (strchr(ar->filter_value, '*')) { - ret = enum_groups(breq, ctx, sysdb, domain); - } else { - ret = get_gr_name(breq, ctx, sysdb, domain, ar->filter_value); - } + ret = get_gr_name(breq, ctx, sysdb, domain, ar->filter_value); break; case BE_FILTER_IDNUM: - if (strchr(ar->filter_value, '*')) { + gid = (gid_t) strtouint32(ar->filter_value, &endptr, 0); + if (errno || *endptr || (ar->filter_value == endptr)) { return proxy_reply(breq, DP_ERR_FATAL, EINVAL, "Invalid attr type"); - } else { - char *endptr; - gid = (gid_t) strtouint32(ar->filter_value, &endptr, 0); - if (errno || *endptr || (ar->filter_value == endptr)) { - return proxy_reply(breq, DP_ERR_FATAL, - EINVAL, "Invalid attr type"); - } - ret = get_gr_gid(breq, ctx, sysdb, domain, gid); } + ret = get_gr_gid(breq, ctx, sysdb, domain, gid); break; default: return proxy_reply(breq, DP_ERR_FATAL, @@ -1126,10 +1114,6 @@ void proxy_get_account_info(struct be_req *breq) return proxy_reply(breq, DP_ERR_FATAL, EINVAL, "Invalid filter type"); } - if (strchr(ar->filter_value, '*')) { - return proxy_reply(breq, DP_ERR_FATAL, - EINVAL, "Invalid filter value"); - } if (ctx->ops.initgroups_dyn == NULL) { return proxy_reply(breq, DP_ERR_FATAL, ENODEV, "Initgroups call not supported"); |