From 91bc2650cbb60ae7e9fd0abb27200526064d5711 Mon Sep 17 00:00:00 2001 From: MIZUTA Takeshi Date: Tue, 12 Nov 2019 01:50:00 +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 that are indented in 3 spaces or 7 spaces. Unify 3 spaces or 7 spaces indentation to 4 spaces. --- src/db/sysdb_ops.c | 38 +++--- src/db/sysdb_subdomains.c | 4 +- src/lib/sifp/sss_sifp_dbus.c | 128 +++++++++--------- src/monitor/monitor.c | 2 +- src/providers/ad/ad_gpo.c | 34 ++--- 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/ldap/sdap.c | 14 +- .../cache_req/plugins/cache_req_common.c | 8 +- src/sss_client/pam_sss.c | 8 +- src/sss_client/sudo/sss_sudo_response.c | 8 +- src/tools/sss_seed.c | 14 +- src/tools/tools_mc_util.c | 4 +- 15 files changed, 143 insertions(+), 143 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/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/providers/ad/ad_gpo.c b/src/providers/ad/ad_gpo.c index 7442f27cca..1835d347ca 100644 --- a/src/providers/ad/ad_gpo.c +++ b/src/providers/ad/ad_gpo.c @@ -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_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/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/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/sss_client/pam_sss.c b/src/sss_client/pam_sss.c index 7643e307ae..43760da1b1 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", diff --git a/src/sss_client/sudo/sss_sudo_response.c b/src/sss_client/sudo/sss_sudo_response.c index 7d4bcc5d24..67d6a88212 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; } } @@ -199,7 +199,7 @@ int sss_sudo_parse_uint32(const char *message, 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/tools/sss_seed.c b/src/tools/sss_seed.c index 91bfb4cf84..324954cda4 100644 --- a/src/tools/sss_seed.c +++ b/src/tools/sss_seed.c @@ -91,13 +91,13 @@ 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; } } 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);