From f9ae648c422253c21d91754bc00db21c684c2685 Mon Sep 17 00:00:00 2001 From: MIZUTA Takeshi Date: Thu, 14 Nov 2019 02:12:56 +0900 Subject: [PATCH] Unify the indentation to 4 spaces The Coding guidelines include the following: https://docs.pagure.org/SSSD.sssd/developers/coding_style.html MUST: No tabs all indentation 4 spaces. However, there are places where the indentation is not 4 spaces. Unify not 4 spaces indentation to 4 spaces. --- src/db/sysdb_ops.c | 38 ++--- src/db/sysdb_subdomains.c | 4 +- src/lib/idmap/sss_idmap.c | 4 +- src/lib/sifp/sss_sifp_dbus.c | 128 ++++++++--------- src/monitor/monitor.c | 2 +- src/monitor/monitor_netlink.c | 30 ++-- src/p11_child/p11_child_nss.c | 12 +- src/providers/ad/ad_gpo.c | 38 ++--- src/providers/ad/ad_gpo_child.c | 2 +- src/providers/ad/ad_subdomains.c | 10 +- src/providers/data_provider/dp.c | 2 +- src/providers/ipa/ipa_rules_common.c | 2 +- src/providers/ipa/ipa_subdomains.c | 10 +- src/providers/ipa/ipa_subdomains_id.c | 2 +- src/providers/ipa/ipa_views.c | 8 +- src/providers/ldap/ldap_auth.c | 2 +- src/providers/ldap/sdap.c | 14 +- src/providers/ldap/sdap_async.c | 18 +-- src/providers/ldap/sdap_async_nested_groups.c | 134 +++++++++--------- .../common/cache_req/cache_req_domain.c | 14 +- .../cache_req/plugins/cache_req_common.c | 8 +- src/responder/common/negcache.c | 6 +- src/responder/common/responder_get_domains.c | 4 +- src/responder/ifp/ifp_domains.c | 22 +-- src/responder/ifp/ifp_groups.c | 8 +- src/responder/ifp/ifp_users.c | 10 +- src/responder/ifp/ifpsrv_cmd.c | 2 +- src/responder/kcm/kcmsrv_ccache_secrets.c | 2 +- src/responder/pam/pamsrv.c | 4 +- src/sbus/interface/sbus_iterator_writers.c | 4 +- src/sbus/sbus_opath.c | 100 ++++++------- src/sss_client/nss_compat.h | 50 +++---- src/sss_client/pam_sss.c | 24 ++-- src/sss_client/sudo/sss_sudo_response.c | 10 +- src/sss_iface/sbus_sss_client_sync.c | 18 +-- src/tools/sss_seed.c | 16 +-- src/tools/tools_mc_util.c | 4 +- 37 files changed, 383 insertions(+), 383 deletions(-) diff --git a/src/db/sysdb_ops.c b/src/db/sysdb_ops.c index a93748c69c..689abaa58a 100644 --- a/src/db/sysdb_ops.c +++ b/src/db/sysdb_ops.c @@ -647,10 +647,10 @@ int sysdb_search_user_by_sid_str(TALLOC_CTX *mem_ctx, struct ldb_message **msg) { - return sysdb_search_entry_by_sid_str(mem_ctx, domain, - SYSDB_TMPL_USER_BASE, - SYSDB_PWSID_FILTER, - sid_str, attrs, msg); + return sysdb_search_entry_by_sid_str(mem_ctx, domain, + SYSDB_TMPL_USER_BASE, + SYSDB_PWSID_FILTER, + sid_str, attrs, msg); } int sysdb_search_user_by_upn_res(TALLOC_CTX *mem_ctx, @@ -840,10 +840,10 @@ int sysdb_search_group_by_sid_str(TALLOC_CTX *mem_ctx, struct ldb_message **msg) { - return sysdb_search_entry_by_sid_str(mem_ctx, domain, - SYSDB_TMPL_GROUP_BASE, - SYSDB_GRSID_FILTER, - sid_str, attrs, msg); + return sysdb_search_entry_by_sid_str(mem_ctx, domain, + SYSDB_TMPL_GROUP_BASE, + SYSDB_GRSID_FILTER, + sid_str, attrs, msg); } /* =Search-Group-by-Name============================================ */ @@ -3563,7 +3563,7 @@ int sysdb_store_custom(struct sss_domain_info *domain, } if (ret == ENOENT) { - add_object = true; + add_object = true; } msg = ldb_msg_new(tmp_ctx); @@ -3870,12 +3870,12 @@ int sysdb_search_users_by_timestamp(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_merge_msg_list_ts_attrs(domain->sysdb, msgs_count, msgs, attrs); - if (ret != EOK) { - goto done; - } + ret = sysdb_merge_msg_list_ts_attrs(domain->sysdb, msgs_count, msgs, attrs); + if (ret != EOK) { + goto done; + } - goto immediately; + goto immediately; } else if (ret != EOK) { goto done; } @@ -4234,12 +4234,12 @@ int sysdb_search_groups_by_timestamp(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_merge_msg_list_ts_attrs(domain->sysdb, msgs_count, msgs, attrs); - if (ret != EOK) { - goto done; - } + ret = sysdb_merge_msg_list_ts_attrs(domain->sysdb, msgs_count, msgs, attrs); + if (ret != EOK) { + goto done; + } - goto immediately; + goto immediately; } else if (ret != EOK) { goto done; } diff --git a/src/db/sysdb_subdomains.c b/src/db/sysdb_subdomains.c index 0ca6a611f5..fdfc753f46 100644 --- a/src/db/sysdb_subdomains.c +++ b/src/db/sysdb_subdomains.c @@ -826,7 +826,7 @@ errno_t sysdb_master_domain_add_info(struct sss_domain_info *domain, do_update = true; } - if (forest != NULL && (domain->forest == NULL || + if (forest != NULL && (domain->forest == NULL || strcmp(domain->forest, forest) != 0)) { ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_FOREST, LDB_FLAG_MOD_REPLACE, NULL); @@ -844,7 +844,7 @@ errno_t sysdb_master_domain_add_info(struct sss_domain_info *domain, do_update = true; } - if (realm != NULL && (domain->realm == NULL || + if (realm != NULL && (domain->realm == NULL || strcmp(domain->realm, realm) != 0)) { ret = ldb_msg_add_empty(msg, SYSDB_SUBDOMAIN_REALM, LDB_FLAG_MOD_REPLACE, NULL); diff --git a/src/lib/idmap/sss_idmap.c b/src/lib/idmap/sss_idmap.c index 57e9d3087e..55009eafd7 100644 --- a/src/lib/idmap/sss_idmap.c +++ b/src/lib/idmap/sss_idmap.c @@ -1510,8 +1510,8 @@ enum idmap_error_code sss_idmap_ctx_get_autorid(struct sss_idmap_ctx *ctx, bool *_autorid) { CHECK_IDMAP_CTX(ctx, IDMAP_CONTEXT_INVALID); - *_autorid = ctx->idmap_opts.autorid_mode; - return IDMAP_SUCCESS; + *_autorid = ctx->idmap_opts.autorid_mode; + return IDMAP_SUCCESS; } enum idmap_error_code diff --git a/src/lib/sifp/sss_sifp_dbus.c b/src/lib/sifp/sss_sifp_dbus.c index 2906c5ac38..8863045eda 100644 --- a/src/lib/sifp/sss_sifp_dbus.c +++ b/src/lib/sifp/sss_sifp_dbus.c @@ -34,36 +34,36 @@ static sss_sifp_error sss_sifp_ifp_call(sss_sifp_ctx *ctx, va_list ap, DBusMessage **_reply) { - DBusMessage *msg = NULL; - sss_sifp_error ret; - dbus_bool_t bret; - - if (object_path == NULL || interface == NULL || method == NULL) { - return SSS_SIFP_INVALID_ARGUMENT; - } - - msg = sss_sifp_create_message(object_path, interface, method); - if (msg == NULL) { - ret = SSS_SIFP_OUT_OF_MEMORY; - goto done; - } - - if (first_arg_type != DBUS_TYPE_INVALID) { - bret = dbus_message_append_args_valist(msg, first_arg_type, ap); - if (!bret) { - ret = SSS_SIFP_IO_ERROR; - goto done; - } - } - - ret = sss_sifp_send_message(ctx, msg, _reply); + DBusMessage *msg = NULL; + sss_sifp_error ret; + dbus_bool_t bret; + + if (object_path == NULL || interface == NULL || method == NULL) { + return SSS_SIFP_INVALID_ARGUMENT; + } + + msg = sss_sifp_create_message(object_path, interface, method); + if (msg == NULL) { + ret = SSS_SIFP_OUT_OF_MEMORY; + goto done; + } + + if (first_arg_type != DBUS_TYPE_INVALID) { + bret = dbus_message_append_args_valist(msg, first_arg_type, ap); + if (!bret) { + ret = SSS_SIFP_IO_ERROR; + goto done; + } + } + + ret = sss_sifp_send_message(ctx, msg, _reply); done: - if (msg != NULL) { - dbus_message_unref(msg); - } + if (msg != NULL) { + dbus_message_unref(msg); + } - return ret; + return ret; } DBusMessage * @@ -206,36 +206,36 @@ sss_sifp_invoke_find_va(sss_sifp_ctx *ctx, int first_arg_type, va_list ap) { - DBusMessage *reply = NULL; - char *dbus_method = NULL; - sss_sifp_error ret; + DBusMessage *reply = NULL; + char *dbus_method = NULL; + sss_sifp_error ret; - if (ctx == NULL || method == NULL || _object_path == NULL) { - return SSS_SIFP_INVALID_ARGUMENT; - } + if (ctx == NULL || method == NULL || _object_path == NULL) { + return SSS_SIFP_INVALID_ARGUMENT; + } - dbus_method = sss_sifp_strcat(ctx, "Find", method); - if (dbus_method == NULL) { - ret = SSS_SIFP_OUT_OF_MEMORY; - goto done; - } + dbus_method = sss_sifp_strcat(ctx, "Find", method); + if (dbus_method == NULL) { + ret = SSS_SIFP_OUT_OF_MEMORY; + goto done; + } - ret = sss_sifp_ifp_call(ctx, object_path, interface, dbus_method, - first_arg_type, ap, &reply); - if (ret != SSS_SIFP_OK) { - goto done; - } + ret = sss_sifp_ifp_call(ctx, object_path, interface, dbus_method, + first_arg_type, ap, &reply); + if (ret != SSS_SIFP_OK) { + goto done; + } - ret = sss_sifp_parse_object_path(ctx, reply, _object_path); + ret = sss_sifp_parse_object_path(ctx, reply, _object_path); done: sss_sifp_free_string(ctx, &dbus_method); - if (reply != NULL) { - dbus_message_unref(reply); - } + if (reply != NULL) { + dbus_message_unref(reply); + } - return ret; + return ret; } sss_sifp_error @@ -247,14 +247,14 @@ sss_sifp_invoke_find_ex(sss_sifp_ctx *ctx, int first_arg_type, ...) { - va_list ap; - sss_sifp_error ret; - - va_start(ap, first_arg_type); - ret = sss_sifp_invoke_find_va(ctx, object_path, interface, method, - _object_path, first_arg_type, ap); - va_end(ap); - return ret; + va_list ap; + sss_sifp_error ret; + + va_start(ap, first_arg_type); + ret = sss_sifp_invoke_find_va(ctx, object_path, interface, method, + _object_path, first_arg_type, ap); + va_end(ap); + return ret; } sss_sifp_error @@ -264,12 +264,12 @@ sss_sifp_invoke_find(sss_sifp_ctx *ctx, int first_arg_type, ...) { - va_list ap; - sss_sifp_error ret; - - va_start(ap, first_arg_type); - ret = sss_sifp_invoke_find_va(ctx, SSS_SIFP_PATH, SSS_SIFP_IFACE, method, - _object_path, first_arg_type, ap); - va_end(ap); - return ret; + va_list ap; + sss_sifp_error ret; + + va_start(ap, first_arg_type); + ret = sss_sifp_invoke_find_va(ctx, SSS_SIFP_PATH, SSS_SIFP_IFACE, method, + _object_path, first_arg_type, ap); + va_end(ap); + return ret; } diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index a97a528ae7..5520667ba8 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -439,7 +439,7 @@ static int notify_startup(void) "Error sending notification to systemd %d: %s\n", ret, sss_strerror(ret)); - return ret; + return ret; } #endif diff --git a/src/monitor/monitor_netlink.c b/src/monitor/monitor_netlink.c index 3703a148dc..f2240eaf56 100644 --- a/src/monitor/monitor_netlink.c +++ b/src/monitor/monitor_netlink.c @@ -433,20 +433,20 @@ static int nlw_group_subscribe(struct nlw_handle *nlp, int group) return ret; } #else - int nlfd = nl_socket_get_fd(nlp); - - errno = 0; - ret = setsockopt(nlfd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, - &group, sizeof(group)); - if (ret < 0) { - ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, - "setsockopt failed (%d): %s\n", ret, strerror(ret)); - return ret; - } + int nlfd = nl_socket_get_fd(nlp); + + errno = 0; + ret = setsockopt(nlfd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP, + &group, sizeof(group)); + if (ret < 0) { + ret = errno; + DEBUG(SSSDBG_CRIT_FAILURE, + "setsockopt failed (%d): %s\n", ret, strerror(ret)); + return ret; + } #endif - return 0; + return 0; } static int nlw_groups_subscribe(struct nlw_handle *nlp, int *groups) @@ -699,9 +699,9 @@ static void addr_msg_handler(struct nl_object *obj, void *arg) (struct sockaddr *) &sa6, &salen); if (err < 0) { - DEBUG(SSSDBG_MINOR_FAILURE, - "Unknown error in nl_addr_fill_sockaddr\n"); - return; + DEBUG(SSSDBG_MINOR_FAILURE, + "Unknown error in nl_addr_fill_sockaddr\n"); + return; } if (!check_ipv6_addr(&sa6.sin6_addr, SSS_NO_SPECIAL)) { diff --git a/src/p11_child/p11_child_nss.c b/src/p11_child/p11_child_nss.c index d3064ff98d..cbb5578fc1 100644 --- a/src/p11_child/p11_child_nss.c +++ b/src/p11_child/p11_child_nss.c @@ -299,12 +299,12 @@ static char *get_pkcs11_uri(TALLOC_CTX *mem_ctx, SECMODModule *mod, static char *password_passthrough(PK11SlotInfo *slot, PRBool retry, void *arg) { - /* give up if 1) no password was supplied, or 2) the password has already - * been rejected once by this token. */ - if (retry || (arg == NULL)) { - return NULL; - } - return PL_strdup((char *)arg); + /* give up if 1) no password was supplied, or 2) the password has already + * been rejected once by this token. */ + if (retry || (arg == NULL)) { + return NULL; + } + return PL_strdup((char *)arg); } static char *get_key_id_str(PK11SlotInfo *slot, CERTCertificate *cert) diff --git a/src/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c index 7442f27cca..5e2ed5ec2e 100644 --- a/src/providers/ad/ad_gpo.c +++ b/src/providers/ad/ad_gpo.c @@ -1197,7 +1197,7 @@ ad_gpo_store_policy_settings(struct sss_domain_info *domain, } for (int a = 0; errors[a]; a++) { - DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[a]); + DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[a]); } ini_config_free_errors(errors); @@ -1249,7 +1249,7 @@ ad_gpo_store_policy_settings(struct sss_domain_info *domain, } for (int a = 0; errors[a]; a++) { - DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[a]); + DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[a]); } ini_config_free_errors(errors); @@ -1324,7 +1324,7 @@ ad_gpo_store_policy_settings(struct sss_domain_info *domain, done: if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, "Error encountered: %d.\n", ret); + DEBUG(SSSDBG_CRIT_FAILURE, "Error encountered: %d.\n", ret); } ini_config_file_destroy(file_ctx); ini_config_destroy(ini_config); @@ -3810,11 +3810,11 @@ ad_gpo_get_gpo_attrs_done(struct tevent_req *subreq) done: - if (ret == EOK) { - tevent_req_done(req); - } else if (ret != EAGAIN) { - tevent_req_error(req, ret); - } + if (ret == EOK) { + tevent_req_done(req); + } else if (ret != EAGAIN) { + tevent_req_error(req, ret); + } } void @@ -3848,11 +3848,11 @@ ad_gpo_get_sd_referral_done(struct tevent_req *subreq) done: - if (ret == EOK) { - tevent_req_done(req); - } else if (ret != EAGAIN) { - tevent_req_error(req, ret); - } + if (ret == EOK) { + tevent_req_done(req); + } else if (ret != EAGAIN) { + tevent_req_error(req, ret); + } } static bool machine_ext_names_is_blank(char *attr_value) @@ -4691,13 +4691,13 @@ ad_gpo_get_sd_referral_search_done(struct tevent_req *subreq) state->reply = talloc_steal(state, results[0]); done: - talloc_free(results); + talloc_free(results); - if (ret == EOK) { - tevent_req_done(req); - } else if (ret != EAGAIN) { - tevent_req_error(req, ret); - } + if (ret == EOK) { + tevent_req_done(req); + } else if (ret != EAGAIN) { + tevent_req_error(req, ret); + } } errno_t diff --git a/src/providers/ad/ad_gpo_child.c b/src/providers/ad/ad_gpo_child.c index a0bd6e13a3..70bad3d413 100644 --- a/src/providers/ad/ad_gpo_child.c +++ b/src/providers/ad/ad_gpo_child.c @@ -488,7 +488,7 @@ ad_gpo_parse_ini_file(const char *smb_path, } for (int i = 0; errors[i]; i++) { - DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[i]); + DEBUG(SSSDBG_CRIT_FAILURE, "%s\n", errors[i]); } ini_config_free_errors(errors); diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index 2ce34489f6..731b596cf7 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -2037,15 +2037,15 @@ static errno_t ad_subdomains_handler_recv(TALLOC_CTX *mem_ctx, struct tevent_req *req, struct dp_reply_std *data) { - struct ad_subdomains_handler_state *state; + struct ad_subdomains_handler_state *state; - state = tevent_req_data(req, struct ad_subdomains_handler_state); + state = tevent_req_data(req, struct ad_subdomains_handler_state); - TEVENT_REQ_RETURN_ON_ERROR(req); + TEVENT_REQ_RETURN_ON_ERROR(req); - *data = state->reply; + *data = state->reply; - return EOK; + return EOK; } static struct tevent_req * diff --git a/src/providers/data_provider/dp.c b/src/providers/data_provider/dp.c index 93b815bc2f..f1cceea297 100644 --- a/src/providers/data_provider/dp.c +++ b/src/providers/data_provider/dp.c @@ -72,7 +72,7 @@ dp_init_interface(struct data_provider *provider) ); SBUS_INTERFACE(iface_autofs, - sssd_DataProvider_Autofs, + sssd_DataProvider_Autofs, SBUS_METHODS( SBUS_ASYNC(METHOD, sssd_DataProvider_Autofs, GetMap, dp_autofs_get_map_send, dp_autofs_get_map_recv, provider), SBUS_ASYNC(METHOD, sssd_DataProvider_Autofs, GetEntry, dp_autofs_get_entry_send, dp_autofs_get_entry_recv, provider), diff --git a/src/providers/ipa/ipa_rules_common.c b/src/providers/ipa/ipa_rules_common.c index 11823476bb..31f1c9a0f1 100644 --- a/src/providers/ipa/ipa_rules_common.c +++ b/src/providers/ipa/ipa_rules_common.c @@ -198,7 +198,7 @@ ipa_common_get_cached_rules(TALLOC_CTX *mem_ctx, } if (ret == ENOENT) { - rule_count = 0; + rule_count = 0; } ret = sysdb_msg2attrs(tmp_ctx, rule_count, msgs, &rules); diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c index 03127e0f4c..bf70083835 100644 --- a/src/providers/ipa/ipa_subdomains.c +++ b/src/providers/ipa/ipa_subdomains.c @@ -3203,15 +3203,15 @@ static errno_t ipa_subdomains_handler_recv(TALLOC_CTX *mem_ctx, struct tevent_req *req, struct dp_reply_std *data) { - struct ipa_subdomains_handler_state *state; + struct ipa_subdomains_handler_state *state; - state = tevent_req_data(req, struct ipa_subdomains_handler_state); + state = tevent_req_data(req, struct ipa_subdomains_handler_state); - TEVENT_REQ_RETURN_ON_ERROR(req); + TEVENT_REQ_RETURN_ON_ERROR(req); - *data = state->reply; + *data = state->reply; - return EOK; + return EOK; } static struct tevent_req * diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c index 3da193091b..8dd6e3783e 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_subdomain_account_send(TALLOC_CTX *memctx, req = tevent_req_create(memctx, &state, struct ipa_subdomain_account_state); if (req == NULL) { DEBUG(SSSDBG_OP_FAILURE, "tevent_req_create failed.\n"); - return NULL; + return NULL; } state->ev = ev; diff --git a/src/providers/ipa/ipa_views.c b/src/providers/ipa/ipa_views.c index 2a918bdc8b..d99db8aeed 100644 --- a/src/providers/ipa/ipa_views.c +++ b/src/providers/ipa/ipa_views.c @@ -65,14 +65,14 @@ static errno_t dp_id_data_to_override_filter(TALLOC_CTX *mem_ctx, sanitized_name); break; - case BE_REQ_GROUP: + case BE_REQ_GROUP: filter = talloc_asprintf(mem_ctx, "(&(objectClass=%s)(%s=%s))", ipa_opts->override_map[IPA_OC_OVERRIDE_GROUP].name, ipa_opts->override_map[IPA_AT_OVERRIDE_GROUP_NAME].name, sanitized_name); break; - case BE_REQ_USER_AND_GROUP: + case BE_REQ_USER_AND_GROUP: filter = talloc_asprintf(mem_ctx, "(&(objectClass=%s)(|(%s=%s)(%s=%s)))", ipa_opts->override_map[IPA_OC_OVERRIDE].name, ipa_opts->override_map[IPA_AT_OVERRIDE_USER_NAME].name, @@ -106,7 +106,7 @@ static errno_t dp_id_data_to_override_filter(TALLOC_CTX *mem_ctx, id); break; - case BE_REQ_GROUP: + case BE_REQ_GROUP: filter = talloc_asprintf(mem_ctx, "(&(objectClass=%s)(%s=%"PRIu32"))", ipa_opts->override_map[IPA_OC_OVERRIDE_GROUP].name, @@ -114,7 +114,7 @@ static errno_t dp_id_data_to_override_filter(TALLOC_CTX *mem_ctx, id); break; - case BE_REQ_USER_AND_GROUP: + case BE_REQ_USER_AND_GROUP: filter = talloc_asprintf(mem_ctx, "(&(objectClass=%s)(|(%s=%"PRIu32")(%s=%"PRIu32")))", ipa_opts->override_map[IPA_OC_OVERRIDE].name, diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index 664f1b0583..1e0ca6cd4d 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -1402,7 +1402,7 @@ static void sdap_pam_chpass_handler_auth_done(struct tevent_req *subreq) ret = pam_add_response(state->pd, SSS_PAM_USER_INFO, msg_len, msg); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, "pam_add_response failed.\n"); + DEBUG(SSSDBG_CRIT_FAILURE, "pam_add_response failed.\n"); } } break; diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index 4334463853..de2271ca0c 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -1250,7 +1250,7 @@ errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse, /* Sudo */ if (!sdom->sudo_search_bases) { - ret = sdap_set_search_base(opts, sdom, + ret = sdap_set_search_base(opts, sdom, SDAP_SUDO_SEARCH_BASE, naming_context); if (ret != EOK) goto done; @@ -1258,17 +1258,17 @@ errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse, /* Services */ if (!sdom->service_search_bases) { - ret = sdap_set_search_base(opts, sdom, - SDAP_SERVICE_SEARCH_BASE, - naming_context); + ret = sdap_set_search_base(opts, sdom, + SDAP_SERVICE_SEARCH_BASE, + naming_context); if (ret != EOK) goto done; } /* autofs */ if (!sdom->autofs_search_bases) { - ret = sdap_set_search_base(opts, sdom, - SDAP_AUTOFS_SEARCH_BASE, - naming_context); + ret = sdap_set_search_base(opts, sdom, + SDAP_AUTOFS_SEARCH_BASE, + naming_context); if (ret != EOK) goto done; } diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 923723881a..4d677fa4e6 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -2226,15 +2226,15 @@ sdap_x_deref_search_recv(struct tevent_req *req, /* ==Security Descriptor (ACL) search=================================== */ struct sdap_sd_search_state { - LDAPControl **ctrls; - struct sdap_options *opts; - size_t reply_count; - struct sysdb_attrs **reply; - struct sdap_reply sreply; - - /* Referrals returned by the search */ - size_t ref_count; - char **refs; + LDAPControl **ctrls; + struct sdap_options *opts; + size_t reply_count; + struct sysdb_attrs **reply; + struct sdap_reply sreply; + + /* Referrals returned by the search */ + size_t ref_count; + char **refs; }; static int sdap_sd_search_create_control(struct sdap_handle *sh, diff --git a/src/providers/ldap/sdap_async_nested_groups.c b/src/providers/ldap/sdap_async_nested_groups.c index 055de29cad..796d6a7d52 100644 --- a/src/providers/ldap/sdap_async_nested_groups.c +++ b/src/providers/ldap/sdap_async_nested_groups.c @@ -1866,68 +1866,68 @@ sdap_nested_group_lookup_group_send(TALLOC_CTX *mem_ctx, struct sdap_nested_group_ctx *group_ctx, struct sdap_nested_group_member *member) { - struct sdap_nested_group_lookup_group_state *state = NULL; - struct tevent_req *req = NULL; - struct tevent_req *subreq = NULL; - struct sdap_attr_map *map = group_ctx->opts->group_map; - const char **attrs = NULL; - const char *base_filter = NULL; - const char *filter = NULL; - char *oc_list; - errno_t ret; - - PROBE(SDAP_NESTED_GROUP_LOOKUP_GROUP_SEND); - - req = tevent_req_create(mem_ctx, &state, - struct sdap_nested_group_lookup_group_state); - if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); - return NULL; - } - - ret = build_attrs_from_map(state, group_ctx->opts->group_map, - SDAP_OPTS_GROUP, NULL, &attrs, NULL); - if (ret != EOK) { - goto immediately; - } - - /* create filter */ - oc_list = sdap_make_oc_list(state, map); - if (oc_list == NULL) { + struct sdap_nested_group_lookup_group_state *state = NULL; + struct tevent_req *req = NULL; + struct tevent_req *subreq = NULL; + struct sdap_attr_map *map = group_ctx->opts->group_map; + const char **attrs = NULL; + const char *base_filter = NULL; + const char *filter = NULL; + char *oc_list; + errno_t ret; + + PROBE(SDAP_NESTED_GROUP_LOOKUP_GROUP_SEND); + + req = tevent_req_create(mem_ctx, &state, + struct sdap_nested_group_lookup_group_state); + if (req == NULL) { + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); + return NULL; + } + + ret = build_attrs_from_map(state, group_ctx->opts->group_map, + SDAP_OPTS_GROUP, NULL, &attrs, NULL); + if (ret != EOK) { + goto immediately; + } + + /* create filter */ + oc_list = sdap_make_oc_list(state, map); + if (oc_list == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, "Failed to create objectClass list.\n"); ret = ENOMEM; goto immediately; - } - - base_filter = talloc_asprintf(attrs, "(&(%s)(%s=*))", oc_list, - map[SDAP_AT_GROUP_NAME].name); - if (base_filter == NULL) { - ret = ENOMEM; - goto immediately; - } - - /* use search base filter if needed */ - filter = sdap_combine_filters(state, base_filter, member->group_filter); - if (filter == NULL) { - ret = ENOMEM; - goto immediately; - } - - /* search */ - subreq = sdap_get_generic_send(state, ev, group_ctx->opts, group_ctx->sh, - member->dn, LDAP_SCOPE_BASE, filter, attrs, - map, SDAP_OPTS_GROUP, - dp_opt_get_int(group_ctx->opts->basic, - SDAP_SEARCH_TIMEOUT), - false); - if (subreq == NULL) { - ret = ENOMEM; - goto immediately; - } - - tevent_req_set_callback(subreq, sdap_nested_group_lookup_group_done, req); - - return req; + } + + base_filter = talloc_asprintf(attrs, "(&(%s)(%s=*))", oc_list, + map[SDAP_AT_GROUP_NAME].name); + if (base_filter == NULL) { + ret = ENOMEM; + goto immediately; + } + + /* use search base filter if needed */ + filter = sdap_combine_filters(state, base_filter, member->group_filter); + if (filter == NULL) { + ret = ENOMEM; + goto immediately; + } + + /* search */ + subreq = sdap_get_generic_send(state, ev, group_ctx->opts, group_ctx->sh, + member->dn, LDAP_SCOPE_BASE, filter, attrs, + map, SDAP_OPTS_GROUP, + dp_opt_get_int(group_ctx->opts->basic, + SDAP_SEARCH_TIMEOUT), + false); + if (subreq == NULL) { + ret = ENOMEM; + goto immediately; + } + + tevent_req_set_callback(subreq, sdap_nested_group_lookup_group_done, req); + + return req; immediately: if (ret == EOK) { @@ -1986,18 +1986,18 @@ static errno_t sdap_nested_group_lookup_group_recv(TALLOC_CTX *mem_ctx, struct tevent_req *req, struct sysdb_attrs **_group) { - struct sdap_nested_group_lookup_group_state *state = NULL; - state = tevent_req_data(req, struct sdap_nested_group_lookup_group_state); + struct sdap_nested_group_lookup_group_state *state = NULL; + state = tevent_req_data(req, struct sdap_nested_group_lookup_group_state); - PROBE(SDAP_NESTED_GROUP_LOOKUP_GROUP_RECV); + PROBE(SDAP_NESTED_GROUP_LOOKUP_GROUP_RECV); - TEVENT_REQ_RETURN_ON_ERROR(req); + TEVENT_REQ_RETURN_ON_ERROR(req); - if (_group != NULL) { - *_group = talloc_steal(mem_ctx, state->group); - } + if (_group != NULL) { + *_group = talloc_steal(mem_ctx, state->group); + } - return EOK; + return EOK; } struct sdap_nested_group_lookup_unknown_state { diff --git a/src/responder/common/cache_req/cache_req_domain.c b/src/responder/common/cache_req/cache_req_domain.c index d1621cbabd..1859204847 100644 --- a/src/responder/common/cache_req/cache_req_domain.c +++ b/src/responder/common/cache_req/cache_req_domain.c @@ -127,13 +127,13 @@ cache_req_domain_use_fqnames(struct sss_domain_info *domain, * - false: in this case, the usage of fully-qualified-names will be * done accordingly to what's set for the domain itself. */ - if (head->fqnames) { - return true; - } else if (enforce_non_fqnames) { - return false; - } else { - return domain->fqnames; - } + if (head->fqnames) { + return true; + } else if (enforce_non_fqnames) { + return false; + } else { + return domain->fqnames; + } } static struct cache_req_domain * diff --git a/src/responder/common/cache_req/plugins/cache_req_common.c b/src/responder/common/cache_req/plugins/cache_req_common.c index 6f4d27cb60..76d7121d5c 100644 --- a/src/responder/common/cache_req/plugins/cache_req_common.c +++ b/src/responder/common/cache_req/plugins/cache_req_common.c @@ -29,12 +29,12 @@ errno_t cache_req_idminmax_check(struct cache_req_data *data, struct sss_domain_info *domain) { - if (((domain->id_min != 0) && (data->id < domain->id_min)) || - ((domain->id_max != 0) && (data->id > domain->id_max))) { + if (((domain->id_min != 0) && (data->id < domain->id_min)) || + ((domain->id_max != 0) && (data->id > domain->id_max))) { DEBUG(SSSDBG_FUNC_DATA, "id exceeds min/max boundaries\n"); return ERR_ID_OUTSIDE_RANGE; - } - return EOK; + } + return EOK; } static struct ldb_message * diff --git a/src/responder/common/negcache.c b/src/responder/common/negcache.c index d9bf1417ec..0b6561c7e0 100644 --- a/src/responder/common/negcache.c +++ b/src/responder/common/negcache.c @@ -1113,7 +1113,7 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache, ret = sss_ncache_set_upn(ncache, true, dom, fqname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to store permanent upn filter for" " [%s:%s] (%d [%s])\n", dom->name, filter_list[i], @@ -1123,7 +1123,7 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache, ret = sss_ncache_set_user(ncache, true, dom, fqname); talloc_zfree(fqname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to store permanent user filter for" " [%s:%s] (%d [%s])\n", dom->name, filter_list[i], @@ -1238,7 +1238,7 @@ errno_t sss_ncache_prepopulate(struct sss_nc_ctx *ncache, ret = sss_ncache_set_group(ncache, true, dom, fqname); talloc_zfree(fqname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to store permanent group filter for" " [%s:%s] (%d [%s])\n", dom->name, filter_list[i], diff --git a/src/responder/common/responder_get_domains.c b/src/responder/common/responder_get_domains.c index b8ccfdd2bd..96dcae4c44 100644 --- a/src/responder/common/responder_get_domains.c +++ b/src/responder/common/responder_get_domains.c @@ -167,7 +167,7 @@ struct tevent_req *sss_dp_get_domains_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sss_dp_get_domains_state); if (req == NULL) { - return NULL; + return NULL; } if (rctx->domains == NULL) { @@ -538,7 +538,7 @@ sss_parse_inp_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sss_parse_inp_state); if (req == NULL) { - return NULL; + return NULL; } if (rawinp == NULL) { diff --git a/src/responder/ifp/ifp_domains.c b/src/responder/ifp/ifp_domains.c index 16d80e6ca7..dfb64d8099 100644 --- a/src/responder/ifp/ifp_domains.c +++ b/src/responder/ifp/ifp_domains.c @@ -248,9 +248,9 @@ static void ifp_find_domain_by_name_done(struct tevent_req *subreq) } if (iter == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, "Domain not found: %s\n", state->name); - tevent_req_error(req, ERR_DOMAIN_NOT_FOUND); - return; + DEBUG(SSSDBG_MINOR_FAILURE, "Domain not found: %s\n", state->name); + tevent_req_error(req, ERR_DOMAIN_NOT_FOUND); + return; } state->path = sbus_opath_compose(state, IFP_PATH_DOMAINS, iter->name); @@ -795,10 +795,10 @@ ifp_domains_domain_active_server_send(TALLOC_CTX *mem_ctx, ret = EAGAIN; done: -if (ret != EAGAIN) { - tevent_req_error(req, ret); - tevent_req_post(req, ev); -} + if (ret != EAGAIN) { + tevent_req_error(req, ret); + tevent_req_post(req, ev); + } return req; } @@ -986,10 +986,10 @@ ifp_domains_domain_refresh_access_rules_send(TALLOC_CTX *mem_ctx, ret = EAGAIN; done: -if (ret != EAGAIN) { - tevent_req_error(req, ret); - tevent_req_post(req, ev); -} + if (ret != EAGAIN) { + tevent_req_error(req, ret); + tevent_req_post(req, ev); + } return req; } diff --git a/src/responder/ifp/ifp_groups.c b/src/responder/ifp/ifp_groups.c index 353f3a79f3..799ad8fc33 100644 --- a/src/responder/ifp/ifp_groups.c +++ b/src/responder/ifp/ifp_groups.c @@ -181,10 +181,10 @@ static void ifp_groups_find_by_name_done(struct tevent_req *subreq) state->path = ifp_groups_build_path_from_msg(state, result->domain, result->msgs[0]); - if (state->path == NULL) { - tevent_req_error(req, ENOMEM); - return; - } + if (state->path == NULL) { + tevent_req_error(req, ENOMEM); + return; + } tevent_req_done(req); return; diff --git a/src/responder/ifp/ifp_users.c b/src/responder/ifp/ifp_users.c index 91aecb896d..e70c434d48 100644 --- a/src/responder/ifp/ifp_users.c +++ b/src/responder/ifp/ifp_users.c @@ -371,11 +371,11 @@ static void ifp_users_find_by_cert_done(struct tevent_req *subreq) } if (result->count > 1) { - DEBUG(SSSDBG_CRIT_FAILURE, "More than one user found. " - "Use ListByCertificate to get all.\n"); - tevent_req_error(req, EINVAL); - return; - } + DEBUG(SSSDBG_CRIT_FAILURE, "More than one user found. " + "Use ListByCertificate to get all.\n"); + tevent_req_error(req, EINVAL); + return; + } state->path = ifp_users_build_path_from_msg(state, result->domain, result->msgs[0]); diff --git a/src/responder/ifp/ifpsrv_cmd.c b/src/responder/ifp/ifpsrv_cmd.c index 977d2ce403..53e4d2687a 100644 --- a/src/responder/ifp/ifpsrv_cmd.c +++ b/src/responder/ifp/ifpsrv_cmd.c @@ -54,7 +54,7 @@ ifp_user_get_attr_send(TALLOC_CTX *mem_ctx, struct resp_ctx *rctx, req = tevent_req_create(mem_ctx, &state, struct ifp_user_get_attr_state); if (req == NULL) { - return NULL; + return NULL; } state->attrs = attrs; state->rctx = rctx; diff --git a/src/responder/kcm/kcmsrv_ccache_secrets.c b/src/responder/kcm/kcmsrv_ccache_secrets.c index 440ab3bb99..b909a24d10 100644 --- a/src/responder/kcm/kcmsrv_ccache_secrets.c +++ b/src/responder/kcm/kcmsrv_ccache_secrets.c @@ -675,7 +675,7 @@ static errno_t ccdb_sec_init(struct kcm_ccdb *db, DEBUG(SSSDBG_FATAL_FAILURE, "Cannot initialize tcurl\n"); talloc_zfree(secdb); return ENOMEM; - } + } db->db_handle = secdb; return EOK; diff --git a/src/responder/pam/pamsrv.c b/src/responder/pam/pamsrv.c index 4f5b9b6647..4e9d171867 100644 --- a/src/responder/pam/pamsrv.c +++ b/src/responder/pam/pamsrv.c @@ -69,8 +69,8 @@ static errno_t get_trusted_uids(struct pam_ctx *pctx) } if (strcmp(uid_str, ALL_UIDS_ALLOWED) == 0) { - DEBUG(SSSDBG_TRACE_FUNC, "All UIDs are allowed.\n"); - pctx->trusted_uids_count = 0; + DEBUG(SSSDBG_TRACE_FUNC, "All UIDs are allowed.\n"); + pctx->trusted_uids_count = 0; } else { ret = csv_string_to_uid_array(pctx->rctx, uid_str, true, &pctx->trusted_uids_count, diff --git a/src/sbus/interface/sbus_iterator_writers.c b/src/sbus/interface/sbus_iterator_writers.c index 3becc8fcba..17133ab548 100644 --- a/src/sbus/interface/sbus_iterator_writers.c +++ b/src/sbus/interface/sbus_iterator_writers.c @@ -61,8 +61,8 @@ sbus_iterator_write_string(DBusMessageIter *iterator, /* D-Bus can send only correct UTF-8 strings. */ is_valid = sss_utf8_check((const uint8_t *)value, strlen(value)); if (!is_valid) { - DEBUG(SSSDBG_CRIT_FAILURE, "String with non-utf8 characters was " - "given [%s]\n", value); + DEBUG(SSSDBG_CRIT_FAILURE, "String with non-utf8 characters was " + "given [%s]\n", value); return ERR_SBUS_INVALID_STRING; } diff --git a/src/sbus/sbus_opath.c b/src/sbus/sbus_opath.c index ce621d3aad..e8946de8aa 100644 --- a/src/sbus/sbus_opath.c +++ b/src/sbus/sbus_opath.c @@ -274,58 +274,58 @@ char * sbus_opath_unescape(TALLOC_CTX *mem_ctx, const char *component) { - TALLOC_CTX *tmp_ctx; - char *safe_path; - const char *p; - int a, b, c; - - tmp_ctx = talloc_new(NULL); - if (tmp_ctx == NULL) { - return NULL; - } - - safe_path = talloc_strdup(tmp_ctx, ""); - if (safe_path == NULL) { - goto done; - } - - /* Special case for the empty string */ - if (strcmp(component, "_") == 0) { - safe_path = talloc_steal(mem_ctx, safe_path); - goto done; - } - - for (p = component; *p; p++) { - if (*p == '_') { - /* There must be at least two more chars after underscore */ - if (p[1] == '\0' || p[2] == '\0') { - safe_path = NULL; - goto done; - } - - if ((a = unhexchar(p[1])) < 0 - || (b = unhexchar(p[2])) < 0) { - /* Invalid escape code, let's take it literal then */ - c = '_'; - } else { - c = ((a << 4) | b); - p += 2; - } - } else { - c = *p; - } - - safe_path = talloc_asprintf_append_buffer(safe_path, "%c", c); - if (safe_path == NULL) { - goto done; - } - } - - safe_path = talloc_steal(mem_ctx, safe_path); + TALLOC_CTX *tmp_ctx; + char *safe_path; + const char *p; + int a, b, c; + + tmp_ctx = talloc_new(NULL); + if (tmp_ctx == NULL) { + return NULL; + } + + safe_path = talloc_strdup(tmp_ctx, ""); + if (safe_path == NULL) { + goto done; + } + + /* Special case for the empty string */ + if (strcmp(component, "_") == 0) { + safe_path = talloc_steal(mem_ctx, safe_path); + goto done; + } + + for (p = component; *p; p++) { + if (*p == '_') { + /* There must be at least two more chars after underscore */ + if (p[1] == '\0' || p[2] == '\0') { + safe_path = NULL; + goto done; + } + + if ((a = unhexchar(p[1])) < 0 + || (b = unhexchar(p[2])) < 0) { + /* Invalid escape code, let's take it literal then */ + c = '_'; + } else { + c = ((a << 4) | b); + p += 2; + } + } else { + c = *p; + } + + safe_path = talloc_asprintf_append_buffer(safe_path, "%c", c); + if (safe_path == NULL) { + goto done; + } + } + + safe_path = talloc_steal(mem_ctx, safe_path); done: - talloc_free(tmp_ctx); - return safe_path; + talloc_free(tmp_ctx); + return safe_path; } const char * diff --git a/src/sss_client/nss_compat.h b/src/sss_client/nss_compat.h index 97fbfebb0d..2e52dbc6f0 100644 --- a/src/sss_client/nss_compat.h +++ b/src/sss_client/nss_compat.h @@ -36,32 +36,32 @@ touched at all. */ struct __netgrent { - enum { triple_val, group_val } type; - union - { - struct + enum { triple_val, group_val } type; + union { - const char *host; - const char *user; - const char *domain; - } triple; - const char *group; - } val; - /* the following stuff is used by some NSS services - but not by ours (it's not completely clear how these - are shared between different services) or is used - by our caller */ - char *data; - size_t data_size; - union - { - char *cursor; - unsigned long int position; - } idx; /* added name to union to avoid warning */ - int first; - struct name_list *known_groups; - struct name_list *needed_groups; - void *nip; /* changed from `service_user *nip' */ + struct + { + const char *host; + const char *user; + const char *domain; + } triple; + const char *group; + } val; + /* the following stuff is used by some NSS services + but not by ours (it's not completely clear how these + are shared between different services) or is used + by our caller */ + char *data; + size_t data_size; + union + { + char *cursor; + unsigned long int position; + } idx; /* added name to union to avoid warning */ + int first; + struct name_list *known_groups; + struct name_list *needed_groups; + void *nip; /* changed from `service_user *nip' */ }; #endif /* NSS_COMPAT_H_ */ diff --git a/src/sss_client/pam_sss.c b/src/sss_client/pam_sss.c index 7643e307ae..4d5b643093 100644 --- a/src/sss_client/pam_sss.c +++ b/src/sss_client/pam_sss.c @@ -725,8 +725,8 @@ static int user_info_account_expired(pam_handle_t *pamh, size_t buflen, user_msg = (char *)malloc(sizeof(char) * bufsize); if (!user_msg) { - D(("Out of memory.")); - return PAM_SYSTEM_ERR; + D(("Out of memory.")); + return PAM_SYSTEM_ERR; } ret = snprintf(user_msg, bufsize, "%s%s%.*s", @@ -780,8 +780,8 @@ static int user_info_chpass_error(pam_handle_t *pamh, size_t buflen, user_msg = (char *)malloc(sizeof(char) * bufsize); if (!user_msg) { - D(("Out of memory.")); - return PAM_SYSTEM_ERR; + D(("Out of memory.")); + return PAM_SYSTEM_ERR; } ret = snprintf(user_msg, bufsize, "%s%s%.*s", @@ -2339,7 +2339,7 @@ static int get_authtok_for_password_change(pam_handle_t *pamh, D(("Failed to set PAM_OLDAUTHTOK [%s], " "oldauthtok may not be available", pam_strerror(pamh,ret))); - return ret; + return ret; } if (pi->pam_authtok_type == SSS_AUTHTOK_TYPE_2FA) { @@ -2790,13 +2790,13 @@ PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, /* static module data */ struct pam_module _pam_sssd_modstruct ={ - "pam_sssd", - pam_sm_authenticate, - pam_sm_setcred, - pam_sm_acct_mgmt, - pam_sm_open_session, - pam_sm_close_session, - pam_sm_chauthtok + "pam_sssd", + pam_sm_authenticate, + pam_sm_setcred, + pam_sm_acct_mgmt, + pam_sm_open_session, + pam_sm_close_session, + pam_sm_chauthtok }; #endif diff --git a/src/sss_client/sudo/sss_sudo_response.c b/src/sss_client/sudo/sss_sudo_response.c index 7d4bcc5d24..82f1352b81 100644 --- a/src/sss_client/sudo/sss_sudo_response.c +++ b/src/sss_client/sudo/sss_sudo_response.c @@ -131,7 +131,7 @@ int sss_sudo_parse_rule(const char *message, ret = sss_sudo_parse_uint32(message, message_len, _cursor, &_rule->num_attrs); if (ret != EOK) { - return ret; + return ret; } /* attrs */ @@ -144,7 +144,7 @@ int sss_sudo_parse_rule(const char *message, ret = sss_sudo_parse_attr(message, message_len, _cursor, &_rule->attrs[i]); if (ret != EOK) { - return ret; + return ret; } } @@ -196,10 +196,10 @@ int sss_sudo_parse_uint32(const char *message, size_t *_cursor, uint32_t *_number) { - size_t start_pos = 0; + size_t start_pos = 0; if (_cursor == NULL) { - return EINVAL; + return EINVAL; } start_pos = *_cursor; @@ -227,7 +227,7 @@ int sss_sudo_parse_string(const char *message, size_t maxlen = 0; if (_cursor == NULL) { - return EINVAL; + return EINVAL; } start_pos = *_cursor; diff --git a/src/sss_iface/sbus_sss_client_sync.c b/src/sss_iface/sbus_sss_client_sync.c index b491d2f0de..dfacb7aa63 100644 --- a/src/sss_iface/sbus_sss_client_sync.c +++ b/src/sss_iface/sbus_sss_client_sync.c @@ -96,9 +96,9 @@ sbus_call_systemd_RestartUnit const char * arg_mode, const char ** _arg_job) { - return sbus_method_in_ss_out_o(mem_ctx, conn, - busname, object_path, "org.freedesktop.systemd1.Manager", "RestartUnit", arg_name, arg_mode, - _arg_job); + return sbus_method_in_ss_out_o(mem_ctx, conn, + busname, object_path, "org.freedesktop.systemd1.Manager", "RestartUnit", arg_name, arg_mode, + _arg_job); } errno_t @@ -111,9 +111,9 @@ sbus_call_systemd_StartUnit const char * arg_mode, const char ** _arg_job) { - return sbus_method_in_ss_out_o(mem_ctx, conn, - busname, object_path, "org.freedesktop.systemd1.Manager", "StartUnit", arg_name, arg_mode, - _arg_job); + return sbus_method_in_ss_out_o(mem_ctx, conn, + busname, object_path, "org.freedesktop.systemd1.Manager", "StartUnit", arg_name, arg_mode, + _arg_job); } errno_t @@ -126,8 +126,8 @@ sbus_call_systemd_StopUnit const char * arg_mode, const char ** _arg_job) { - return sbus_method_in_ss_out_o(mem_ctx, conn, - busname, object_path, "org.freedesktop.systemd1.Manager", "StopUnit", arg_name, arg_mode, - _arg_job); + return sbus_method_in_ss_out_o(mem_ctx, conn, + busname, object_path, "org.freedesktop.systemd1.Manager", "StopUnit", arg_name, arg_mode, + _arg_job); } diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c index 91bfb4cf84..3111c59e10 100644 --- a/src/tools/sss_seed.c +++ b/src/tools/sss_seed.c @@ -91,14 +91,14 @@ static int seed_prompt(const char *req) } while (prompt[i] != '\0') { - errno = 0; - len = sss_atomic_write_s(STDOUT_FILENO, &prompt[i++], 1); - if (len == -1) { - ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, "write failed [%d][%s].\n", - ret, strerror(ret)); - goto done; - } + errno = 0; + len = sss_atomic_write_s(STDOUT_FILENO, &prompt[i++], 1); + if (len == -1) { + ret = errno; + DEBUG(SSSDBG_CRIT_FAILURE, "write failed [%d][%s].\n", + ret, strerror(ret)); + goto done; + } } done: diff --git a/src/tools/tools_mc_util.c b/src/tools/tools_mc_util.c index da78945802..fab398732b 100644 --- a/src/tools/tools_mc_util.c +++ b/src/tools/tools_mc_util.c @@ -97,8 +97,8 @@ errno_t sss_memcache_invalidate(const char *mc_filename) "File %s already locked by someone else.\n", mc_filename); goto done; } else if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, "Failed to lock file %s.\n", mc_filename); - goto done; + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to lock file %s.\n", mc_filename); + goto done; } /* Mark the mc file as recycled. */ ret = sss_mc_set_recycled(mc_fd);