diff options
Diffstat (limited to 'src/providers/ad')
| -rw-r--r-- | src/providers/ad/ad_access.c | 18 | ||||
| -rw-r--r-- | src/providers/ad/ad_common.c | 146 | ||||
| -rw-r--r-- | src/providers/ad/ad_domain_info.c | 56 | ||||
| -rw-r--r-- | src/providers/ad/ad_dyndns.c | 52 | ||||
| -rw-r--r-- | src/providers/ad/ad_id.c | 96 | ||||
| -rw-r--r-- | src/providers/ad/ad_init.c | 42 | ||||
| -rw-r--r-- | src/providers/ad/ad_srv.c | 66 | ||||
| -rw-r--r-- | src/providers/ad/ad_subdomains.c | 102 |
8 files changed, 289 insertions, 289 deletions
diff --git a/src/providers/ad/ad_access.c b/src/providers/ad/ad_access.c index 68a292abc..cae075d42 100644 --- a/src/providers/ad/ad_access.c +++ b/src/providers/ad/ad_access.c @@ -139,8 +139,8 @@ parse_filter(TALLOC_CTX *mem_ctx, const char *full_filter, /* Malformed option */ DEBUG(SSSDBG_CRIT_FAILURE, - ("Keyword in filter [%s] did not match expected format\n", - full_filter)); + "Keyword in filter [%s] did not match expected format\n", + full_filter); return EINVAL; } @@ -187,7 +187,7 @@ ad_parse_access_filter(TALLOC_CTX *mem_ctx, &filters, &nfilters); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot parse the list of ad_access_filters\n")); + "Cannot parse the list of ad_access_filters\n"); goto done; } @@ -198,8 +198,8 @@ ad_parse_access_filter(TALLOC_CTX *mem_ctx, if (ret != EOK) { /* Skip the faulty filter. At worst, the user won't be * allowed access */ - DEBUG(SSSDBG_MINOR_FAILURE, ("Access filter [%s] could not be " - "parsed, skipping\n", filters[i])); + DEBUG(SSSDBG_MINOR_FAILURE, "Access filter [%s] could not be " + "parsed, skipping\n", filters[i]); continue; } @@ -269,7 +269,7 @@ ad_access_send(TALLOC_CTX *mem_ctx, ret = ad_parse_access_filter(state, domain, ctx->sdap_access_ctx->filter, &state->filter); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not determine the best filter\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not determine the best filter\n"); ret = ERR_ACCESS_DENIED; goto done; } @@ -361,8 +361,8 @@ ad_access_done(struct tevent_req *subreq) state->cindex++; if (state->clist[state->cindex] == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("Error retrieving access check result: %s\n", - sss_strerror(ret))); + "Error retrieving access check result: %s\n", + sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -403,7 +403,7 @@ ad_access_handler(struct be_req *breq) if (strcasecmp(pd->domain, be_ctx->domain->name) != 0) { domain = find_subdomain_by_name(be_ctx->domain, pd->domain, true); if (domain == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_subdomain_by_name failed.\n"); be_req_terminate(breq, DP_ERR_FATAL, PAM_SYSTEM_ERR, NULL); return; } diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c index 77c2639a7..87b9f867d 100644 --- a/src/providers/ad/ad_common.c +++ b/src/providers/ad/ad_common.c @@ -128,21 +128,21 @@ ad_create_default_options(TALLOC_CTX *mem_ctx, ad_options->id = ad_create_default_sdap_options(ad_options); if (ad_options->id == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize AD LDAP options\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD LDAP options\n"); talloc_free(ad_options); return NULL; } ret = dp_opt_set_string(ad_options->basic, AD_KRB5_REALM, realm); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set AD domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set AD domain\n"); talloc_free(ad_options); return NULL; } ret = dp_opt_set_string(ad_options->basic, AD_HOSTNAME, hostname); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set AD domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set AD domain\n"); talloc_free(ad_options); return NULL; } @@ -280,7 +280,7 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, server = dp_opt_get_string(opts->basic, AD_SERVER); if (!server) { DEBUG(SSSDBG_CONF_SETTINGS, - ("No AD server set, will use service discovery!\n")); + "No AD server set, will use service discovery!\n"); } /* Set the machine's hostname to the local host name if it @@ -292,18 +292,18 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, if (gret != 0) { ret = errno; DEBUG(SSSDBG_FATAL_FAILURE, - ("gethostname failed [%s].\n", - strerror(ret))); + "gethostname failed [%s].\n", + strerror(ret)); goto done; } hostname[HOST_NAME_MAX] = '\0'; DEBUG(SSSDBG_CONF_SETTINGS, - ("Setting ad_hostname to [%s].\n", hostname)); + "Setting ad_hostname to [%s].\n", hostname); ret = dp_opt_set_string(opts->basic, AD_HOSTNAME, hostname); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Setting ad_hostname failed [%s].\n", - strerror(ret))); + "Setting ad_hostname failed [%s].\n", + strerror(ret)); goto done; } } @@ -331,13 +331,13 @@ ad_get_common_options(TALLOC_CTX *mem_ctx, dom->case_sensitive); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not set domain case-sensitive: [%s]\n", - strerror(ret))); + "Could not set domain case-sensitive: [%s]\n", + strerror(ret)); goto done; } DEBUG(SSSDBG_CONF_SETTINGS, - ("Setting domain case-insensitive\n")); + "Setting domain case-insensitive\n"); ret = EOK; *_opts = opts; @@ -373,7 +373,7 @@ _ad_servers_init(struct ad_service *service, /* Split the server list */ ret = split_on_separator(tmp_ctx, servers, ',', true, true, &list, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to parse server list!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to parse server list!\n"); goto done; } @@ -382,9 +382,9 @@ _ad_servers_init(struct ad_service *service, if (be_fo_is_srv_identifier(list[i])) { if (!primary) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to add server [%s] to failover service: " + "Failed to add server [%s] to failover service: " "SRV resolution only allowed for primary servers!\n", - list[i])); + list[i]); continue; } @@ -400,8 +400,8 @@ _ad_servers_init(struct ad_service *service, false, sdata); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to add service discovery to failover: [%s]", - strerror(ret))); + "Failed to add service discovery to failover: [%s]", + strerror(ret)); goto done; } @@ -417,12 +417,12 @@ _ad_servers_init(struct ad_service *service, false, sdata); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to add service discovery to failover: [%s]", - strerror(ret))); + "Failed to add service discovery to failover: [%s]", + strerror(ret)); goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Added service discovery for AD\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Added service discovery for AD\n"); continue; } @@ -442,7 +442,7 @@ _ad_servers_init(struct ad_service *service, ret = be_fo_add_server(bectx, fo_gc_service, list[i], 0, sdata, primary); if (ret && ret != EEXIST) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Failed to add server\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Failed to add server\n"); goto done; } @@ -455,11 +455,11 @@ _ad_servers_init(struct ad_service *service, ret = be_fo_add_server(bectx, fo_service, list[i], 0, sdata, primary); if (ret && ret != EEXIST) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Failed to add server\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Failed to add server\n"); goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Added failover server %s\n", list[i])); + DEBUG(SSSDBG_CONF_SETTINGS, "Added failover server %s\n", list[i]); } done: talloc_free(tmp_ctx); @@ -493,13 +493,13 @@ static int ad_user_data_cmp(void *ud1, void *ud2) sd1 = talloc_get_type(ud1, struct ad_server_data); sd2 = talloc_get_type(ud2, struct ad_server_data); if (sd1 == NULL || sd2 == NULL) { - DEBUG(SSSDBG_TRACE_FUNC, ("No user data\n")); + DEBUG(SSSDBG_TRACE_FUNC, "No user data\n"); return sd1 == sd2 ? 0 : 1; } - DEBUG(SSSDBG_TRACE_LIBS, ("Comparing %s with %s\n", + DEBUG(SSSDBG_TRACE_LIBS, "Comparing %s with %s\n", sd1->gc ? "GC" : "LDAP", - sd2->gc ? "GC" : "LDAP")); + sd2->gc ? "GC" : "LDAP"); if (sd1->gc == sd2->gc) { return 0; @@ -513,11 +513,11 @@ static void ad_online_cb(void *pvt) struct ad_service *service = talloc_get_type(pvt, struct ad_service); if (service == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid private pointer\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid private pointer\n"); return; } - DEBUG(SSSDBG_TRACE_FUNC, ("The AD provider is online\n")); + DEBUG(SSSDBG_TRACE_FUNC, "The AD provider is online\n"); } errno_t @@ -565,13 +565,13 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, ret = be_fo_add_service(bectx, ad_service, ad_user_data_cmp); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to create failover service!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to create failover service!\n"); goto done; } ret = be_fo_add_service(bectx, ad_gc_service, ad_user_data_cmp); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to create GC failover service!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to create GC failover service!\n"); goto done; } @@ -585,7 +585,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, service->gc->kinit_service_name = service->krb5_service->name; if (!krb5_realm) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No Kerberos realm set\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No Kerberos realm set\n"); ret = EINVAL; goto done; } @@ -598,7 +598,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, if (!primary_servers) { DEBUG(SSSDBG_CONF_SETTINGS, - ("No primary servers defined, using service discovery\n")); + "No primary servers defined, using service discovery\n"); primary_servers = BE_SRV_IDENTIFIER; } @@ -620,7 +620,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, ret = be_add_online_cb(bectx, bectx, ad_online_cb, service, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not set up AD online callback\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not set up AD online callback\n"); return ret; } @@ -628,7 +628,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, ad_resolve_callback, service); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to add failover callback! [%s]\n", strerror(ret))); + "Failed to add failover callback! [%s]\n", strerror(ret)); goto done; } @@ -636,7 +636,7 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx, ad_resolve_callback, service); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to add failover callback! [%s]\n", strerror(ret))); + "Failed to add failover callback! [%s]\n", strerror(ret)); goto done; } @@ -666,13 +666,13 @@ ad_resolve_callback(void *private_data, struct fo_server *server) tmp_ctx = talloc_new(NULL); if (!tmp_ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory\n"); return; } sdata = fo_get_server_user_data(server); if (fo_is_srv_lookup(server) == false && sdata == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No user data?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No user data?\n"); return; } @@ -685,37 +685,37 @@ ad_resolve_callback(void *private_data, struct fo_server *server) srvaddr = fo_get_server_hostent(server); if (!srvaddr) { DEBUG(SSSDBG_CRIT_FAILURE, - ("No hostent available for server (%s)\n", - fo_get_server_str_name(server))); + "No hostent available for server (%s)\n", + fo_get_server_str_name(server)); ret = EINVAL; goto done; } address = resolv_get_string_address(tmp_ctx, srvaddr); if (address == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("resolv_get_string_address failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "resolv_get_string_address failed.\n"); ret = EIO; goto done; } srv_name = fo_get_server_name(server); if (srv_name == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not get server host name\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not get server host name\n"); ret = EINVAL; goto done; } new_uri = talloc_asprintf(service->sdap, "ldap://%s", srv_name); if (!new_uri) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to copy URI\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to copy URI\n"); ret = ENOMEM; goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Constructed uri '%s'\n", new_uri)); + DEBUG(SSSDBG_CONF_SETTINGS, "Constructed uri '%s'\n", new_uri); sockaddr = resolv_get_sockaddr_address(tmp_ctx, srvaddr, LDAP_PORT); if (sockaddr == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("resolv_get_sockaddr_address failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "resolv_get_sockaddr_address failed.\n"); ret = EIO; goto done; } @@ -749,15 +749,15 @@ ad_resolve_callback(void *private_data, struct fo_server *server) } if (!service->gc->uri) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to append to URI\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to append to URI\n"); ret = ENOMEM; goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Constructed GC uri '%s'\n", service->gc->uri)); + DEBUG(SSSDBG_CONF_SETTINGS, "Constructed GC uri '%s'\n", service->gc->uri); if (service->gc->sockaddr == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("resolv_get_sockaddr_address failed.\n")); + "resolv_get_sockaddr_address failed.\n"); ret = EIO; goto done; } @@ -770,7 +770,7 @@ ad_resolve_callback(void *private_data, struct fo_server *server) srvaddr->family, address); if (safe_address == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sss_escape_ip_address failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sss_escape_ip_address failed.\n"); ret = ENOMEM; goto done; } @@ -779,7 +779,7 @@ ad_resolve_callback(void *private_data, struct fo_server *server) SSS_KRB5KDC_FO_SRV); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("write_krb5info_file failed, authentication might fail.\n")); + "write_krb5info_file failed, authentication might fail.\n"); } } @@ -787,7 +787,7 @@ ad_resolve_callback(void *private_data, struct fo_server *server) done: if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Error: [%s]\n", strerror(ret))); + "Error: [%s]\n", strerror(ret)); } talloc_free(tmp_ctx); return; @@ -808,7 +808,7 @@ ad_set_ad_id_options(struct ad_options *ad_opts, SDAP_PWD_POLICY, PWD_POL_OPT_MIT); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Could not set password policy\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Could not set password policy\n"); goto done; } @@ -816,7 +816,7 @@ ad_set_ad_id_options(struct ad_options *ad_opts, krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); if (!krb5_realm) { /* Should be impossible, this is set in ad_get_common_options() */ - DEBUG(SSSDBG_FATAL_FAILURE, ("No Kerberos realm\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "No Kerberos realm\n"); ret = EINVAL; goto done; } @@ -824,9 +824,9 @@ ad_set_ad_id_options(struct ad_options *ad_opts, ret = dp_opt_set_string(id_opts->basic, SDAP_KRB5_REALM, krb5_realm); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, - ("Option %s set to %s\n", + "Option %s set to %s\n", id_opts->basic[SDAP_KRB5_REALM].opt_name, - krb5_realm)); + krb5_realm); keytab_path = dp_opt_get_string(ad_opts->basic, AD_KEYTAB); if (keytab_path) { @@ -834,9 +834,9 @@ ad_set_ad_id_options(struct ad_options *ad_opts, keytab_path); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, - ("Option %s set to %s\n", + "Option %s set to %s\n", id_opts->basic[SDAP_KRB5_KEYTAB].opt_name, - keytab_path)); + keytab_path); } ret = sdap_set_sasl_options(id_opts, @@ -846,7 +846,7 @@ ad_set_ad_id_options(struct ad_options *ad_opts, AD_KRB5_REALM), keytab_path); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set the SASL-related options\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set the SASL-related options\n"); goto done; } @@ -930,16 +930,16 @@ ad_set_search_bases(struct sdap_options *id_opts) goto done; } DEBUG(SSSDBG_CONF_SETTINGS, - ("Option %s set to %s\n", + "Option %s set to %s\n", id_opts->basic[search_base_options[o]].opt_name, dp_opt_get_string(id_opts->basic, - search_base_options[o]))); + search_base_options[o])); } } } else { DEBUG(SSSDBG_CONF_SETTINGS, - ("Search base not set. SSSD will attempt to discover it later, " - "when connecting to the LDAP server.\n")); + "Search base not set. SSSD will attempt to discover it later, " + "when connecting to the LDAP server.\n"); } /* Default search */ @@ -997,7 +997,7 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, &krb5_options); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not read Kerberos options from the configuration\n")); + "Could not read Kerberos options from the configuration\n"); goto done; } @@ -1007,16 +1007,16 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, ret = dp_opt_set_string(krb5_options, KRB5_KDC, ad_servers); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, - ("Option %s set to %s\n", + "Option %s set to %s\n", krb5_options[KRB5_KDC].opt_name, - ad_servers)); + ad_servers); /* Set krb5 realm */ /* Set the Kerberos Realm for GSSAPI */ krb5_realm = dp_opt_get_string(ad_opts->basic, AD_KRB5_REALM); if (!krb5_realm) { /* Should be impossible, this is set in ad_get_common_options() */ - DEBUG(SSSDBG_FATAL_FAILURE, ("No Kerberos realm\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "No Kerberos realm\n"); ret = EINVAL; goto done; } @@ -1027,18 +1027,18 @@ ad_get_auth_options(TALLOC_CTX *mem_ctx, ret = dp_opt_set_string(krb5_options, KRB5_REALM, krb5_realm); if (ret != EOK) goto done; DEBUG(SSSDBG_CONF_SETTINGS, - ("Option %s set to %s\n", + "Option %s set to %s\n", krb5_options[KRB5_REALM].opt_name, - krb5_realm)); + krb5_realm); /* Set flag that controls whether we want to write the * kdcinfo files at all */ ad_opts->service->krb5_service->write_kdcinfo = \ dp_opt_get_bool(krb5_options, KRB5_USE_KDCINFO); - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", krb5_options[KRB5_USE_KDCINFO].opt_name, - ad_opts->service->krb5_service->write_kdcinfo ? "true" : "false")); + ad_opts->service->krb5_service->write_kdcinfo ? "true" : "false"); *_opts = talloc_steal(mem_ctx, krb5_options); @@ -1058,8 +1058,8 @@ errno_t ad_get_dyndns_options(struct be_ctx *be_ctx, &ad_opts->dyndns_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot initialize AD dyndns opts [%d]: %s\n", - ret, sss_strerror(ret))); + "Cannot initialize AD dyndns opts [%d]: %s\n", + ret, sss_strerror(ret)); return ret; } @@ -1106,8 +1106,8 @@ ad_get_dom_ldap_conn(struct ad_id_ctx *ad_ctx, struct sss_domain_info *dom) if (IS_SUBDOMAIN(dom)) { sdom = sdap_domain_get(ad_ctx->sdap_id_ctx->opts, dom); if (sdom == NULL || sdom->pvt == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No ID ctx available for [%s].\n", - dom->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "No ID ctx available for [%s].\n", + dom->name); return NULL; } subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx); diff --git a/src/providers/ad/ad_domain_info.c b/src/providers/ad/ad_domain_info.c index e8f90cc78..95944840c 100644 --- a/src/providers/ad/ad_domain_info.c +++ b/src/providers/ad/ad_domain_info.c @@ -57,15 +57,15 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_el(reply, AD_AT_NETLOGON, &el); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_el() failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_el() failed\n"); return ret; } if (el->num_values == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("netlogon has no value\n")); + DEBUG(SSSDBG_OP_FAILURE, "netlogon has no value\n"); return ENOENT; } else if (el->num_values > 1) { - DEBUG(SSSDBG_OP_FAILURE, ("More than one netlogon value?\n")); + DEBUG(SSSDBG_OP_FAILURE, "More than one netlogon value?\n"); return EIO; } @@ -74,22 +74,22 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx, ndr_pull = ndr_pull_init_blob(&blob, mem_ctx); if (ndr_pull == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_init_blob() failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_init_blob() failed.\n"); return ENOMEM; } ndr_err = ndr_pull_netlogon_samlogon_response(ndr_pull, NDR_SCALARS, &response); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_netlogon_samlogon_response() " - "failed [%d]\n", ndr_err)); + DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_netlogon_samlogon_response() " + "failed [%d]\n", ndr_err); ret = EBADMSG; goto done; } if (!(response.ntver & NETLOGON_NT_VERSION_5EX)) { - DEBUG(SSSDBG_OP_FAILURE, ("Wrong version returned [%x]\n", - response.ntver)); + DEBUG(SSSDBG_OP_FAILURE, "Wrong version returned [%x]\n", + response.ntver); ret = EBADMSG; goto done; } @@ -100,14 +100,14 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx, flat_name = response.data.nt5_ex.domain_name; } else { DEBUG(SSSDBG_MINOR_FAILURE, - ("No netlogon domain name data available\n")); + "No netlogon domain name data available\n"); ret = ENOENT; goto done; } *_flat_name = talloc_strdup(mem_ctx, flat_name); if (*_flat_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -117,14 +117,14 @@ netlogon_get_domain_info(TALLOC_CTX *mem_ctx, *response.data.nt5_ex.forest != '\0') { forest = response.data.nt5_ex.forest; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("No netlogon forest data available\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No netlogon forest data available\n"); ret = ENOENT; goto done; } *_forest = talloc_strdup(mem_ctx, forest); if (*_forest == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -217,7 +217,7 @@ ad_master_domain_next(struct tevent_req *req) SDAP_SEARCH_TIMEOUT), false); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send failed.\n"); return ENOMEM; } tevent_req_set_callback(subreq, ad_master_domain_next_done, req); @@ -246,7 +246,7 @@ ad_master_domain_next_done(struct tevent_req *subreq) ret = sdap_get_generic_recv(subreq, state, &reply_count, &reply); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send request failed.\n"); goto done; } @@ -266,7 +266,7 @@ ad_master_domain_next_done(struct tevent_req *subreq) } else if (reply_count == 1) { ret = sysdb_attrs_get_el(reply[0], AD_AT_OBJECT_SID, &el); if (ret != EOK || el->num_values != 1) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_attrs_get_el failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_attrs_get_el failed.\n"); goto done; } @@ -276,7 +276,7 @@ ad_master_domain_next_done(struct tevent_req *subreq) &sid_str); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert SID: [%s].\n", idmap_error_string(err))); + "Could not convert SID: [%s].\n", idmap_error_string(err)); ret = EFAULT; goto done; } @@ -284,17 +284,17 @@ ad_master_domain_next_done(struct tevent_req *subreq) state->sid = talloc_steal(state, sid_str); } else { DEBUG(SSSDBG_OP_FAILURE, - ("More than one result for domain SID found.\n")); + "More than one result for domain SID found.\n"); ret = EINVAL; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Found SID [%s].\n", state->sid)); + DEBUG(SSSDBG_TRACE_FUNC, "Found SID [%s].\n", state->sid); ntver = sss_ldap_encode_ndr_uint32(state, NETLOGON_NT_VERSION_5EX | NETLOGON_NT_VERSION_WITH_CLOSEST_SITE); if (ntver == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_ldap_encode_ndr_uint32 failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_ldap_encode_ndr_uint32 failed.\n"); ret = ENOMEM; goto done; } @@ -303,7 +303,7 @@ ad_master_domain_next_done(struct tevent_req *subreq) AD_AT_DNS_DOMAIN, state->dom_name, AD_AT_NT_VERSION, ntver); if (filter == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -316,7 +316,7 @@ ad_master_domain_next_done(struct tevent_req *subreq) SDAP_SEARCH_TIMEOUT), false); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send failed.\n"); ret = ENOMEM; goto done; } @@ -343,19 +343,19 @@ ad_master_domain_netlogon_done(struct tevent_req *subreq) ret = sdap_get_generic_recv(subreq, state, &reply_count, &reply); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send request failed.\n"); tevent_req_error(req, ret); return; } /* Failure to get the flat name is not fatal. Just quit. */ if (reply_count == 0) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No netlogon data available. Flat name " \ - "might not be usable\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No netlogon data available. Flat name " \ + "might not be usable\n"); goto done; } else if (reply_count > 1) { DEBUG(SSSDBG_MINOR_FAILURE, - ("More than one netlogon info returned.\n")); + "More than one netlogon info returned.\n"); goto done; } @@ -365,12 +365,12 @@ ad_master_domain_netlogon_done(struct tevent_req *subreq) &state->forest); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not get the flat name or forest\n")); + "Could not get the flat name or forest\n"); /* Not fatal. Just quit. */ goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Found flat name [%s].\n", state->flat)); - DEBUG(SSSDBG_TRACE_FUNC, ("Found forest [%s].\n", state->forest)); + DEBUG(SSSDBG_TRACE_FUNC, "Found flat name [%s].\n", state->flat); + DEBUG(SSSDBG_TRACE_FUNC, "Found forest [%s].\n", state->forest); done: tevent_req_done(req); diff --git a/src/providers/ad/ad_dyndns.c b/src/providers/ad/ad_dyndns.c index da01426ca..7e9fd2a69 100644 --- a/src/providers/ad/ad_dyndns.c +++ b/src/providers/ad/ad_dyndns.c @@ -41,39 +41,39 @@ errno_t ad_dyndns_init(struct be_ctx *be_ctx, */ ret = ad_get_dyndns_options(be_ctx, ad_opts); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not set AD options\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not set AD options\n"); return ret; } if (dp_opt_get_bool(ad_opts->dyndns_ctx->opts, DP_OPT_DYNDNS_UPDATE) == false) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Dynamic DNS updates not set\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Dynamic DNS updates not set\n"); return EOK; } DEBUG(SSSDBG_CONF_SETTINGS, - ("Dynamic DNS updates are on. Checking for nsupdate..\n")); + "Dynamic DNS updates are on. Checking for nsupdate..\n"); ret = be_nsupdate_check(); if (ret == ENOENT) { DEBUG(SSSDBG_MINOR_FAILURE, - ("DNS updates requested but nsupdate not available\n")); + "DNS updates requested but nsupdate not available\n"); return EOK; } else if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not check for nsupdate\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not check for nsupdate\n"); return ret; } ad_opts->be_res = be_ctx->be_res; if (ad_opts->be_res == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Resolver must be initialized in order " - "to use the AD dynamic DNS updates\n")); + DEBUG(SSSDBG_OP_FAILURE, "Resolver must be initialized in order " + "to use the AD dynamic DNS updates\n"); return EINVAL; } ret = be_nsupdate_init_timer(ad_opts->dyndns_ctx, be_ctx->ev, ad_dyndns_timer, ad_opts); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not set up periodic update\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not set up periodic update\n"); return ret; } @@ -81,7 +81,7 @@ errno_t ad_dyndns_init(struct be_ctx *be_ctx, ad_dyndns_update, ad_opts, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not set up online callback\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not set up online callback\n"); return ret; } @@ -99,7 +99,7 @@ void ad_dyndns_timer(void *pvt) req = sdap_dyndns_timer_conn_send(ctx, sdap_ctx->be->ev, sdap_ctx, ctx->dyndns_ctx); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory\n"); /* Not much we can do. Just attempt to reschedule */ be_nsupdate_timer_schedule(sdap_ctx->be->ev, ctx->dyndns_ctx); return; @@ -116,7 +116,7 @@ static void ad_dyndns_timer_connected(struct tevent_req *req) talloc_zfree(req); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to AD: [%d](%s)\n", ret, sss_strerror(ret))); + "Failed to connect to AD: [%d](%s)\n", ret, sss_strerror(ret)); return; } @@ -138,7 +138,7 @@ void ad_dyndns_update(void *pvt) req = ad_dyndns_update_send(ctx); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not update DNS\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not update DNS\n"); return; } tevent_req_set_callback(req, ad_dyndns_nsupdate_done, NULL); @@ -149,12 +149,12 @@ static void ad_dyndns_nsupdate_done(struct tevent_req *req) int ret = ad_dyndns_update_recv(req); talloc_free(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Updating DNS entry failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Updating DNS entry failed [%d]: %s\n", + ret, sss_strerror(ret)); return; } - DEBUG(SSSDBG_OP_FAILURE, ("DNS update finished\n")); + DEBUG(SSSDBG_OP_FAILURE, "DNS update finished\n"); } struct ad_dyndns_update_state { @@ -173,7 +173,7 @@ ad_dyndns_update_send(struct ad_options *ctx) struct sdap_id_ctx *sdap_ctx = ctx->id_ctx->sdap_id_ctx; LDAPURLDesc *lud; - DEBUG(SSSDBG_TRACE_FUNC, ("Performing update\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Performing update\n"); req = tevent_req_create(ctx, &state, struct ad_dyndns_update_state); if (req == NULL) { @@ -183,8 +183,8 @@ ad_dyndns_update_send(struct ad_options *ctx) if (ctx->dyndns_ctx->last_refresh + 60 > time(NULL) || ctx->dyndns_ctx->timer_in_progress) { - DEBUG(SSSDBG_FUNC_DATA, ("Last periodic update ran recently or timer" - "in progress, not scheduling another update\n")); + DEBUG(SSSDBG_FUNC_DATA, "Last periodic update ran recently or timer" + "in progress, not scheduling another update\n"); tevent_req_done(req); tevent_req_post(req, sdap_ctx->be->ev); return req; @@ -194,7 +194,7 @@ ad_dyndns_update_send(struct ad_options *ctx) ret = ldap_url_parse(ctx->service->sdap->uri, &lud); if (ret != LDAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to parse ldap URI (%s)!\n", ctx->service->sdap->uri)); + "Failed to parse ldap URI (%s)!\n", ctx->service->sdap->uri); ret = EINVAL; goto done; } @@ -202,7 +202,7 @@ ad_dyndns_update_send(struct ad_options *ctx) if (lud->lud_scheme != NULL && strcasecmp(lud->lud_scheme, "ldapi") == 0) { DEBUG(SSSDBG_CRIT_FAILURE, - ("The LDAP scheme is ldapi://, cannot proceed with update\n")); + "The LDAP scheme is ldapi://, cannot proceed with update\n"); ldap_free_urldesc(lud); ret = EINVAL; goto done; @@ -210,8 +210,8 @@ ad_dyndns_update_send(struct ad_options *ctx) if (lud->lud_host == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("The LDAP URI (%s) did not contain a host name\n", - ctx->service->sdap->uri)); + "The LDAP URI (%s) did not contain a host name\n", + ctx->service->sdap->uri); ldap_free_urldesc(lud); ret = EINVAL; goto done; @@ -243,8 +243,8 @@ ad_dyndns_update_send(struct ad_options *ctx) if (!subreq) { ret = EIO; DEBUG(SSSDBG_OP_FAILURE, - ("sdap_id_op_connect_send failed: [%d](%s)\n", - ret, sss_strerror(ret))); + "sdap_id_op_connect_send failed: [%d](%s)\n", + ret, sss_strerror(ret)); goto done; } tevent_req_set_callback(subreq, ad_dyndns_sdap_update_done, req); @@ -268,8 +268,8 @@ static void ad_dyndns_sdap_update_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Dynamic DNS update failed [%d]: %s\n", - ret, sss_strerror(ret))); + "Dynamic DNS update failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } diff --git a/src/providers/ad/ad_id.c b/src/providers/ad/ad_id.c index 6e2fe53b0..f8e663944 100644 --- a/src/providers/ad/ad_id.c +++ b/src/providers/ad/ad_id.c @@ -36,15 +36,15 @@ disable_gc(struct ad_options *ad_options) return; } - DEBUG(SSSDBG_IMPORTANT_INFO, ("POSIX attributes were requested " + DEBUG(SSSDBG_IMPORTANT_INFO, "POSIX attributes were requested " "but are not present on the server side. Global Catalog " - "lookups will be disabled\n")); + "lookups will be disabled\n"); ret = dp_opt_set_bool(ad_options->basic, AD_ENABLE_GC, false); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not turn off GC support\n")); + "Could not turn off GC support\n"); /* Not fatal */ } } @@ -275,8 +275,8 @@ static errno_t ad_account_can_shortcut(struct be_ctx *be_ctx, /* convert the ID to its SID equivalent */ err = sss_idmap_unix_to_sid(idmap_ctx->map, id, &sid); if (err != IDMAP_SUCCESS) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Mapping ID [%s] to SID failed: " - "[%s]\n", filter_value, idmap_error_string(err))); + DEBUG(SSSDBG_MINOR_FAILURE, "Mapping ID [%s] to SID failed: " + "[%s]\n", filter_value, idmap_error_string(err)); ret = EIO; goto done; } @@ -286,7 +286,7 @@ static errno_t ad_account_can_shortcut(struct be_ctx *be_ctx, req_dom = find_subdomain_by_sid(domain, csid); if (req_dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Invalid domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Invalid domain\n"); ret = ERR_DOMAIN_NOT_FOUND; goto done; } @@ -348,12 +348,12 @@ ad_account_info_handler(struct be_req *be_req) ar->domain, &shortcut); if (ret != EOK) { DEBUG(SSSDBG_TRACE_FUNC, - ("Cannot determine the right domain: %s\n", sss_strerror(ret))); + "Cannot determine the right domain: %s\n", sss_strerror(ret)); shortcut = false; } if (shortcut) { - DEBUG(SSSDBG_TRACE_FUNC, ("This ID is from different domain\n")); + DEBUG(SSSDBG_TRACE_FUNC, "This ID is from different domain\n"); be_req_terminate(be_req, DP_ERR_OK, EOK, NULL); return; } @@ -413,7 +413,7 @@ ad_account_info_complete(struct tevent_req *req) error_text = NULL; } else { DEBUG(SSSDBG_FATAL_FAILURE, - ("Bug: dp_error is OK on failed request\n")); + "Bug: dp_error is OK on failed request\n"); dp_error = DP_ERR_FATAL; error_text = req_error_text; } @@ -474,7 +474,7 @@ ad_enumeration_send(TALLOC_CTX *mem_ctx, ectx = talloc_get_type(pvt, struct ldap_enum_ctx); if (ectx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot retrieve ldap_enum_ctx!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot retrieve ldap_enum_ctx!\n"); ret = EFAULT; goto fail; } @@ -488,15 +488,15 @@ ad_enumeration_send(TALLOC_CTX *mem_ctx, state->sdap_op = sdap_id_op_create(state, state->id_ctx->ldap_ctx->conn_cache); if (state->sdap_op == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed.\n"); ret = ENOMEM; goto fail; } subreq = sdap_id_op_connect_send(state->sdap_op, state, &ret); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_connect_send failed: %d(%s).\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed: %d(%s).\n", + ret, strerror(ret)); goto fail; } tevent_req_set_callback(subreq, ad_enumeration_conn_done, req); @@ -523,12 +523,12 @@ ad_enumeration_conn_done(struct tevent_req *subreq) if (ret != EOK) { if (dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_TRACE_FUNC, - ("Backend is marked offline, retry later!\n")); + "Backend is marked offline, retry later!\n"); tevent_req_done(req); } else { DEBUG(SSSDBG_MINOR_FAILURE, - ("Domain enumeration failed to connect to " \ - "LDAP server: (%d)[%s]\n", ret, strerror(ret))); + "Domain enumeration failed to connect to " \ + "LDAP server: (%d)[%s]\n", ret, strerror(ret)); tevent_req_error(req, ret); } return; @@ -539,7 +539,7 @@ ad_enumeration_conn_done(struct tevent_req *subreq) state->sdap_op, state->sdom->dom->name); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ad_master_domain_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ad_master_domain_send failed.\n"); tevent_req_error(req, ret); return; } @@ -562,7 +562,7 @@ ad_enumeration_master_done(struct tevent_req *subreq) &flat_name, &master_sid, &forest); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot retrieve master domain info\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot retrieve master domain info\n"); tevent_req_error(req, ret); return; } @@ -570,7 +570,7 @@ ad_enumeration_master_done(struct tevent_req *subreq) ret = sysdb_master_domain_add_info(state->sdom->dom, flat_name, master_sid, forest); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot save master domain info\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot save master domain info\n"); tevent_req_error(req, ret); return; } @@ -578,7 +578,7 @@ ad_enumeration_master_done(struct tevent_req *subreq) ret = ad_enum_sdom(req, state->sdom, state->id_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not enumerate domain %s\n", state->sdom->dom->name)); + "Could not enumerate domain %s\n", state->sdom->dom->name); tevent_req_error(req, ret); return; } @@ -615,7 +615,7 @@ ad_enum_sdom(struct tevent_req *req, /* The ptask API will reschedule the enumeration on its own on * failure */ DEBUG(SSSDBG_OP_FAILURE, - ("Failed to schedule enumeration, retrying later!\n")); + "Failed to schedule enumeration, retrying later!\n"); return ENOMEM; } tevent_req_set_callback(subreq, ad_enumeration_done, req); @@ -645,7 +645,7 @@ ad_enumeration_done(struct tevent_req *subreq) ret = ad_enum_sdom(req, state->sditer, state->id_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not retry domain %s\n", state->sditer->dom->name)); + "Could not retry domain %s\n", state->sditer->dom->name); tevent_req_error(req, ret); return; } @@ -654,7 +654,7 @@ ad_enumeration_done(struct tevent_req *subreq) return; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not enumerate domain %s\n", state->sditer->dom->name)); + "Could not enumerate domain %s\n", state->sditer->dom->name); tevent_req_error(req, ret); return; } @@ -667,8 +667,8 @@ ad_enumeration_done(struct tevent_req *subreq) if (state->sditer != NULL) { ret = ad_enum_sdom(req, state->sditer, state->sditer->pvt); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not enumerate domain %s\n", - state->sditer->dom->name)); + DEBUG(SSSDBG_OP_FAILURE, "Could not enumerate domain %s\n", + state->sditer->dom->name); tevent_req_error(req, ret); return; } @@ -690,9 +690,9 @@ ad_enumeration_done(struct tevent_req *subreq) ret = ad_enum_cross_dom_members(state->id_ctx->ad_options->id, state->sditer->dom); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not check cross-domain " + DEBUG(SSSDBG_MINOR_FAILURE, "Could not check cross-domain " "memberships for %s, group memberships might be " - "incomplete!\n", state->sdom->dom->name)); + "incomplete!\n", state->sdom->dom->name); continue; } } @@ -734,7 +734,7 @@ ad_enum_cross_dom_members(struct sdap_options *opts, ret = sysdb_transaction_start(dom->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -753,9 +753,9 @@ ad_enum_cross_dom_members(struct sdap_options *opts, for (i = 0; i < count; i++) { ret = ad_group_extra_members(tmp_ctx, msgs[i], dom, &group_only); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to check extra members\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to check extra members\n"); } else if (group_only == NULL) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("No extra members\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "No extra members\n"); continue; } @@ -763,8 +763,8 @@ ad_enum_cross_dom_members(struct sdap_options *opts, for (mi = 0; group_only[mi]; mi++) { ret = ad_group_add_member(opts, dom, msgs[i]->dn, group_only[mi]); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to add [%s]: %s\n", - group_only[mi], strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to add [%s]: %s\n", + group_only[mi], strerror(ret)); continue; } } @@ -774,7 +774,7 @@ ad_enum_cross_dom_members(struct sdap_options *opts, ret = sysdb_transaction_commit(dom->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto done; } in_transaction = false; @@ -784,7 +784,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(dom->sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -817,21 +817,21 @@ ad_group_extra_members(TALLOC_CTX *mem_ctx, const struct ldb_message *group, m = ldb_msg_find_element(group, SYSDB_MEMBER); name = ldb_msg_find_attr_as_string(group, SYSDB_NAME, NULL); if (name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("A group with no name!\n")); + DEBUG(SSSDBG_OP_FAILURE, "A group with no name!\n"); ret = EFAULT; goto done; } if (om == NULL || om->num_values == 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("Group %s has no original members\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Group %s has no original members\n", name); ret = EOK; goto done; } if (m == NULL || (m->num_values < om->num_values)) { DEBUG(SSSDBG_TRACE_FUNC, - ("Group %s has %d members but %d original members\n", - name, m ? m->num_values : 0, om->num_values)); + "Group %s has %d members but %d original members\n", + name, m ? m->num_values : 0, om->num_values); /* Get the list of originalDN attributes that are already * linked to the group @@ -840,8 +840,8 @@ ad_group_extra_members(TALLOC_CTX *mem_ctx, const struct ldb_message *group, &sysdb_odn_list); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not retrieve list of original members for %s\n", - name)); + "Could not retrieve list of original members for %s\n", + name); goto done; } @@ -857,7 +857,7 @@ ad_group_extra_members(TALLOC_CTX *mem_ctx, const struct ldb_message *group, sysdb_odn_list, &group_only, NULL, NULL); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not compare lists of members for %s\n", name)); + "Could not compare lists of members for %s\n", name); goto done; } } @@ -916,7 +916,7 @@ ad_group_stored_orig_members(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, goto done; } oi++; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Member %s already in sysdb\n", odn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Member %s already in sysdb\n", odn); } ret = EOK; @@ -943,7 +943,7 @@ ad_group_add_member(struct sdap_options *opts, /* This member would be from a different domain */ sd = sdap_domain_get_by_dn(opts, member); if (sd == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No matching domain for %s\n", member)); + DEBUG(SSSDBG_MINOR_FAILURE, "No matching domain for %s\n", member); return ENOENT; } @@ -967,26 +967,26 @@ ad_group_add_member(struct sdap_options *opts, LDB_SCOPE_SUBTREE, mem_filter, NULL, &msgs_count, &msgs); if (ret == ENOENT) { - DEBUG(SSSDBG_TRACE_FUNC, ("No member [%s] in sysdb\n", member)); + DEBUG(SSSDBG_TRACE_FUNC, "No member [%s] in sysdb\n", member); ret = EOK; goto done; } else if (ret != EOK) { goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("[%s] found in sysdb\n", member)); + DEBUG(SSSDBG_TRACE_INTERNAL, "[%s] found in sysdb\n", member); if (msgs_count != 1) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Search by orig DN returned %zd results!\n", msgs_count)); + "Search by orig DN returned %zd results!\n", msgs_count); ret = EFAULT; goto done; } ret = sysdb_mod_group_member(group_domain, msgs[0]->dn, group_dn, SYSDB_MOD_ADD); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add [%s] as a member of [%s]\n", + DEBUG(SSSDBG_OP_FAILURE, "Could not add [%s] as a member of [%s]\n", ldb_dn_get_linearized(msgs[0]->dn), - ldb_dn_get_linearized(group_dn))); + ldb_dn_get_linearized(group_dn)); goto done; } diff --git a/src/providers/ad/ad_init.c b/src/providers/ad/ad_init.c index eff6d990d..60f1939af 100644 --- a/src/providers/ad/ad_init.c +++ b/src/providers/ad/ad_init.c @@ -124,8 +124,8 @@ common_ad_init(struct be_ctx *bectx) &ad_options); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Could not parse common options: [%s]\n", - strerror(ret))); + "Could not parse common options: [%s]\n", + strerror(ret)); goto done; } @@ -140,8 +140,8 @@ common_ad_init(struct be_ctx *bectx) &ad_options->service); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to init AD failover service: [%s]\n", - strerror(ret))); + "Failed to init AD failover service: [%s]\n", + strerror(ret)); goto done; } @@ -185,15 +185,15 @@ sssm_ad_id_init(struct be_ctx *bectx, ret = ad_dyndns_init(ad_ctx->sdap_id_ctx->be, ad_options); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failure setting up automatic DNS update\n")); + "Failure setting up automatic DNS update\n"); /* Continue without DNS updates */ } ret = sdap_setup_child(); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("setup_child failed [%d][%s].\n", - ret, strerror(ret))); + "setup_child failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -225,7 +225,7 @@ sssm_ad_id_init(struct be_ctx *bectx, ret = setup_tls_config(ad_ctx->sdap_id_ctx->opts->basic); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("setup_tls_config failed [%s]\n", strerror(ret))); + "setup_tls_config failed [%s]\n", strerror(ret)); goto done; } @@ -238,7 +238,7 @@ sssm_ad_id_init(struct be_ctx *bectx, default_host_dbs, ad_options->id, hostname, ad_domain); if (srv_ctx == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Out of memory?\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory?\n"); ret = ENOMEM; goto done; } @@ -249,8 +249,8 @@ sssm_ad_id_init(struct be_ctx *bectx, /* fall back to standard plugin */ ret = be_fo_set_dns_srv_lookup_plugin(bectx, hostname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to set SRV lookup plugin " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to set SRV lookup plugin " + "[%d]: %s\n", ret, strerror(ret)); goto done; } } @@ -261,8 +261,8 @@ sssm_ad_id_init(struct be_ctx *bectx, sdap_refresh_netgroups_recv, ad_ctx->sdap_id_ctx); if (ret != EOK && ret != EEXIST) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Periodical refresh of netgroups " - "will not work [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Periodical refresh of netgroups " + "will not work [%d]: %s\n", ret, strerror(ret)); } *ops = &ad_id_ops; @@ -311,15 +311,15 @@ sssm_ad_auth_init(struct be_ctx *bectx, &krb5_auth_ctx->opts); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Could not determine Kerberos options\n")); + "Could not determine Kerberos options\n"); goto done; } ret = krb5_child_init(krb5_auth_ctx, bectx); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Could not initialize krb5_child settings: [%s]\n", - strerror(ret))); + "Could not initialize krb5_child settings: [%s]\n", + strerror(ret)); goto done; } @@ -384,8 +384,8 @@ sssm_ad_access_init(struct be_ctx *bectx, &access_ctx->ad_options); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Could not initialize access provider options: [%s]\n", - strerror(ret))); + "Could not initialize access provider options: [%s]\n", + strerror(ret)); goto fail; } @@ -448,12 +448,12 @@ int sssm_ad_subdomains_init(struct be_ctx *bectx, ret = sssm_ad_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ad_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ad_id_init failed.\n"); return ret; } if (ad_options == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Global AD options not available.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Global AD options not available.\n"); return EINVAL; } @@ -461,7 +461,7 @@ int sssm_ad_subdomains_init(struct be_ctx *bectx, ret = ad_subdom_init(bectx, id_ctx, ad_domain, ops, pvt_data); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ad_subdom_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ad_subdom_init failed.\n"); return ret; } diff --git a/src/providers/ad/ad_srv.c b/src/providers/ad/ad_srv.c index 071da4d22..8c0788bee 100644 --- a/src/providers/ad/ad_srv.c +++ b/src/providers/ad/ad_srv.c @@ -131,7 +131,7 @@ static struct tevent_req *ad_get_dc_servers_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ad_get_dc_servers_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -147,8 +147,8 @@ static struct tevent_req *ad_get_dc_servers_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_FUNC, ("Looking up domain controllers in domain %s\n", - domain)); + DEBUG(SSSDBG_TRACE_FUNC, "Looking up domain controllers in domain %s\n", + domain); subreq = fo_discover_srv_send(state, ev, resolv_ctx, "ldap", FO_PROTO_TCP, domains); @@ -185,8 +185,8 @@ static void ad_get_dc_servers_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Found %zu domain controllers in domain %s\n", - state->num_servers, domain)); + DEBUG(SSSDBG_TRACE_FUNC, "Found %zu domain controllers in domain %s\n", + state->num_servers, domain); done: if (ret != EOK) { @@ -249,7 +249,7 @@ struct tevent_req *ad_get_client_site_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ad_get_client_site_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -337,8 +337,8 @@ static void ad_get_client_site_connect_done(struct tevent_req *subreq) ret = sdap_connect_host_recv(state, subreq, &state->sh); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to connect to domain controller " - "[%s:%d]\n", state->dc.host, state->dc.port)); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to connect to domain controller " + "[%s:%d]\n", state->dc.host, state->dc.port); ret = ad_get_client_site_next_dc(req); if (ret == EOK) { @@ -405,7 +405,7 @@ static errno_t ad_get_client_site_parse_ndr(TALLOC_CTX *mem_ctx, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_new() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_new() failed\n"); return ENOMEM; } @@ -414,7 +414,7 @@ static errno_t ad_get_client_site_parse_ndr(TALLOC_CTX *mem_ctx, ndr_pull = ndr_pull_init_blob(&blob, mem_ctx); if (ndr_pull == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_init_blob() failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_init_blob() failed.\n"); ret = ENOMEM; goto done; } @@ -422,15 +422,15 @@ static errno_t ad_get_client_site_parse_ndr(TALLOC_CTX *mem_ctx, ndr_err = ndr_pull_netlogon_samlogon_response(ndr_pull, NDR_SCALARS, &response); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - DEBUG(SSSDBG_OP_FAILURE, ("ndr_pull_netlogon_samlogon_response() " - "failed [%d]\n", ndr_err)); + DEBUG(SSSDBG_OP_FAILURE, "ndr_pull_netlogon_samlogon_response() " + "failed [%d]\n", ndr_err); ret = EBADMSG; goto done; } if (!(response.ntver & NETLOGON_NT_VERSION_5EX)) { - DEBUG(SSSDBG_OP_FAILURE, ("This NT version does not provide site " - "information [%x]\n", response.ntver)); + DEBUG(SSSDBG_OP_FAILURE, "This NT version does not provide site " + "information [%x]\n", response.ntver); ret = EBADMSG; goto done; } @@ -488,7 +488,7 @@ static void ad_get_client_site_done(struct tevent_req *subreq) /* we're done with this LDAP, close connection */ talloc_zfree(state->sh); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to get netlogon information\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to get netlogon information\n"); ret = ad_get_client_site_next_dc(req); if (ret == EOK) { @@ -498,23 +498,23 @@ static void ad_get_client_site_done(struct tevent_req *subreq) } if (reply_count == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("No netlogon information retrieved\n")); + DEBUG(SSSDBG_OP_FAILURE, "No netlogon information retrieved\n"); ret = ENOENT; goto done; } ret = sysdb_attrs_get_el(reply[0], AD_AT_NETLOGON, &el); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_el() failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_el() failed\n"); goto done; } if (el->num_values == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("netlogon has no value\n")); + DEBUG(SSSDBG_OP_FAILURE, "netlogon has no value\n"); ret = ENOENT; goto done; } else if (el->num_values > 1) { - DEBUG(SSSDBG_OP_FAILURE, ("More than one netlogon value?\n")); + DEBUG(SSSDBG_OP_FAILURE, "More than one netlogon value?\n"); ret = EIO; goto done; } @@ -523,13 +523,13 @@ static void ad_get_client_site_done(struct tevent_req *subreq) el->values[0].length, &state->site, &state->forest); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to retrieve site name [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to retrieve site name [%d]: %s\n", + ret, strerror(ret)); ret = ENOENT; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Found site: %s\n", state->site)); + DEBUG(SSSDBG_TRACE_FUNC, "Found site: %s\n", state->site); done: if (ret != EOK) { @@ -646,7 +646,7 @@ struct tevent_req *ad_srv_plugin_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ad_srv_plugin_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -681,7 +681,7 @@ struct tevent_req *ad_srv_plugin_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_FUNC, ("About to find domain controllers\n")); + DEBUG(SSSDBG_TRACE_FUNC, "About to find domain controllers\n"); subreq = ad_get_dc_servers_send(state, ev, ctx->be_res->resolv, state->discovery_domain); @@ -718,7 +718,7 @@ static void ad_srv_plugin_dcs_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("About to locate suitable site\n")); + DEBUG(SSSDBG_TRACE_FUNC, "About to locate suitable site\n"); subreq = ad_get_client_site_send(state, state->ev, state->ctx->be_res, @@ -785,8 +785,8 @@ static void ad_srv_plugin_site_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("About to discover primary and " - "backup servers\n")); + DEBUG(SSSDBG_TRACE_FUNC, "About to discover primary and " + "backup servers\n"); subreq = fo_discover_servers_send(state, state->ev, state->ctx->be_res->resolv, @@ -831,15 +831,15 @@ static void ad_srv_plugin_servers_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu primary and %zu backup servers\n", - state->num_primary_servers, state->num_backup_servers)); + DEBUG(SSSDBG_TRACE_FUNC, "Got %zu primary and %zu backup servers\n", + state->num_primary_servers, state->num_backup_servers); ret = ad_sort_servers_by_dns(state, state->discovery_domain, &state->primary_servers, state->num_primary_servers); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to sort primary servers by DNS" - "[%d]: %s\n", ret, sss_strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to sort primary servers by DNS" + "[%d]: %s\n", ret, sss_strerror(ret)); /* continue */ } @@ -847,8 +847,8 @@ static void ad_srv_plugin_servers_done(struct tevent_req *subreq) &state->backup_servers, state->num_backup_servers); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to sort backup servers by DNS" - "[%d]: %s\n", ret, sss_strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to sort backup servers by DNS" + "[%d]: %s\n", ret, sss_strerror(ret)); /* continue */ } diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index 0d9652b5c..6c2e7de12 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -107,13 +107,13 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, realm = dp_opt_get_cstring(id_ctx->ad_options->basic, AD_KRB5_REALM); hostname = dp_opt_get_cstring(id_ctx->ad_options->basic, AD_HOSTNAME); if (realm == NULL || hostname == NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Missing realm or hostname.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Missing realm or hostname.\n"); return EINVAL; } ad_options = ad_create_default_options(id_ctx, realm, hostname); if (ad_options == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize AD options\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD options\n"); talloc_free(ad_options); return ENOMEM; } @@ -122,7 +122,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, ret = dp_opt_set_string(ad_options->basic, AD_DOMAIN, ad_domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set AD domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set AD domain\n"); talloc_free(ad_options); return ret; } @@ -137,7 +137,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, subdom->name, gc_service_name, subdom->name, &ad_options->service); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize AD failover\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize AD failover\n"); talloc_free(ad_options); return ret; } @@ -157,7 +157,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, hostname, ad_domain); if (srv_ctx == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Out of memory?\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory?\n"); return ENOMEM; } be_fo_set_srv_lookup_plugin(be_ctx, ad_srv_plugin_send, @@ -167,7 +167,7 @@ ad_subdom_ad_ctx_new(struct be_ctx *be_ctx, ad_id_ctx->sdap_id_ctx->opts->sdom, subdom->parent); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize sdap domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize sdap domain\n"); talloc_free(ad_options); return ret; } @@ -195,7 +195,7 @@ ads_store_sdap_subdom(struct ad_subdomains_ctx *ctx, ret = sdap_domain_subdom_add(ctx->sdap_id_ctx, ctx->sdom, parent); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_domain_subdom_add failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_domain_subdom_add failed.\n"); return ret; } @@ -204,7 +204,7 @@ ads_store_sdap_subdom(struct ad_subdomains_ctx *ctx, ret = ad_subdom_ad_ctx_new(ctx->be_ctx, ctx->ad_id_ctx, sditer->dom, &subdom_id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ad_subdom_ad_ctx_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ad_subdom_ad_ctx_new failed.\n"); } else { sditer->pvt = subdom_id_ctx; } @@ -223,7 +223,7 @@ static errno_t ad_subdom_enumerates(struct sss_domain_info *parent, ret = sysdb_attrs_get_string(attrs, AD_AT_TRUST_PARTNER, &name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); return ret; } @@ -257,13 +257,13 @@ ad_subdom_store(struct ad_subdomains_ctx *ctx, ret = sysdb_attrs_get_uint32_t(subdom_attrs, AD_AT_TRUST_TYPE, &trust_type); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_uint32_t failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_uint32_t failed.\n"); goto done; } ret = sysdb_attrs_get_string(subdom_attrs, AD_AT_TRUST_PARTNER, &name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to get subdomain name\n")); + DEBUG(SSSDBG_OP_FAILURE, "failed to get subdomain name\n"); goto done; } @@ -275,14 +275,14 @@ ad_subdom_store(struct ad_subdomains_ctx *ctx, ret = sysdb_attrs_get_string(subdom_attrs, AD_AT_FLATNAME, &flat); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to get flat name of subdomain %s\n", - name)); + DEBUG(SSSDBG_OP_FAILURE, "failed to get flat name of subdomain %s\n", + name); goto done; } ret = sysdb_attrs_get_el(subdom_attrs, AD_AT_SID, &el); if (ret != EOK || el->num_values != 1) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_attrs_get_el failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_attrs_get_el failed.\n"); goto done; } @@ -292,7 +292,7 @@ ad_subdom_store(struct ad_subdomains_ctx *ctx, &sid_str); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert SID: [%s].\n", idmap_error_string(err))); + "Could not convert SID: [%s].\n", idmap_error_string(err)); ret = EFAULT; goto done; } @@ -305,7 +305,7 @@ ad_subdom_store(struct ad_subdomains_ctx *ctx, ret = sysdb_subdomain_store(domain->sysdb, name, realm, flat, sid_str, mpg, enumerate, domain->forest); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_subdomain_store failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_subdomain_store failed.\n"); goto done; } @@ -343,7 +343,7 @@ static errno_t ad_subdomains_refresh(struct ad_subdomains_ctx *ctx, } ret = sysdb_attrs_get_string(reply[c], AD_AT_TRUST_PARTNER, &value); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } if (strcmp(value, dom->name) == 0) { @@ -361,7 +361,7 @@ static errno_t ad_subdomains_refresh(struct ad_subdomains_ctx *ctx, sdom = sdap_domain_get(ctx->sdap_id_ctx->opts, dom); if (sdom == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("BUG: Domain does not exist?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "BUG: Domain does not exist?\n"); continue; } @@ -386,8 +386,8 @@ static errno_t ad_subdomains_refresh(struct ad_subdomains_ctx *ctx, /* Nothing we can do about the error. Let's at least try * to reuse the existing domains */ - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to parse subdom data, " - "will try to use cached subdomain\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to parse subdom data, " + "will try to use cached subdomain\n"); } handled[c] = true; h++; @@ -417,8 +417,8 @@ static errno_t ad_subdomains_refresh(struct ad_subdomains_ctx *ctx, ret = ad_subdom_store(ctx, domain, reply[c], enumerate); if (ret) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to parse subdom data, " - "will try to use cached subdomain\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to parse subdom data, " + "will try to use cached subdomain\n"); } } @@ -440,19 +440,19 @@ static errno_t ad_subdom_reinit(struct ad_subdomains_ctx *ctx) ret = sysdb_update_subdomains(ctx->be_ctx->domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_update_subdomains failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_update_subdomains failed.\n"); return ret; } ret = sss_write_domain_mappings(ctx->be_ctx->domain, false); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sss_krb5_write_mappings failed.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "sss_krb5_write_mappings failed.\n"); /* Just continue */ } ret = ads_store_sdap_subdom(ctx, ctx->be_ctx->domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ads_store_sdap_subdom failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ads_store_sdap_subdom failed.\n"); return ret; } @@ -487,15 +487,15 @@ static void ad_subdomains_retrieve(struct ad_subdomains_ctx *ctx, req_ctx->sdap_op = sdap_id_op_create(req_ctx, ctx->ldap_ctx->conn_cache); if (req_ctx->sdap_op == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed.\n"); ret = ENOMEM; goto done; } req = sdap_id_op_connect_send(req_ctx->sdap_op, req_ctx, &ret); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_connect_send failed: %d(%s).\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed: %d(%s).\n", + ret, strerror(ret)); goto done; } @@ -524,12 +524,12 @@ static void ad_subdomains_get_conn_done(struct tevent_req *req) if (ret) { if (dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No AD server is available, cannot get the " - "subdomain list while offline\n")); + "No AD server is available, cannot get the " + "subdomain list while offline\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to AD server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to connect to AD server: [%d](%s)\n", + ret, strerror(ret)); } goto fail; @@ -540,7 +540,7 @@ static void ad_subdomains_get_conn_done(struct tevent_req *req) ctx->sdap_op, ctx->sd_ctx->domain_name); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ad_master_domain_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ad_master_domain_send failed.\n"); ret = ENOMEM; goto fail; } @@ -563,7 +563,7 @@ static void ad_subdomains_master_dom_done(struct tevent_req *req) &ctx->forest); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot retrieve master domain info\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot retrieve master domain info\n"); goto done; } @@ -571,7 +571,7 @@ static void ad_subdomains_master_dom_done(struct tevent_req *req) ctx->flat_name, ctx->master_sid, ctx->forest); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot save master domain info\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot save master domain info\n"); goto done; } @@ -612,7 +612,7 @@ static errno_t ad_subdomains_get_slave(struct ad_subdomains_req_ctx *ctx) false); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send failed.\n"); return ENOMEM; } @@ -634,7 +634,7 @@ static void ad_subdomains_get_slave_domain_done(struct tevent_req *req) ret = sdap_get_generic_recv(req, ctx, &reply_count, &reply); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_get_generic_send request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_get_generic_send request failed.\n"); goto done; } @@ -662,17 +662,17 @@ static void ad_subdomains_get_slave_domain_done(struct tevent_req *req) ret = ad_subdomains_refresh(ctx->sd_ctx, ctx->reply_count, ctx->reply, &refresh_has_changes); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to refresh subdomains.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to refresh subdomains.\n"); goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("There are %schanges\n", - refresh_has_changes ? "" : "no ")); + DEBUG(SSSDBG_TRACE_LIBS, "There are %schanges\n", + refresh_has_changes ? "" : "no "); if (refresh_has_changes) { ret = ad_subdom_reinit(ctx->sd_ctx); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not reinitialize subdomains\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not reinitialize subdomains\n"); goto done; } } @@ -712,7 +712,7 @@ static void ad_subdom_online_cb(void *pvt) ctx = talloc_get_type(pvt, struct ad_subdomains_ctx); if (!ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Bad private pointer\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Bad private pointer\n"); return; } @@ -721,7 +721,7 @@ static void ad_subdom_online_cb(void *pvt) be_req = be_req_create(ctx, NULL, ctx->be_ctx, ad_subdom_be_req_callback, NULL); if (be_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_req_create() failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "be_req_create() failed.\n"); return; } @@ -731,7 +731,7 @@ static void ad_subdom_online_cb(void *pvt) ctx->timer_event = tevent_add_timer(ctx->be_ctx->ev, ctx, tv, ad_subdom_timer_refresh, ctx); if (!ctx->timer_event) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to add subdom timer event\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to add subdom timer event\n"); } } @@ -786,7 +786,7 @@ int ad_subdom_init(struct be_ctx *be_ctx, ctx = talloc_zero(id_ctx, struct ad_subdomains_ctx); if (ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } @@ -796,7 +796,7 @@ int ad_subdom_init(struct be_ctx *be_ctx, ctx->sdap_id_ctx = id_ctx->sdap_id_ctx; ctx->domain_name = talloc_strdup(ctx, ad_domain); if (ctx->domain_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); return ENOMEM; } ctx->ad_id_ctx = id_ctx; @@ -805,25 +805,25 @@ int ad_subdom_init(struct be_ctx *be_ctx, ret = be_add_online_cb(ctx, be_ctx, ad_subdom_online_cb, ctx, NULL); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to add subdom online callback")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to add subdom online callback"); } ret = be_add_offline_cb(ctx, be_ctx, ad_subdom_offline_cb, ctx, NULL); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to add subdom offline callback")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to add subdom offline callback"); } err = sss_idmap_init(sss_idmap_talloc, ctx, sss_idmap_talloc_free, &ctx->idmap_ctx); if (err != IDMAP_SUCCESS) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to initialize idmap context.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to initialize idmap context.\n"); return EFAULT; } ret = ad_subdom_reinit(ctx); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not reinitialize subdomains. " - "Users from trusted domains might not be resolved correctly\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not reinitialize subdomains. " + "Users from trusted domains might not be resolved correctly\n"); /* Ignore this error and try to discover the subdomains later */ } |