diff options
author | Michal Zidek <mzidek@redhat.com> | 2014-04-04 20:04:46 +0200 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-04-07 17:36:11 +0200 |
commit | 5a4f23a51406af7dcd08e2fb50538292f622e26b (patch) | |
tree | 2934fcfc35ba75b71b3e50c56e53b050fceb30d5 | |
parent | 7ac7dec08ec2c82a86fd6a90388993cfcee26da1 (diff) | |
download | sssd-5a4f23a51406af7dcd08e2fb50538292f622e26b.tar.gz sssd-5a4f23a51406af7dcd08e2fb50538292f622e26b.tar.xz sssd-5a4f23a51406af7dcd08e2fb50538292f622e26b.zip |
Remove dead code from ipa_get_selinux_recv
The 'else' branches in ipa_get_selinux_recv are never
executed (and even if they were, the result would be
the same as if the true branches were taken).
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r-- | src/providers/ipa/ipa_selinux.c | 61 |
1 files changed, 23 insertions, 38 deletions
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index e0d7a006d..5619d9681 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -1314,53 +1314,38 @@ ipa_get_selinux_recv(struct tevent_req *req, TEVENT_REQ_RETURN_ON_ERROR(req); - if (state->defaults != NULL) { - ret = sysdb_attrs_get_string(state->defaults, - IPA_CONFIG_SELINUX_DEFAULT_USER_CTX, - &tmp_str); - if (ret != EOK && ret != ENOENT) { - return ret; - } - - if (ret == EOK) { - *default_user = talloc_strdup(mem_ctx, tmp_str); - if (*default_user == NULL) { - return ENOMEM; - } - } - - ret = sysdb_attrs_get_string(state->defaults, IPA_CONFIG_SELINUX_MAP_ORDER, - &tmp_str); - if (ret != EOK) { - return ret; - } + ret = sysdb_attrs_get_string(state->defaults, + IPA_CONFIG_SELINUX_DEFAULT_USER_CTX, + &tmp_str); + if (ret != EOK && ret != ENOENT) { + return ret; + } - *map_order = talloc_strdup(mem_ctx, tmp_str); - if (*map_order == NULL) { - talloc_zfree(*default_user); + if (ret == EOK) { + *default_user = talloc_strdup(mem_ctx, tmp_str); + if (*default_user == NULL) { return ENOMEM; } - } else { - *map_order = NULL; - *default_user = NULL; } - if (state->selinuxmaps != NULL && state->nmaps != 0) { - *count = state->nmaps; - *maps = talloc_steal(mem_ctx, state->selinuxmaps); - } else { - *count = 0; - *maps = NULL; + ret = sysdb_attrs_get_string(state->defaults, IPA_CONFIG_SELINUX_MAP_ORDER, + &tmp_str); + if (ret != EOK) { + return ret; } - if (state->hbac_rules != NULL) { - *hbac_count = state->hbac_rule_count; - *hbac_rules = talloc_steal(mem_ctx, state->hbac_rules); - } else { - *hbac_count = 0; - *hbac_rules = NULL; + *map_order = talloc_strdup(mem_ctx, tmp_str); + if (*map_order == NULL) { + talloc_zfree(*default_user); + return ENOMEM; } + *count = state->nmaps; + *maps = talloc_steal(mem_ctx, state->selinuxmaps); + + *hbac_count = state->hbac_rule_count; + *hbac_rules = talloc_steal(mem_ctx, state->hbac_rules); + return EOK; } |