[SSSD] [PATCH 5/5] Use an entry type mask macro to filter entry types
Simo Sorce
simo at redhat.com
Sat Nov 24 04:33:51 UTC 2012
Avoids hardcoding magic numbers everywhere and self documents why a
mask is being applied.
---
src/providers/data_provider.h | 1 +
src/providers/ipa/ipa_id.c | 2 +-
src/providers/ipa/ipa_subdomains_id.c | 2 +-
src/providers/ldap/ldap_id.c | 2 +-
src/providers/proxy/proxy_id.c | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index d49fcd524ef37e4755263399903d2804aaf29737..bb944509da9f1dc89216266cf62c57fb4127fd57 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -142,6 +142,7 @@
#define BE_REQ_SUDO_RULES 0x0007
#define BE_REQ_AUTOFS 0x0009
#define BE_REQ_HOST 0x0010
+#define BE_REQ_TYPE_MASK 0x00FF
#define BE_REQ_FAST 0x1000
/* AUTH related common data and functions */
diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c
index 3ad90865073b69ea8670331257b1603fbc183348..ddd1db1ec7a0ff759966d370c6cdc6021fe363ec 100644
--- a/src/providers/ipa/ipa_id.c
+++ b/src/providers/ipa/ipa_id.c
@@ -92,7 +92,7 @@ void ipa_account_info_handler(struct be_req *breq)
goto done;
}
- switch (ar->entry_type & 0xFFF) {
+ switch (ar->entry_type & BE_REQ_TYPE_MASK) {
case BE_REQ_USER: /* user */
case BE_REQ_GROUP: /* group */
diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c
index 518ff85d7b2caa78e1ff779d9cbfb332dd447b1f..481b998065eec29a52b9c39fba4017ff10098481 100644
--- a/src/providers/ipa/ipa_subdomains_id.c
+++ b/src/providers/ipa/ipa_subdomains_id.c
@@ -85,7 +85,7 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx,
}
state->sysdb = state->domain->sysdb;
- state->entry_type = (ar->entry_type & 0xFFF);
+ state->entry_type = (ar->entry_type & BE_REQ_TYPE_MASK);
state->filter = ar->filter_value;
state->filter_type = ar->filter_type;
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 13a8212bc2cb0055a0e200527e4c7da7d66c4c45..a258e827b4788c0bea65021e286d6628e952c4ea 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -929,7 +929,7 @@ void sdap_handle_account_info(struct be_req *breq, struct sdap_id_ctx *ctx)
ar = talloc_get_type(breq->req_data, struct be_acct_req);
- switch (ar->entry_type & 0xFFF) {
+ switch (ar->entry_type & BE_REQ_TYPE_MASK) {
case BE_REQ_USER: /* user */
/* skip enumerations on demand */
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index ce66fa128e29eea880f28733570a7420bd6d445e..87eb91b1ee47fce61757aa58efc13d84ecc2acd2 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -1347,7 +1347,7 @@ void proxy_get_account_info(struct be_req *breq)
return proxy_reply(breq, DP_ERR_FATAL, EINVAL, "Invalid attr type");
}
- switch (ar->entry_type & 0xFFF) {
+ switch (ar->entry_type & BE_REQ_TYPE_MASK) {
case BE_REQ_USER: /* user */
switch (ar->filter_type) {
case BE_FILTER_ENUM:
--
1.7.1
More information about the sssd-devel
mailing list