diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2014-02-12 10:12:04 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-05-02 10:58:19 +0200 |
| commit | b0d759c9a604add0573c04b1a4e88e1605e1fdc0 (patch) | |
| tree | 15c83ce34cd254a30cc42c212123b7f194c21677 /src/providers | |
| parent | b9afd88065ecdb9c2cafb2ee767bd61585b31b8f (diff) | |
| download | sssd-b0d759c9a604add0573c04b1a4e88e1605e1fdc0.tar.gz sssd-b0d759c9a604add0573c04b1a4e88e1605e1fdc0.tar.xz sssd-b0d759c9a604add0573c04b1a4e88e1605e1fdc0.zip | |
Make DEBUG macro invocations variadic
Use a script to update DEBUG macro invocations to use it as a variadic
macro, supplying format string and its arguments directly, instead of
wrapping them in parens.
This script was used to update the code
(identical to commit a3c8390d19593b1e5277d95bfb4ab206d4785150):
grep -rwl --include '*.[hc]' DEBUG . |
while read f; do
mv "$f"{,.orig}
perl -e \
'use strict;
use File::Slurp;
my $text=read_file(\*STDIN);
$text=~s#(\bDEBUG\s*\([^(]+)\((.*?)\)\s*\)\s*;#$1$2);#gs;
print $text;' < "$f.orig" > "$f"
rm "$f.orig"
done
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Reviewed-by: Stephen Gallagher <sgallagh@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'src/providers')
104 files changed, 4680 insertions, 4680 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 605de49f7..f5b01def2 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; @@ -374,7 +374,7 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, /* 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; } @@ -383,9 +383,9 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, 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; } @@ -401,8 +401,8 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, 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; } @@ -418,12 +418,12 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, 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; } @@ -443,7 +443,7 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, 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; } @@ -456,11 +456,11 @@ _ad_servers_init(TALLOC_CTX *mem_ctx, 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); @@ -494,13 +494,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; @@ -514,11 +514,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 @@ -566,13 +566,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; } @@ -586,7 +586,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; } @@ -599,7 +599,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; } @@ -621,7 +621,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; } @@ -629,7 +629,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; } @@ -637,7 +637,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; } @@ -667,13 +667,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; } @@ -686,37 +686,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; } @@ -750,15 +750,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; } @@ -771,7 +771,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; } @@ -780,7 +780,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"); } } @@ -788,7 +788,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; @@ -809,7 +809,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; } @@ -817,7 +817,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; } @@ -825,9 +825,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) { @@ -835,9 +835,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, @@ -847,7 +847,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; } @@ -931,16 +931,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 */ @@ -998,7 +998,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; } @@ -1008,16 +1008,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; } @@ -1028,18 +1028,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); @@ -1059,8 +1059,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; } @@ -1107,8 +1107,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 28d24b161..884c0b73e 100644 --- a/src/providers/ad/ad_domain_info.c +++ b/src/providers/ad/ad_domain_info.c @@ -56,15 +56,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; } @@ -73,22 +73,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; } @@ -99,14 +99,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; } @@ -116,14 +116,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; } @@ -216,7 +216,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); @@ -245,7 +245,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; } @@ -265,7 +265,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; } @@ -275,7 +275,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; } @@ -283,17 +283,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; } @@ -302,7 +302,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; } @@ -315,7 +315,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; } @@ -342,19 +342,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; } @@ -364,12 +364,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 01d18d7ae..a36570c5d 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 */ } } @@ -292,8 +292,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; } @@ -303,7 +303,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; } @@ -365,12 +365,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; } @@ -430,7 +430,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; } @@ -491,7 +491,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; } @@ -505,15 +505,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); @@ -540,12 +540,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; @@ -556,7 +556,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; } @@ -579,7 +579,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; } @@ -587,7 +587,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; } @@ -595,7 +595,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; } @@ -632,7 +632,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); @@ -662,7 +662,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; } @@ -671,7 +671,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; } @@ -684,8 +684,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; } @@ -707,9 +707,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; } } @@ -751,7 +751,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; @@ -771,10 +771,10 @@ 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"); continue; } else if (group_only == NULL) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("No extra members\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "No extra members\n"); continue; } @@ -782,8 +782,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; } } @@ -793,7 +793,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; @@ -803,7 +803,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); @@ -836,21 +836,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 @@ -859,8 +859,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; } @@ -876,7 +876,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; } } @@ -935,7 +935,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; @@ -962,7 +962,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; } @@ -986,17 +986,17 @@ 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; } @@ -1004,9 +1004,9 @@ ad_group_add_member(struct sdap_options *opts, ret = sysdb_mod_group_member(group_domain->sysdb, 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 500d807e9..1a05737d4 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; } @@ -477,18 +477,18 @@ int sssm_ad_sudo_init(struct be_ctx *bectx, struct ad_id_ctx *id_ctx; int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing AD sudo handler\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing AD sudo handler\n"); 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; } return ad_sudo_init(bectx, id_ctx, ops, pvt_data); #else - DEBUG(SSSDBG_MINOR_FAILURE, ("Sudo init handler called but SSSD is " - "built without sudo support, ignoring\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Sudo init handler called but SSSD is " + "built without sudo support, ignoring\n"); return EOK; #endif } diff --git a/src/providers/ad/ad_srv.c b/src/providers/ad/ad_srv.c index 99502e431..e44a98f4a 100644 --- a/src/providers/ad/ad_srv.c +++ b/src/providers/ad/ad_srv.c @@ -130,7 +130,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; } @@ -146,8 +146,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); @@ -184,8 +184,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) { @@ -248,7 +248,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; } @@ -336,8 +336,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) { @@ -404,7 +404,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; } @@ -413,7 +413,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; } @@ -421,15 +421,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; } @@ -487,7 +487,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) { @@ -497,23 +497,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; } @@ -522,13 +522,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) { @@ -645,7 +645,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; } @@ -680,7 +680,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); @@ -717,7 +717,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, @@ -784,8 +784,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, @@ -830,15 +830,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 */ } @@ -846,8 +846,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 79aa608b8..41d8de2c5 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -114,13 +114,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; } @@ -129,7 +129,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; } @@ -144,7 +144,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; } @@ -164,7 +164,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, @@ -174,7 +174,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; } @@ -202,7 +202,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; } @@ -211,7 +211,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; } @@ -230,7 +230,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; } @@ -264,13 +264,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; } @@ -282,14 +282,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; } @@ -299,7 +299,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; } @@ -312,7 +312,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; } @@ -350,7 +350,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) { @@ -368,7 +368,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; } @@ -393,8 +393,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++; @@ -425,8 +425,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"); } } @@ -448,19 +448,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; } @@ -500,15 +500,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; } @@ -537,12 +537,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; @@ -553,7 +553,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; } @@ -576,7 +576,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; } @@ -584,18 +584,18 @@ 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; } if (ctx->forest == NULL || strcasecmp(ctx->sd_ctx->be_ctx->domain->name, ctx->forest) != 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("SSSD needs to look up the forest root domain\n")); + "SSSD needs to look up the forest root domain\n"); ret = ad_subdomains_get_root(ctx); } else { DEBUG(SSSDBG_TRACE_FUNC, - ("Connected to forest root, looking up child domains..\n")); + "Connected to forest root, looking up child domains..\n"); ctx->root_op = ctx->sdap_op; ctx->root_id_ctx = ctx->sd_ctx->ad_id_ctx; @@ -647,7 +647,7 @@ static errno_t ad_subdomains_get_root(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; } @@ -672,7 +672,7 @@ static void ad_subdomains_get_root_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 fail; } @@ -689,8 +689,8 @@ static void ad_subdomains_get_root_domain_done(struct tevent_req *req) goto fail; } else if (reply_count > 1) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Multiple results for root domain search, " - "domain list might be incomplete!\n")); + "Multiple results for root domain search, " + "domain list might be incomplete!\n"); ctx->root_op = ctx->sdap_op; ctx->root_id_ctx = ctx->sd_ctx->ad_id_ctx; @@ -711,26 +711,26 @@ static void ad_subdomains_get_root_domain_done(struct tevent_req *req) if (ret != EOK) { 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 search the AD server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to search the AD server: [%d](%s)\n", + ret, strerror(ret)); } goto fail; } ret = ad_subdomains_refresh(ctx->sd_ctx, 1, reply, &has_changes); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ad_subdomains_refresh failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ad_subdomains_refresh failed.\n"); goto fail; } if (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 fail; } } @@ -739,7 +739,7 @@ static void ad_subdomains_get_root_domain_done(struct tevent_req *req) ctx->root_id_ctx = ads_get_root_id_ctx(ctx); if (ctx->root_id_ctx == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot create id ctx for the root domain\n")); + "Cannot create id ctx for the root domain\n"); ret = EFAULT; goto fail; } @@ -747,15 +747,15 @@ static void ad_subdomains_get_root_domain_done(struct tevent_req *req) ctx->root_op = sdap_id_op_create(ctx, ctx->root_id_ctx->ldap_ctx->conn_cache); if (ctx->root_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; } req = sdap_id_op_connect_send(ctx->root_op, 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 fail; } @@ -780,7 +780,7 @@ static struct ad_id_ctx *ads_get_root_id_ctx(struct ad_subdomains_req_ctx *ctx) ret = sysdb_attrs_get_string(ctx->root_domain, 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 NULL; } @@ -788,14 +788,14 @@ static struct ad_id_ctx *ads_get_root_id_ctx(struct ad_subdomains_req_ctx *ctx) root = find_subdomain_by_name(ctx->sd_ctx->be_ctx->domain, name, false); if (root == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not find the root domain\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not find the root domain\n"); return NULL; } sdom = sdap_domain_get(ctx->sd_ctx->ad_id_ctx->sdap_id_ctx->opts, root); if (sdom == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot get the sdom for %s!\n", root->name)); + "Cannot get the sdom for %s!\n", root->name); return NULL; } @@ -805,7 +805,7 @@ static struct ad_id_ctx *ads_get_root_id_ctx(struct ad_subdomains_req_ctx *ctx) root, &root_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"); return NULL; } sdom->pvt = root_id_ctx; @@ -829,12 +829,12 @@ static void ad_subdomains_root_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; @@ -877,7 +877,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; } @@ -920,14 +920,14 @@ static errno_t ad_subdomains_process(TALLOC_CTX *mem_ctx, for (i = 0; i < nsd; i++) { ret = sysdb_attrs_get_string(sd[i], AD_AT_TRUST_PARTNER, &sd_name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto fail; } if (strcasecmp(sd_name, domain->name) == 0) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Not including primary domain %s in the subdomain list\n", - domain->name)); + "Not including primary domain %s in the subdomain list\n", + domain->name); continue; } @@ -963,7 +963,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; } @@ -990,12 +990,12 @@ static void ad_subdomains_get_slave_domain_done(struct tevent_req *req) if (ret != EOK) { 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 search the AD server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to search the AD server: [%d](%s)\n", + ret, strerror(ret)); } tevent_req_error(req, ret); return; @@ -1009,7 +1009,7 @@ static void ad_subdomains_get_slave_domain_done(struct tevent_req *req) ctx->reply_count, ctx->reply, ctx->root_domain, &nsubdoms, &subdoms); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot process subdomain list\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot process subdomain list\n"); tevent_req_error(req, ret); return; } @@ -1018,17 +1018,17 @@ static void ad_subdomains_get_slave_domain_done(struct tevent_req *req) ret = ad_subdomains_refresh(ctx->sd_ctx, nsubdoms, subdoms, &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; } } @@ -1068,7 +1068,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; } @@ -1077,7 +1077,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; } @@ -1087,7 +1087,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"); } } @@ -1142,7 +1142,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; } @@ -1152,7 +1152,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; @@ -1161,25 +1161,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 */ } diff --git a/src/providers/ad/ad_sudo.c b/src/providers/ad/ad_sudo.c index b85c95c5c..53ce5af59 100644 --- a/src/providers/ad/ad_sudo.c +++ b/src/providers/ad/ad_sudo.c @@ -34,12 +34,12 @@ int ad_sudo_init(struct be_ctx *be_ctx, struct ad_options *ad_options; struct sdap_options *ldap_options; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing sudo AD back end\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing sudo AD back end\n"); ret = sdap_sudo_init(be_ctx, id_ctx->sdap_id_ctx, ops, pvt_data); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize LDAP SUDO [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize LDAP SUDO [%d]: %s\n", + ret, strerror(ret)); return ret; } diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index 4b4cb45ba..648ec58c0 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -179,12 +179,12 @@ static errno_t be_req_set_domain(struct be_req *be_req, const char *domain) dom = find_subdomain_by_name(be_req->be_ctx->domain, domain, true); if (dom == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown domain [%s]!\n", domain)); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown domain [%s]!\n", domain); return ERR_DOMAIN_NOT_FOUND; } - DEBUG(SSSDBG_TRACE_FUNC, ("Changing request domain from [%s] to [%s]\n", - be_req->domain->name, dom->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Changing request domain from [%s] to [%s]\n", + be_req->domain->name, dom->name); be_req->domain = dom; return EOK; @@ -213,11 +213,11 @@ void be_terminate_domain_requests(struct be_ctx *be_ctx, struct be_req *be_req; struct be_req *next_be_req; - DEBUG(SSSDBG_TRACE_FUNC, ("Terminating requests for domain [%s]\n", - domain)); + DEBUG(SSSDBG_TRACE_FUNC, "Terminating requests for domain [%s]\n", + domain); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("BUG: domain is NULL\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "BUG: domain is NULL\n"); return; } @@ -372,21 +372,21 @@ static errno_t be_queue_request(TALLOC_CTX *queue_mem_ctx, int ret; if (*req_queue == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("Queue is empty, " \ - "running request immediately.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Queue is empty, " \ + "running request immediately.\n"); ret = be_file_request(req_mem_ctx, be_req, fn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("be_file_request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "be_file_request failed.\n"); return ret; } } item = talloc_zero(queue_mem_ctx, struct bet_queue_item); if (item == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_zero failed, cannot add item to " \ - "request queue.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed, cannot add item to " \ + "request queue.\n"); } else { - DEBUG(SSSDBG_TRACE_ALL, ("Adding request to queue.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Adding request to queue.\n"); item->mem_ctx = req_mem_ctx; item->be_req = be_req; item->fn = fn; @@ -414,7 +414,7 @@ static void be_queue_next_request(struct be_req *be_req, enum bet_type type) req_queue = &be_req->becli->bectx->bet_info[type].req_queue; if (*req_queue == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("Queue is empty, nothing to do.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Queue is empty, nothing to do.\n"); return; } @@ -430,7 +430,7 @@ static void be_queue_next_request(struct be_req *be_req, enum bet_type type) } if (*req_queue == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("Request queue is empty.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Request queue is empty.\n"); return; } @@ -438,11 +438,11 @@ static void be_queue_next_request(struct be_req *be_req, enum bet_type type) ret = be_file_request((*req_queue)->mem_ctx, next_be_req, (*req_queue)->fn); if (ret == EOK) { - DEBUG(SSSDBG_TRACE_ALL, ("Queued request filed successfully.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Queued request filed successfully.\n"); return; } - DEBUG(SSSDBG_OP_FAILURE, ("be_file_request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "be_file_request failed.\n"); be_queue_next_request(next_be_req, type); @@ -463,14 +463,14 @@ static void be_queue_next_request(struct be_req *be_req, enum bet_type type) DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to generate dbus reply\n"); dbus_message_unref(reply); goto done; } dbus_conn = sbus_get_connection(next_be_req->becli->conn); if (dbus_conn == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); goto done; } dbus_connection_send(dbus_conn, reply, NULL); @@ -496,7 +496,7 @@ bool be_is_offline(struct be_ctx *ctx) void be_mark_offline(struct be_ctx *ctx) { - DEBUG(8, ("Going offline!\n")); + DEBUG(8, "Going offline!\n"); ctx->offstat.went_offline = time(NULL); ctx->offstat.offline = true; @@ -553,9 +553,9 @@ static void get_subdomains_callback(struct be_req *req, dbus_uint32_t err_min = 0; const char *err_msg = NULL; - DEBUG(SSSDBG_TRACE_FUNC, ("Backend returned: (%d, %d, %s) [%s]\n", + DEBUG(SSSDBG_TRACE_FUNC, "Backend returned: (%d, %d, %s) [%s]\n", dp_err_type, errnum, errstr?errstr:"<NULL>", - dp_pam_err_to_string(req, dp_err_type, errnum))); + dp_pam_err_to_string(req, dp_err_type, errnum)); be_queue_next_request(req, BET_SUBDOMAINS); @@ -575,7 +575,7 @@ static void get_subdomains_callback(struct be_req *req, } if (!err_msg) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to set err_msg, Out of memory?\n")); + "Failed to set err_msg, Out of memory?\n"); err_msg = "OOM"; } @@ -586,14 +586,14 @@ static void get_subdomains_callback(struct be_req *req, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to generate dbus reply\n"); dbus_message_unref(reply); goto done; } dbus_conn = sbus_get_connection(req->becli->conn); if (dbus_conn == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); goto done; } dbus_connection_send(dbus_conn, reply, NULL); @@ -632,7 +632,7 @@ static int be_get_subdomains(DBusMessage *message, struct sbus_connection *conn) DBUS_TYPE_STRING, &domain_hint, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(SSSDBG_CRIT_FAILURE,("Failed, to parse message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE,"Failed, to parse message!\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); return EIO; } @@ -642,7 +642,7 @@ static int be_get_subdomains(DBusMessage *message, struct sbus_connection *conn) /* return an error if corresponding backend target is not configured */ if (becli->bectx->bet_info[BET_SUBDOMAINS].bet_ops == NULL) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Undefined backend target.\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Undefined backend target.\n"); err_maj = DP_ERR_FATAL; err_min = ENODEV; err_msg = "Subdomains back end target is not configured"; @@ -650,13 +650,13 @@ static int be_get_subdomains(DBusMessage *message, struct sbus_connection *conn) } DEBUG(SSSDBG_TRACE_FUNC, - ("Got get subdomains [%sforced][%s]\n", force ? "" : "not ", - domain_hint == NULL ? "no hint": domain_hint )); + "Got get subdomains [%sforced][%s]\n", force ? "" : "not ", + domain_hint == NULL ? "no hint": domain_hint ); /* If we are offline return immediately */ if (becli->bectx->offstat.offline) { - DEBUG(SSSDBG_TRACE_FUNC, ("Cannot proceed, provider is offline.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Cannot proceed, provider is offline.\n"); err_maj = DP_ERR_OFFLINE; err_min = EAGAIN; err_msg = "Provider is offline"; @@ -718,14 +718,14 @@ immediate: DBUS_TYPE_STRING, &err_msg, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to generate dbus reply\n"); dbus_message_unref(reply); return EIO; } if (!(err_maj == DP_ERR_FATAL && err_min == ENODEV)) { - DEBUG(SSSDBG_TRACE_LIBS, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(SSSDBG_TRACE_LIBS, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); } /* send reply back */ @@ -764,7 +764,7 @@ static void acctinfo_callback(struct be_req *req, err_msg = dp_pam_err_to_string(req, dp_err_type, errnum); } if (!err_msg) { - DEBUG(1, ("Failed to set err_msg, Out of memory?\n")); + DEBUG(1, "Failed to set err_msg, Out of memory?\n"); err_msg = "OOM"; } @@ -774,21 +774,21 @@ static void acctinfo_callback(struct be_req *req, DBUS_TYPE_STRING, &err_msg, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(1, ("Failed to generate dbus reply\n")); + DEBUG(1, "Failed to generate dbus reply\n"); return; } dbus_conn = sbus_get_connection(req->becli->conn); if (!dbus_conn) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); return; } dbus_connection_send(dbus_conn, reply, NULL); dbus_message_unref(reply); - DEBUG(4, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(4, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); } /* finally free the request */ @@ -843,7 +843,7 @@ static void acctinfo_initgroups_callback(struct be_req *be_req, pr->orig_errstr = errstr; if (!be_req->be_ctx->nss_cli || !be_req->be_ctx->nss_cli->conn) { - DEBUG(SSSDBG_MINOR_FAILURE, ("NSS Service not conected\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "NSS Service not conected\n"); ret = EACCES; goto done; } @@ -854,7 +854,7 @@ static void acctinfo_initgroups_callback(struct be_req *be_req, DP_INTERFACE, DP_REV_METHOD_INITGR_CHECK); if (!msg) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory?!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory?!\n"); ret = ENOMEM; goto done; } @@ -867,7 +867,7 @@ static void acctinfo_initgroups_callback(struct be_req *be_req, &pr->groups, num, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory?!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory?!\n"); ret = ENOMEM; goto done; } @@ -877,8 +877,8 @@ static void acctinfo_initgroups_callback(struct be_req *be_req, acctinfo_callback_initgr_sbus, be_req, NULL); if (ret != EOK) { DEBUG(SSSDBG_TRACE_FUNC, - ("Error contacting NSS responder: %d [%s]\n", - ret, strerror(ret))); + "Error contacting NSS responder: %d [%s]\n", + ret, strerror(ret)); } done: @@ -965,7 +965,7 @@ be_file_account_request(struct be_req *be_req, struct be_acct_req *ar) if ((ar->entry_type & 0xFF) == BE_REQ_INITGROUPS) { ret = be_initgroups_prereq(be_req); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Prerequest failed")); + DEBUG(SSSDBG_CRIT_FAILURE, "Prerequest failed"); return ret; } } @@ -974,7 +974,7 @@ be_file_account_request(struct be_req *be_req, struct be_acct_req *ar) ret = be_file_request(be_ctx, be_req, be_ctx->bet_info[BET_ID].bet_ops->handler); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to file request")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to file request"); return ret; } @@ -1043,8 +1043,8 @@ be_get_account_info_send(TALLOC_CTX *mem_ctx, ret = be_req_set_domain(be_req, ar->domain); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to set request domain [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to set request domain [%d]: %s\n", + ret, sss_strerror(ret)); goto done; } @@ -1148,12 +1148,12 @@ static int be_get_account_info(DBusMessage *message, struct sbus_connection *con DBUS_TYPE_STRING, &domain, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(1,("Failed, to parse message!\n")); + DEBUG(1,"Failed, to parse message!\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); return EIO; } - DEBUG(4, ("Got request for [%u][%d][%s]\n", type, attr_type, filter)); + DEBUG(4, "Got request for [%u][%d][%s]\n", type, attr_type, filter); reply = dbus_message_new_method_return(message); if (!reply) return ENOMEM; @@ -1174,8 +1174,8 @@ static int be_get_account_info(DBusMessage *message, struct sbus_connection *con DBUS_TYPE_INVALID); if (!dbret) return EIO; - DEBUG(4, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(4, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); sbus_conn_send_reply(conn, reply); dbus_message_unref(reply); @@ -1199,8 +1199,8 @@ static int be_get_account_info(DBusMessage *message, struct sbus_connection *con ret = be_req_set_domain(be_req, domain); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to set request domain [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to set request domain [%d]: %s\n", + ret, sss_strerror(ret)); err_maj = DP_ERR_FATAL; err_min = ret; err_msg = sss_strerror(ret); @@ -1298,8 +1298,8 @@ done: DBUS_TYPE_INVALID); if (!dbret) return EIO; - DEBUG(4, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(4, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); /* send reply back */ sbus_conn_send_reply(conn, reply); @@ -1321,9 +1321,9 @@ static void be_pam_handler_callback(struct be_req *req, dbus_bool_t dbret; errno_t ret; - DEBUG(4, ("Backend returned: (%d, %d, %s) [%s]\n", + DEBUG(4, "Backend returned: (%d, %d, %s) [%s]\n", dp_err_type, errnum, errstr?errstr:"<NULL>", - dp_pam_err_to_string(req, dp_err_type, errnum))); + dp_pam_err_to_string(req, dp_err_type, errnum)); pd = talloc_get_type(be_req_get_data(req), struct pam_data); @@ -1333,8 +1333,8 @@ static void be_pam_handler_callback(struct be_req *req, dp_err_type == DP_ERR_OK) { if (!becli->bectx->bet_info[BET_SELINUX].bet_ops) { DEBUG(SSSDBG_TRACE_FUNC, - ("SELinux provider doesn't exist, " - "not sending the request to it.\n")); + "SELinux provider doesn't exist, " + "not sending the request to it.\n"); } else { req->phase = REQ_PHASE_SELINUX; @@ -1343,32 +1343,32 @@ static void be_pam_handler_callback(struct be_req *req, req, becli->bectx->bet_info[BET_SELINUX].bet_ops->handler); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("be_file_request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "be_file_request failed.\n"); goto done; } return; } } - DEBUG(4, ("Sending result [%d][%s]\n", pd->pam_status, pd->domain)); + DEBUG(4, "Sending result [%d][%s]\n", pd->pam_status, pd->domain); reply = (DBusMessage *)req->pvt; dbret = dp_pack_pam_response(reply, pd); if (!dbret) { - DEBUG(1, ("Failed to generate dbus reply\n")); + DEBUG(1, "Failed to generate dbus reply\n"); dbus_message_unref(reply); goto done; } dbus_conn = sbus_get_connection(req->becli->conn); if (!dbus_conn) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); goto done; } dbus_connection_send(dbus_conn, reply, NULL); dbus_message_unref(reply); - DEBUG(4, ("Sent result [%d][%s]\n", pd->pam_status, pd->domain)); + DEBUG(4, "Sent result [%d][%s]\n", pd->pam_status, pd->domain); done: talloc_free(req); @@ -1392,14 +1392,14 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) reply = dbus_message_new_method_return(message); if (!reply) { - DEBUG(1, ("dbus_message_new_method_return failed, cannot send reply.\n")); + DEBUG(1, "dbus_message_new_method_return failed, cannot send reply.\n"); return ENOMEM; } be_req = be_req_create(becli, becli, becli->bectx, be_pam_handler_callback, reply); if (!be_req) { - DEBUG(7, ("talloc_zero failed.\n")); + DEBUG(7, "talloc_zero failed.\n"); dbus_message_unref(reply); return ENOMEM; } @@ -1408,7 +1408,7 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) ret = dp_unpack_pam_request(message, be_req, &pd, &dbus_error); if (!ret) { - DEBUG(1,("Failed, to parse message!\n")); + DEBUG(1,"Failed, to parse message!\n"); talloc_free(be_req); return EIO; } @@ -1424,13 +1424,13 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) ret = be_req_set_domain(be_req, pd->domain); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to set request domain [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to set request domain [%d]: %s\n", + ret, sss_strerror(ret)); pd->pam_status = PAM_SYSTEM_ERR; goto done; } - DEBUG(4, ("Got request with the following data\n")); + DEBUG(4, "Got request with the following data\n"); DEBUG_PAM_DATA(4, pd); switch (pd->cmd) { @@ -1452,7 +1452,7 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) goto done; break; default: - DEBUG(7, ("Unsupported PAM command [%d].\n", pd->cmd)); + DEBUG(7, "Unsupported PAM command [%d].\n", pd->cmd); pd->pam_status = PAM_MODULE_UNKNOWN; goto done; } @@ -1461,7 +1461,7 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) * configured */ if (!becli->bectx->bet_info[target].bet_ops) { - DEBUG(7, ("Undefined backend target.\n")); + DEBUG(7, "Undefined backend target.\n"); pd->pam_status = PAM_MODULE_UNKNOWN; goto done; } @@ -1472,7 +1472,7 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) be_req, becli->bectx->bet_info[target].bet_ops->handler); if (ret != EOK) { - DEBUG(7, ("be_file_request failed.\n")); + DEBUG(7, "be_file_request failed.\n"); goto done; } @@ -1480,12 +1480,12 @@ static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn) done: - DEBUG(4, ("Sending result [%d][%s]\n", - pd->pam_status, pd->domain)); + DEBUG(4, "Sending result [%d][%s]\n", + pd->pam_status, pd->domain); ret = dp_pack_pam_response(reply, pd); if (!ret) { - DEBUG(1, ("Failed to generate dbus reply\n")); + DEBUG(1, "Failed to generate dbus reply\n"); talloc_free(be_req); dbus_message_unref(reply); return EIO; @@ -1521,16 +1521,16 @@ static void be_sudo_handler_reply(struct sbus_connection *conn, DBUS_TYPE_STRING, &err_msg, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to generate dbus reply\n"); return; } - DEBUG(SSSDBG_FUNC_DATA, ("SUDO Backend returned: (%d, %d, %s)\n", - dp_err, dp_ret, errstr ? errstr : "<NULL>")); + DEBUG(SSSDBG_FUNC_DATA, "SUDO Backend returned: (%d, %d, %s)\n", + dp_err, dp_ret, errstr ? errstr : "<NULL>"); dbus_conn = sbus_get_connection(conn); if (!dbus_conn) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); return; } @@ -1568,7 +1568,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) const char *err_msg = NULL; int i; - DEBUG(SSSDBG_TRACE_FUNC, ("Entering be_sudo_handler()\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Entering be_sudo_handler()\n"); user_data = sbus_conn_get_private_data(conn); if (user_data == NULL) { @@ -1583,7 +1583,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) reply = dbus_message_new_method_return(message); if (!reply) { DEBUG(SSSDBG_CRIT_FAILURE, - ("dbus_message_new_method_return failed, cannot send reply.\n")); + "dbus_message_new_method_return failed, cannot send reply.\n"); return ENOMEM; } @@ -1591,7 +1591,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) be_req = be_req_create(be_cli, be_cli, be_cli->bectx, be_sudo_handler_callback, reply); if (be_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); dbus_message_unref(reply); return ENOMEM; } @@ -1601,7 +1601,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) /* get type of the request */ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse the message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse the message!\n"); ret = EIO; err_msg = "Invalid D-Bus message format"; goto fail; @@ -1627,7 +1627,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) /* get and set sudo request data */ sudo_req = talloc_zero(be_req, struct be_sudo_req); if (sudo_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); goto fail; } @@ -1645,7 +1645,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) */ /* read rules_num */ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse the message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse the message!\n"); ret = EIO; err_msg = "Invalid D-Bus message format"; goto fail; @@ -1655,7 +1655,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) sudo_req->rules = talloc_array(sudo_req, char*, rules_num + 1); if (sudo_req->rules == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_array failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_array failed.\n"); ret = ENOMEM; goto fail; } @@ -1664,13 +1664,13 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) for (i = 0; i < rules_num; i++) { iter_next = dbus_message_iter_next(&iter); if (iter_next == FALSE) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse the message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse the message!\n"); ret = EIO; err_msg = "Invalid D-Bus message format"; goto fail; } if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse the message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse the message!\n"); ret = EIO; err_msg = "Invalid D-Bus message format"; goto fail; @@ -1679,7 +1679,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) dbus_message_iter_get_basic(&iter, &rule); sudo_req->rules[i] = talloc_strdup(sudo_req->rules, rule); if (sudo_req->rules[i] == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto fail; } @@ -1689,7 +1689,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid request type %d\n", sudo_req->type)); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid request type %d\n", sudo_req->type); ret = EINVAL; err_msg = "Invalid DP request type"; goto fail; @@ -1699,7 +1699,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) /* return an error if corresponding backend target is not configured */ if (!be_cli->bectx->bet_info[BET_SUDO].bet_ops) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Undefined backend target.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Undefined backend target.\n"); ret = ENODEV; goto fail; } @@ -1708,7 +1708,7 @@ static int be_sudo_handler(DBusMessage *message, struct sbus_connection *conn) be_req, be_cli->bectx->bet_info[BET_SUDO].bet_ops->handler); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_file_request failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "be_file_request failed.\n"); err_msg = "Cannot file back end request"; goto fail; } @@ -1744,17 +1744,17 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) dbus_uint32_t err_min; const char *err_msg; - DEBUG(SSSDBG_TRACE_FUNC, ("Entering be_autofs_handler()\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Entering be_autofs_handler()\n"); user_data = sbus_conn_get_private_data(conn); if (user_data == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot get SBUS private data\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get SBUS private data\n"); return EINVAL; } be_cli = talloc_get_type(user_data, struct be_client); if (be_cli == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot get back end client context\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get back end client context\n"); return EINVAL; } @@ -1765,7 +1765,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) DBUS_TYPE_STRING, &filter, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse message!\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); return EIO; } @@ -1773,7 +1773,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) reply = dbus_message_new_method_return(message); if (!reply) { DEBUG(SSSDBG_CRIT_FAILURE, - ("dbus_message_new_method_return failed, cannot send reply.\n")); + "dbus_message_new_method_return failed, cannot send reply.\n"); return ENOMEM; } @@ -1793,8 +1793,8 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) DBUS_TYPE_INVALID); if (!dbret) return EIO; - DEBUG(SSSDBG_TRACE_LIBS, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(SSSDBG_TRACE_LIBS, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); sbus_conn_send_reply(conn, reply); dbus_message_unref(reply); @@ -1827,7 +1827,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) be_req = be_req_create(be_cli, be_cli, be_cli->bectx, be_autofs_handler_callback, reply); if (be_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); err_maj = DP_ERR_FATAL; err_min = ENOMEM; err_msg = "Out of memory"; @@ -1837,7 +1837,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) /* set autofs request data */ be_autofs_req = talloc_zero(be_req, struct be_autofs_req); if (be_autofs_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); err_maj = DP_ERR_FATAL; err_min = ENOMEM; err_msg = "Out of memory"; @@ -1846,7 +1846,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) be_autofs_req->mapname = talloc_strdup(be_autofs_req, filter_val); if (be_autofs_req->mapname == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed.\n"); err_maj = DP_ERR_FATAL; err_min = ENOMEM; err_msg = "Out of memory"; @@ -1863,7 +1863,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) be_req->req_data = be_autofs_req; if (!be_cli->bectx->bet_info[BET_AUTOFS].bet_ops) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Undefined backend target.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Undefined backend target.\n"); err_maj = DP_ERR_FATAL; err_min = ENODEV; err_msg = "Autofs back end target is not configured"; @@ -1874,7 +1874,7 @@ static int be_autofs_handler(DBusMessage *message, struct sbus_connection *conn) be_req, be_cli->bectx->bet_info[BET_AUTOFS].bet_ops->handler); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_file_request failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "be_file_request failed.\n"); err_maj = DP_ERR_FATAL; err_min = ENODEV; err_msg = "Cannot file back end request"; @@ -1896,8 +1896,8 @@ done: DBUS_TYPE_INVALID); if (!dbret) return EIO; - DEBUG(SSSDBG_TRACE_LIBS, ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + DEBUG(SSSDBG_TRACE_LIBS, "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); /* send reply back */ sbus_conn_send_reply(conn, reply); @@ -1936,7 +1936,7 @@ static void be_autofs_handler_callback(struct be_req *req, } if (!err_msg) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to set err_msg, Out of memory?\n")); + "Failed to set err_msg, Out of memory?\n"); err_msg = "OOM"; } @@ -1946,13 +1946,13 @@ static void be_autofs_handler_callback(struct be_req *req, DBUS_TYPE_STRING, &err_msg, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to generate dbus reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to generate dbus reply\n"); return; } dbus_conn = sbus_get_connection(req->becli->conn); if (!dbus_conn) { - DEBUG(SSSDBG_CRIT_FAILURE, ("D-BUS not connected\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "D-BUS not connected\n"); return; } @@ -1960,8 +1960,8 @@ static void be_autofs_handler_callback(struct be_req *req, dbus_message_unref(reply); DEBUG(SSSDBG_TRACE_LIBS, - ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); } /* finally free the request */ @@ -1998,13 +1998,13 @@ static int be_host_handler(DBusMessage *message, struct sbus_connection *conn) DBUS_TYPE_STRING, &filter, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed, to parse message!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed, to parse message!\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); return EIO; } DEBUG(SSSDBG_TRACE_LIBS, - ("Got request for [%u][%s]\n", flags, filter)); + "Got request for [%u][%s]\n", flags, filter); reply = dbus_message_new_method_return(message); if (!reply) return ENOMEM; @@ -2026,8 +2026,8 @@ static int be_host_handler(DBusMessage *message, struct sbus_connection *conn) if (!dbret) return EIO; DEBUG(SSSDBG_TRACE_LIBS, - ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); sbus_conn_send_reply(conn, reply); dbus_message_unref(reply); @@ -2085,7 +2085,7 @@ static int be_host_handler(DBusMessage *message, struct sbus_connection *conn) /* process request */ if (!becli->bectx->bet_info[BET_HOSTID].bet_ops) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Undefined backend target.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Undefined backend target.\n"); err_maj = DP_ERR_FATAL; err_min = ENODEV; err_msg = "HostID back end target is not configured"; @@ -2118,8 +2118,8 @@ done: if (!dbret) return EIO; DEBUG(SSSDBG_TRACE_LIBS, - ("Request processed. Returned %d,%d,%s\n", - err_maj, err_min, err_msg)); + "Request processed. Returned %d,%d,%s\n", + err_maj, err_min, err_msg); /* send reply back */ sbus_conn_send_reply(conn, reply); @@ -2134,25 +2134,25 @@ static int be_client_destructor(void *ctx) struct be_client *becli = talloc_get_type(ctx, struct be_client); if (becli->bectx) { if (becli->bectx->nss_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed NSS client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed NSS client\n"); becli->bectx->nss_cli = NULL; } else if (becli->bectx->pam_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed PAM client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed PAM client\n"); becli->bectx->pam_cli = NULL; } else if (becli->bectx->sudo_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed SUDO client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed SUDO client\n"); becli->bectx->sudo_cli = NULL; } else if (becli->bectx->autofs_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed autofs client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed autofs client\n"); becli->bectx->autofs_cli = NULL; } else if (becli->bectx->ssh_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed SSH client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed SSH client\n"); becli->bectx->ssh_cli = NULL; } else if (becli->bectx->pac_cli == becli) { - DEBUG(SSSDBG_TRACE_FUNC, ("Removed PAC client\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Removed PAC client\n"); becli->bectx->pac_cli = NULL; } else { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown client removed ...\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown client removed ...\n"); } } return 0; @@ -2173,12 +2173,12 @@ static int client_registration(DBusMessage *message, data = sbus_conn_get_private_data(conn); becli = talloc_get_type(data, struct be_client); if (!becli) { - DEBUG(0, ("Connection holds no valid init data\n")); + DEBUG(0, "Connection holds no valid init data\n"); return EINVAL; } /* First thing, cancel the timeout */ - DEBUG(4, ("Cancel DP ID timeout [%p]\n", becli->timeout)); + DEBUG(4, "Cancel DP ID timeout [%p]\n", becli->timeout); talloc_zfree(becli->timeout); dbus_error_init(&dbus_error); @@ -2188,7 +2188,7 @@ static int client_registration(DBusMessage *message, DBUS_TYPE_STRING, &cli_name, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(1, ("Failed to parse message, killing connection\n")); + DEBUG(1, "Failed to parse message, killing connection\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); sbus_disconnect(conn); /* FIXME: should we just talloc_zfree(conn) ? */ @@ -2208,16 +2208,16 @@ static int client_registration(DBusMessage *message, } else if (strcasecmp(cli_name, "PAC") == 0) { becli->bectx->pac_cli = becli; } else { - DEBUG(1, ("Unknown client! [%s]\n", cli_name)); + DEBUG(1, "Unknown client! [%s]\n", cli_name); } talloc_set_destructor((TALLOC_CTX *)becli, be_client_destructor); - DEBUG(4, ("Added Frontend client [%s]\n", cli_name)); + DEBUG(4, "Added Frontend client [%s]\n", cli_name); /* reply that all is ok */ reply = dbus_message_new_method_return(message); if (!reply) { - DEBUG(0, ("Dbus Out of memory!\n")); + DEBUG(0, "Dbus Out of memory!\n"); return ENOMEM; } @@ -2225,7 +2225,7 @@ static int client_registration(DBusMessage *message, DBUS_TYPE_UINT16, &version, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(0, ("Failed to build dbus reply\n")); + DEBUG(0, "Failed to build dbus reply\n"); dbus_message_unref(reply); sbus_disconnect(conn); return EIO; @@ -2249,7 +2249,7 @@ static errno_t be_file_check_online_request(struct be_req *req) ret = be_file_request(req->be_ctx, req, req->be_ctx->bet_info[BET_ID].bet_ops->check_online); if (ret != EOK) { - DEBUG(1, ("be_file_request failed.\n")); + DEBUG(1, "be_file_request failed.\n"); } return ret; @@ -2260,16 +2260,16 @@ static void check_online_callback(struct be_req *req, int dp_err_type, { int ret; - DEBUG(4, ("Backend returned: (%d, %d, %s) [%s]\n", + DEBUG(4, "Backend returned: (%d, %d, %s) [%s]\n", dp_err_type, errnum, errstr?errstr:"<NULL>", - dp_pam_err_to_string(req, dp_err_type, errnum))); + dp_pam_err_to_string(req, dp_err_type, errnum)); req->be_ctx->check_online_ref_count--; if (dp_err_type != DP_ERR_OK && req->be_ctx->check_online_ref_count > 0) { ret = be_file_check_online_request(req); if (ret != EOK) { - DEBUG(1, ("be_file_check_online_request failed.\n")); + DEBUG(1, "be_file_check_online_request failed.\n"); goto done; } return; @@ -2297,37 +2297,37 @@ static void check_if_online(struct be_ctx *ctx) be_run_unconditional_online_cb(ctx); if (ctx->offstat.offline == false) { - DEBUG(8, ("Backend is already online, nothing to do.\n")); + DEBUG(8, "Backend is already online, nothing to do.\n"); return; } /* Make sure nobody tries to go online while we are checking */ ctx->offstat.went_offline = time(NULL); - DEBUG(8, ("Trying to go back online!\n")); + DEBUG(8, "Trying to go back online!\n"); ctx->check_online_ref_count++; if (ctx->check_online_ref_count != 1) { - DEBUG(8, ("There is an online check already running.\n")); + DEBUG(8, "There is an online check already running.\n"); return; } if (ctx->bet_info[BET_ID].bet_ops->check_online == NULL) { - DEBUG(8, ("ID providers does not provide a check_online method.\n")); + DEBUG(8, "ID providers does not provide a check_online method.\n"); goto failed; } be_req = be_req_create(ctx, NULL, ctx, check_online_callback, NULL); if (be_req == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); goto failed; } ret = be_file_check_online_request(be_req); if (ret != EOK) { - DEBUG(1, ("be_file_check_online_request failed.\n")); + DEBUG(1, "be_file_check_online_request failed.\n"); goto failed; } @@ -2335,7 +2335,7 @@ static void check_if_online(struct be_ctx *ctx) failed: ctx->check_online_ref_count--; - DEBUG(1, ("Failed to run a check_online test.\n")); + DEBUG(1, "Failed to run a check_online test.\n"); talloc_free(be_req); @@ -2353,7 +2353,7 @@ static void init_timeout(struct tevent_context *ev, { struct be_client *becli; - DEBUG(2, ("Client timed out before Identification [%p]!\n", te)); + DEBUG(2, "Client timed out before Identification [%p]!\n", te); becli = talloc_get_type(ptr, struct be_client); @@ -2374,7 +2374,7 @@ static int be_client_init(struct sbus_connection *conn, void *data) becli = talloc(conn, struct be_client); if (!becli) { - DEBUG(0,("Out of memory?!\n")); + DEBUG(0,"Out of memory?!\n"); talloc_zfree(conn); return ENOMEM; } @@ -2388,11 +2388,11 @@ static int be_client_init(struct sbus_connection *conn, void *data) becli->timeout = tevent_add_timer(bectx->ev, becli, tv, init_timeout, becli); if (!becli->timeout) { - DEBUG(0,("Out of memory?!\n")); + DEBUG(0,"Out of memory?!\n"); talloc_zfree(conn); return ENOMEM; } - DEBUG(4, ("Set-up Backend ID timeout [%p]\n", becli->timeout)); + DEBUG(4, "Set-up Backend ID timeout [%p]\n", becli->timeout); /* Attach the client context to the connection context, so that it is * always available when we need to manage the connection. */ @@ -2411,7 +2411,7 @@ static int be_srv_init(struct be_ctx *ctx) /* Set up SBUS connection to the monitor */ ret = dp_get_sbus_address(ctx, &sbus_address, ctx->domain->name); if (ret != EOK) { - DEBUG(0, ("Could not get sbus backend address.\n")); + DEBUG(0, "Could not get sbus backend address.\n"); return ret; } @@ -2419,7 +2419,7 @@ static int be_srv_init(struct be_ctx *ctx) &be_interface, true, &ctx->sbus_srv, be_client_init, ctx); if (ret != EOK) { - DEBUG(0, ("Could not set up sbus server.\n")); + DEBUG(0, "Could not set up sbus server.\n"); return ret; } @@ -2430,7 +2430,7 @@ static void be_target_access_permit(struct be_req *be_req) { struct pam_data *pd = talloc_get_type(be_req_get_data(be_req), struct pam_data); - DEBUG(9, ("be_target_access_permit called, returning PAM_SUCCESS.\n")); + DEBUG(9, "be_target_access_permit called, returning PAM_SUCCESS.\n"); pd->pam_status = PAM_SUCCESS; be_req_terminate(be_req, DP_ERR_OK, PAM_SUCCESS, NULL); @@ -2446,7 +2446,7 @@ static void be_target_access_deny(struct be_req *be_req) { struct pam_data *pd = talloc_get_type(be_req_get_data(be_req), struct pam_data); - DEBUG(9, ("be_target_access_deny called, returning PAM_PERM_DENIED.\n")); + DEBUG(9, "be_target_access_deny called, returning PAM_PERM_DENIED.\n"); pd->pam_status = PAM_PERM_DENIED; be_req_terminate(be_req, DP_ERR_OK, PAM_PERM_DENIED, NULL); @@ -2480,13 +2480,13 @@ static int load_backend_module(struct be_ctx *ctx, if (bet_type <= BET_NULL || bet_type >= BET_MAX || bet_type != bet_data[bet_type].bet_type) { - DEBUG(2, ("invalid bet_type or bet_data corrupted.\n")); + DEBUG(2, "invalid bet_type or bet_data corrupted.\n"); return EINVAL; } tmp_ctx = talloc_new(ctx); if (!tmp_ctx) { - DEBUG(7, ("talloc_new failed.\n")); + DEBUG(7, "talloc_new failed.\n"); return ENOMEM; } @@ -2499,8 +2499,8 @@ static int load_backend_module(struct be_ctx *ctx, } if (!mod_name) { if (default_mod_name != NULL) { - DEBUG(5, ("no module name found in confdb, using [%s].\n", - default_mod_name)); + DEBUG(5, "no module name found in confdb, using [%s].\n", + default_mod_name); mod_name = talloc_strdup(ctx, default_mod_name); } else { ret = ENOENT; @@ -2536,7 +2536,7 @@ static int load_backend_module(struct be_ctx *ctx, bet_data[bet_type].mod_init_fn_name_fmt, mod_name); if (mod_init_fn_name == NULL) { - DEBUG(7, ("talloc_asprintf failed\n")); + DEBUG(7, "talloc_asprintf failed\n"); ret = ENOMEM; goto done; } @@ -2546,14 +2546,14 @@ static int load_backend_module(struct be_ctx *ctx, while(ctx->loaded_be[lb].be_name != NULL) { if (strncmp(ctx->loaded_be[lb].be_name, mod_name, strlen(mod_name)) == 0) { - DEBUG(7, ("Backend [%s] already loaded.\n", mod_name)); + DEBUG(7, "Backend [%s] already loaded.\n", mod_name); already_loaded = true; break; } ++lb; if (lb >= BET_MAX) { - DEBUG(2, ("Backend context corrupted.\n")); + DEBUG(2, "Backend context corrupted.\n"); ret = EINVAL; goto done; } @@ -2567,11 +2567,11 @@ static int load_backend_module(struct be_ctx *ctx, goto done; } - DEBUG(7, ("Loading backend [%s] with path [%s].\n", mod_name, path)); + DEBUG(7, "Loading backend [%s] with path [%s].\n", mod_name, path); handle = dlopen(path, RTLD_NOW); if (!handle) { - DEBUG(0, ("Unable to load %s module with path (%s), error: %s\n", - mod_name, path, dlerror())); + DEBUG(0, "Unable to load %s module with path (%s), error: %s\n", + mod_name, path, dlerror()); ret = ELIBACC; goto done; } @@ -2590,8 +2590,8 @@ static int load_backend_module(struct be_ctx *ctx, * handle the different types of error conditions. */ ret = ENOENT; } else { - DEBUG(0, ("Unable to load init fn %s from module %s, error: %s\n", - mod_init_fn_name, mod_name, dlerror())); + DEBUG(0, "Unable to load init fn %s from module %s, error: %s\n", + mod_init_fn_name, mod_name, dlerror()); ret = ELIBBAD; } goto done; @@ -2599,8 +2599,8 @@ static int load_backend_module(struct be_ctx *ctx, ret = mod_init_fn(ctx, &(*bet_info).bet_ops, &(*bet_info).pvt_bet_data); if (ret != EOK) { - DEBUG(0, ("Error (%d) in module (%s) initialization (%s)!\n", - ret, mod_name, mod_init_fn_name)); + DEBUG(0, "Error (%d) in module (%s) initialization (%s)!\n", + ret, mod_name, mod_init_fn_name); goto done; } @@ -2635,7 +2635,7 @@ int be_process_init_sudo(struct be_ctx *be_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; } @@ -2643,8 +2643,8 @@ int be_process_init_sudo(struct be_ctx *be_ctx) CONFDB_MONITOR_CONF_ENTRY, CONFDB_MONITOR_ACTIVE_SERVICES, &services); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Unable to read from confdb [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_FATAL_FAILURE, "Unable to read from confdb [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -2658,15 +2658,15 @@ int be_process_init_sudo(struct be_ctx *be_ctx) ret = confdb_get_string(be_ctx->cdb, tmp_ctx, be_ctx->conf_path, CONFDB_DOMAIN_SUDO_PROVIDER, NULL, &provider); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Unable to read from confdb [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_FATAL_FAILURE, "Unable to read from confdb [%d]: %s\n", + ret, strerror(ret)); goto done; } if (!responder_enabled && provider == NULL) { /* provider is not set explicitly */ DEBUG(SSSDBG_TRACE_FUNC, - ("SUDO is not listed in services, disabling SUDO module.\n")); + "SUDO is not listed in services, disabling SUDO module.\n"); ret = ENOENT; goto done; } @@ -2674,8 +2674,8 @@ int be_process_init_sudo(struct be_ctx *be_ctx) if (!responder_enabled && provider != NULL && strcmp(provider, NO_PROVIDER) != 0) { /* provider is set but responder is disabled */ - DEBUG(SSSDBG_MINOR_FAILURE, ("SUDO provider is set, but it is not " - "listed in active services. SUDO support will not work!\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "SUDO provider is set, but it is not " + "listed in active services. SUDO support will not work!\n"); } ret = load_backend_module(be_ctx, BET_SUDO, &be_ctx->bet_info[BET_SUDO], @@ -2697,7 +2697,7 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx = talloc_zero(mem_ctx, struct be_ctx); if (!ctx) { - DEBUG(0, ("fatal error initializing be_ctx\n")); + DEBUG(0, "fatal error initializing be_ctx\n"); return ENOMEM; } ctx->ev = ev; @@ -2705,7 +2705,7 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx->identity = talloc_asprintf(ctx, "%%BE_%s", be_domain); ctx->conf_path = talloc_asprintf(ctx, CONFDB_DOMAIN_PATH_TMPL, be_domain); if (!ctx->identity || !ctx->conf_path) { - DEBUG(0, ("Out of memory!?\n")); + DEBUG(0, "Out of memory!?\n"); ret = ENOMEM; goto fail; } @@ -2713,13 +2713,13 @@ int be_process_init(TALLOC_CTX *mem_ctx, ret = be_init_failover(ctx); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing failover context\n")); + "fatal error initializing failover context\n"); goto fail; } ret = sssd_domain_init(ctx, cdb, be_domain, DB_PATH, &ctx->domain); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("fatal error opening cache database\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "fatal error opening cache database\n"); goto fail; } @@ -2728,7 +2728,7 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx, &ctx->mon_conn); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error setting up monitor bus\n")); + "fatal error setting up monitor bus\n"); goto fail; } @@ -2738,21 +2738,21 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx->domain->name, &ctx->domain->names); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error setting fully qualified name format for %s\n", - ctx->domain->name)); + "fatal error setting fully qualified name format for %s\n", + ctx->domain->name); goto fail; } ret = be_srv_init(ctx); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("fatal error setting up server bus\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "fatal error setting up server bus\n"); goto fail; } /* Initialize be_refresh periodic task. */ ctx->refresh_ctx = be_refresh_ctx_init(ctx); if (ctx->refresh_ctx == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Unable to initialize refresh_ctx\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Unable to initialize refresh_ctx\n"); ret = ENOMEM; goto fail; } @@ -2765,7 +2765,7 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx->refresh_ctx, "Refresh Records", NULL); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Unable to initialize refresh periodic task\n")); + "Unable to initialize refresh periodic task\n"); goto fail; } } @@ -2774,12 +2774,12 @@ int be_process_init(TALLOC_CTX *mem_ctx, &ctx->bet_info[BET_ID], NULL); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("ID backend target successfully loaded from provider [%s].\n", - ctx->bet_info[BET_ID].mod_name)); + "ID backend target successfully loaded from provider [%s].\n", + ctx->bet_info[BET_ID].mod_name); ret = load_backend_module(ctx, BET_AUTH, &ctx->bet_info[BET_AUTH], @@ -2787,28 +2787,28 @@ int be_process_init(TALLOC_CTX *mem_ctx, if (ret != EOK) { if (ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_MINOR_FAILURE, - ("No authentication module provided for [%s] !!\n", - be_domain)); + "No authentication module provided for [%s] !!\n", + be_domain); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("AUTH backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_AUTH].mod_name)); + "AUTH backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_AUTH].mod_name); } ret = load_backend_module(ctx, BET_ACCESS, &ctx->bet_info[BET_ACCESS], ACCESS_PERMIT); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to setup ACCESS backend.\n")); + "Failed to setup ACCESS backend.\n"); goto fail; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("ACCESS backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_ACCESS].mod_name)); + "ACCESS backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_ACCESS].mod_name); ret = load_backend_module(ctx, BET_CHPASS, &ctx->bet_info[BET_CHPASS], @@ -2816,31 +2816,31 @@ int be_process_init(TALLOC_CTX *mem_ctx, if (ret != EOK) { if (ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_MINOR_FAILURE, - ("No change password module provided for [%s] !!\n", - be_domain)); + "No change password module provided for [%s] !!\n", + be_domain); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("CHPASS backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_CHPASS].mod_name)); + "CHPASS backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_CHPASS].mod_name); } ret = be_process_init_sudo(ctx); if (ret != EOK) { if (ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_MINOR_FAILURE, - ("No SUDO module provided for [%s] !!\n", be_domain)); + "No SUDO module provided for [%s] !!\n", be_domain); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("SUDO backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_SUDO].mod_name)); + "SUDO backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_SUDO].mod_name); } ret = load_backend_module(ctx, BET_AUTOFS, @@ -2849,15 +2849,15 @@ int be_process_init(TALLOC_CTX *mem_ctx, if (ret != EOK) { if (ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_MINOR_FAILURE, - ("No autofs module provided for [%s] !!\n", be_domain)); + "No autofs module provided for [%s] !!\n", be_domain); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("autofs backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_AUTOFS].mod_name)); + "autofs backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_AUTOFS].mod_name); } ret = load_backend_module(ctx, BET_SELINUX, @@ -2865,14 +2865,14 @@ int be_process_init(TALLOC_CTX *mem_ctx, ctx->bet_info[BET_ID].mod_name); if (ret != EOK) { if (ret != ENOENT) { - DEBUG(SSSDBG_FATAL_FAILURE, ("fatal error initializing data providers\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "fatal error initializing data providers\n"); goto fail; } - DEBUG(SSSDBG_CRIT_FAILURE, ("No selinux module provided for [%s] !!\n", - be_domain)); + DEBUG(SSSDBG_CRIT_FAILURE, "No selinux module provided for [%s] !!\n", + be_domain); } else { - DEBUG(SSSDBG_TRACE_ALL, ("selinux backend target successfully loaded " - "from provider [%s].\n", ctx->bet_info[BET_SELINUX].mod_name)); + DEBUG(SSSDBG_TRACE_ALL, "selinux backend target successfully loaded " + "from provider [%s].\n", ctx->bet_info[BET_SELINUX].mod_name); } ret = load_backend_module(ctx, BET_HOSTID, @@ -2881,26 +2881,26 @@ int be_process_init(TALLOC_CTX *mem_ctx, if (ret != EOK) { if (ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing data providers\n")); + "fatal error initializing data providers\n"); goto fail; } DEBUG(SSSDBG_CRIT_FAILURE, - ("No host info module provided for [%s] !!\n", be_domain)); + "No host info module provided for [%s] !!\n", be_domain); } else { DEBUG(SSSDBG_TRACE_ALL, - ("HOST backend target successfully loaded from provider [%s].\n", - ctx->bet_info[BET_HOSTID].mod_name)); + "HOST backend target successfully loaded from provider [%s].\n", + ctx->bet_info[BET_HOSTID].mod_name); } ret = load_backend_module(ctx, BET_SUBDOMAINS, &ctx->bet_info[BET_SUBDOMAINS], ctx->bet_info[BET_ID].mod_name); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Subdomains are not supported for [%s] !!\n", be_domain)); + DEBUG(SSSDBG_CRIT_FAILURE, "Subdomains are not supported for [%s] !!\n", be_domain); } else { - DEBUG(SSSDBG_TRACE_ALL, ("Get-Subdomains backend target successfully loaded " + DEBUG(SSSDBG_TRACE_ALL, "Get-Subdomains backend target successfully loaded " "from provider [%s].\n", - ctx->bet_info[BET_SUBDOMAINS].mod_name)); + ctx->bet_info[BET_SUBDOMAINS].mod_name); } /* Handle SIGUSR1 to force offline behavior */ @@ -2974,14 +2974,14 @@ int main(int argc, const char *argv[]) ret = server_setup(srv_name, 0, confdb_path, &main_ctx); if (ret != EOK) { - DEBUG(0, ("Could not set up mainloop [%d]\n", ret)); + DEBUG(0, "Could not set up mainloop [%d]\n", ret); return 2; } ret = die_if_parent_died(); if (ret != EOK) { /* This is not fatal, don't return */ - DEBUG(2, ("Could not set up to exit when parent process does\n")); + DEBUG(2, "Could not set up to exit when parent process does\n"); } ret = be_process_init(main_ctx, @@ -2989,11 +2989,11 @@ int main(int argc, const char *argv[]) main_ctx->event_ctx, main_ctx->confdb_ctx); if (ret != EOK) { - DEBUG(0, ("Could not initialize backend [%d]\n", ret)); + DEBUG(0, "Could not initialize backend [%d]\n", ret); return 3; } - DEBUG(SSSDBG_TRACE_FUNC, ("Backend provider (%s) started!\n", be_domain)); + DEBUG(SSSDBG_TRACE_FUNC, "Backend provider (%s) started!\n", be_domain); /* loop on main */ server_loop(main_ctx); diff --git a/src/providers/data_provider_callbacks.c b/src/providers/data_provider_callbacks.c index cc50be6df..d765acf70 100644 --- a/src/providers/data_provider_callbacks.c +++ b/src/providers/data_provider_callbacks.c @@ -104,7 +104,7 @@ static void be_run_cb_step(struct tevent_context *ev, struct tevent_timer *te, be_run_cb_step, cb_ctx); if (!tev) { - DEBUG(0, ("Out of memory. Could not invoke callbacks\n")); + DEBUG(0, "Out of memory. Could not invoke callbacks\n"); goto final; } return; @@ -130,7 +130,7 @@ static errno_t be_run_cb(struct be_ctx *be, struct be_cb *cb_list) cb_ctx = talloc(be, struct be_cb_ctx); if (!cb_ctx) { - DEBUG(0, ("Out of memory. Could not invoke callbacks\n")); + DEBUG(0, "Out of memory. Could not invoke callbacks\n"); return ENOMEM; } cb_ctx->be = be; @@ -142,7 +142,7 @@ static errno_t be_run_cb(struct be_ctx *be, struct be_cb *cb_list) be_run_cb_step, cb_ctx); if (!te) { - DEBUG(0, ("Out of memory. Could not invoke callbacks\n")); + DEBUG(0, "Out of memory. Could not invoke callbacks\n"); talloc_free(cb_ctx); return ENOMEM; } @@ -157,7 +157,7 @@ int be_add_reconnect_cb(TALLOC_CTX *mem_ctx, struct be_ctx *ctx, be_callback_t c ret = be_add_cb(mem_ctx, ctx, cb, pvt, &ctx->reconnect_cb_list, reconnect_cb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_add_cb failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "be_add_cb failed.\n"); return ret; } @@ -170,7 +170,7 @@ void be_run_reconnect_cb(struct be_ctx *be) struct be_cb *next_cb; if (callback) { - DEBUG(SSSDBG_TRACE_FUNC, ("Reconnecting. Running callbacks.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Reconnecting. Running callbacks.\n"); /** * Call the callback: we have to call this right away @@ -185,7 +185,7 @@ void be_run_reconnect_cb(struct be_ctx *be) callback = next_cb; } while(callback != NULL); } else { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Reconnect call back list is empty, nothing to do.\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Reconnect call back list is empty, nothing to do.\n"); } } @@ -196,7 +196,7 @@ int be_add_online_cb(TALLOC_CTX *mem_ctx, struct be_ctx *ctx, be_callback_t cb, ret = be_add_cb(mem_ctx, ctx, cb, pvt, &ctx->online_cb_list, online_cb); if (ret != EOK) { - DEBUG(1, ("be_add_cb failed.\n")); + DEBUG(1, "be_add_cb failed.\n"); return ret; } @@ -218,15 +218,15 @@ void be_run_online_cb(struct be_ctx *be) { be->run_online_cb = false; if (be->online_cb_list) { - DEBUG(3, ("Going online. Running callbacks.\n")); + DEBUG(3, "Going online. Running callbacks.\n"); ret = be_run_cb(be, be->online_cb_list); if (ret != EOK) { - DEBUG(1, ("be_run_cb failed.\n")); + DEBUG(1, "be_run_cb failed.\n"); } } else { - DEBUG(9, ("Online call back list is empty, nothing to do.\n")); + DEBUG(9, "Online call back list is empty, nothing to do.\n"); } } } @@ -244,17 +244,17 @@ void be_run_unconditional_online_cb(struct be_ctx *be) int ret; if (be->unconditional_online_cb_list) { - DEBUG(SSSDBG_TRACE_FUNC, ("Running unconditional online callbacks.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Running unconditional online callbacks.\n"); ret = be_run_cb(be, be->unconditional_online_cb_list); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("be_run_cb failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "be_run_cb failed.\n"); } } else { DEBUG(SSSDBG_TRACE_ALL, - ("List of unconditional online callbacks is empty, " \ - "nothing to do.\n")); + "List of unconditional online callbacks is empty, " \ + "nothing to do.\n"); } } @@ -268,14 +268,14 @@ void be_run_offline_cb(struct be_ctx *be) { int ret; if (be->offline_cb_list) { - DEBUG(3, ("Going offline. Running callbacks.\n")); + DEBUG(3, "Going offline. Running callbacks.\n"); ret = be_run_cb(be, be->offline_cb_list); if (ret != EOK) { - DEBUG(1, ("be_run_cb failed.\n")); + DEBUG(1, "be_run_cb failed.\n"); } } else { - DEBUG(9, ("Offline call back list is empty, nothing to do.\n")); + DEBUG(9, "Offline call back list is empty, nothing to do.\n"); } } diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c index 23a605ea6..aee289dcf 100644 --- a/src/providers/data_provider_fo.c +++ b/src/providers/data_provider_fo.c @@ -93,7 +93,7 @@ int be_init_failover(struct be_ctx *ctx) ret = be_res_init(ctx); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("fatal error initializing resolver context\n")); + "fatal error initializing resolver context\n"); talloc_zfree(ctx->be_fo); return ret; } @@ -159,7 +159,7 @@ int be_fo_add_service(struct be_ctx *ctx, const char *service_name, svc = be_fo_find_svc_data(ctx, service_name); if (svc) { - DEBUG(6, ("Failover service already initialized!\n")); + DEBUG(6, "Failover service already initialized!\n"); /* we already have a service up and configured, * can happen when using both id and auth provider */ @@ -171,7 +171,7 @@ int be_fo_add_service(struct be_ctx *ctx, const char *service_name, ret = fo_new_service(ctx->be_fo->fo_ctx, service_name, user_data_cmp, &service); if (ret != EOK && ret != EEXIST) { - DEBUG(1, ("Failed to create failover service!\n")); + DEBUG(1, "Failed to create failover service!\n"); return ret; } @@ -241,16 +241,16 @@ void be_fo_set_srv_lookup_plugin(struct be_ctx *ctx, { bool bret; - DEBUG(SSSDBG_TRACE_FUNC, ("Trying to set SRV lookup plugin to %s\n", - plugin_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Trying to set SRV lookup plugin to %s\n", + plugin_name); bret = fo_set_srv_lookup_plugin(ctx->be_fo->fo_ctx, send_fn, recv_fn, pvt); if (bret) { - DEBUG(SSSDBG_TRACE_FUNC, ("SRV lookup plugin is now %s\n", - plugin_name)); + DEBUG(SSSDBG_TRACE_FUNC, "SRV lookup plugin is now %s\n", + plugin_name); } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to set SRV lookup plugin, " - "another plugin may be already in place\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to set SRV lookup plugin, " + "another plugin may be already in place\n"); } } @@ -266,7 +266,7 @@ errno_t be_fo_set_dns_srv_lookup_plugin(struct be_ctx *be_ctx, if (ret != EOK) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("gethostname() failed: [%d]: %s\n", ret, strerror(ret))); + "gethostname() failed: [%d]: %s\n", ret, strerror(ret)); return ret; } resolved_hostname[HOST_NAME_MAX-1] = '\0'; @@ -278,7 +278,7 @@ errno_t be_fo_set_dns_srv_lookup_plugin(struct be_ctx *be_ctx, default_host_dbs, hostname, be_ctx->domain->name); if (srv_ctx == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Out of memory?\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Out of memory?\n"); return ENOMEM; } @@ -315,7 +315,7 @@ int be_fo_add_srv_server(struct be_ctx *ctx, domain, ctx->domain->name, proto_table[proto], user_data); if (ret && ret != EEXIST) { - DEBUG(1, ("Failed to add SRV lookup reference to failover service\n")); + DEBUG(1, "Failed to add SRV lookup reference to failover service\n"); return ret; } @@ -327,7 +327,7 @@ int be_fo_add_srv_server(struct be_ctx *ctx, domain, ctx->domain->name, proto_table[i], user_data); if (ret && ret != EEXIST) { - DEBUG(1, ("Failed to add SRV lookup reference to failover service\n")); + DEBUG(1, "Failed to add SRV lookup reference to failover service\n"); return ret; } @@ -365,7 +365,7 @@ int be_fo_add_server(struct be_ctx *ctx, const char *service_name, ret = fo_add_server(svc->fo_service, server, port, user_data, primary); if (ret && ret != EEXIST) { - DEBUG(1, ("Failed to add server to failover service\n")); + DEBUG(1, "Failed to add server to failover service\n"); return ret; } @@ -414,7 +414,7 @@ be_primary_server_timeout(struct tevent_context *ev, ctx->bctx->be_fo->primary_server_handler = NULL; - DEBUG(SSSDBG_TRACE_FUNC, ("Looking for primary server!\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Looking for primary server!\n"); subreq = fo_resolve_service_send(ctx->bctx, ctx->ev, ctx->bctx->be_fo->be_res->resolv, ctx->bctx->be_fo->fo_ctx, @@ -436,7 +436,7 @@ static void be_primary_server_done(struct tevent_req *subreq) resolve_state = talloc_zero(ctx->bctx, struct be_resolve_server_state); if (resolve_state == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero() failed\n"); return; } @@ -462,7 +462,7 @@ static void be_primary_server_done(struct tevent_req *subreq) ret = be_primary_server_timeout_activate(ctx->bctx, ctx->ev, ctx->bctx, ctx->svc, ctx->timeout); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not schedule primary server lookup\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not schedule primary server lookup\n"); } } else if (ret == EOK) { be_run_reconnect_cb(ctx->bctx); @@ -484,8 +484,8 @@ be_primary_server_timeout_activate(TALLOC_CTX *mem_ctx, struct be_failover_ctx *fo_ctx = bctx->be_fo; if (fo_ctx->primary_server_handler != NULL) { - DEBUG(SSSDBG_TRACE_FUNC, ("The primary server reconnection " - "is already scheduled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "The primary server reconnection " + "is already scheduled\n"); return EOK; } @@ -504,13 +504,13 @@ be_primary_server_timeout_activate(TALLOC_CTX *mem_ctx, fo_ctx->primary_server_handler = tevent_add_timer(ev, bctx, tv, be_primary_server_timeout, ctx); if (fo_ctx->primary_server_handler == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_add_timer failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_add_timer failed.\n"); talloc_free(ctx); return ENOMEM; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Primary server reactivation timeout set " - "to %lu seconds\n", timeout_seconds)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Primary server reactivation timeout set " + "to %lu seconds\n", timeout_seconds); return EOK; } @@ -590,7 +590,7 @@ static void be_resolve_server_done(struct tevent_req *subreq) return; fail: - DEBUG(SSSDBG_TRACE_LIBS, ("Server resolution failed: %d\n", ret)); + DEBUG(SSSDBG_TRACE_LIBS, "Server resolution failed: %d\n", ret); state->svc->first_resolved = NULL; tevent_req_error(req, ret); } @@ -622,17 +622,17 @@ errno_t be_resolve_server_process(struct tevent_req *subreq, return EFAULT; } DEBUG(SSSDBG_MINOR_FAILURE, - ("Couldn't resolve server (%s), resolver returned (%d)\n", - fo_get_server_str_name(state->srv), ret)); + "Couldn't resolve server (%s), resolver returned (%d)\n", + fo_get_server_str_name(state->srv), ret); state->attempts++; if (state->attempts >= 10) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to find a server after 10 attempts\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to find a server after 10 attempts\n"); return EIO; } /* now try next one */ - DEBUG(SSSDBG_TRACE_LIBS, ("Trying with the next one!\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Trying with the next one!\n"); subreq = fo_resolve_service_send(state, state->ev, state->ctx->be_fo->be_res->resolv, state->ctx->be_fo->fo_ctx, @@ -650,11 +650,11 @@ errno_t be_resolve_server_process(struct tevent_req *subreq, /* all fine we got the server */ if (state->svc->first_resolved == NULL || state->first_try == true) { - DEBUG(SSSDBG_TRACE_LIBS, ("Saving the first resolved server\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Saving the first resolved server\n"); state->svc->first_resolved = state->srv; } else if (state->svc->first_resolved == state->srv) { DEBUG(SSSDBG_OP_FAILURE, - ("The fail over cycled through all available servers\n")); + "The fail over cycled through all available servers\n"); return ENOENT; } @@ -664,17 +664,17 @@ errno_t be_resolve_server_process(struct tevent_req *subreq, srvaddr = fo_get_server_hostent(state->srv); if (!srvaddr) { DEBUG(SSSDBG_CRIT_FAILURE, - ("FATAL: No hostent available for server (%s)\n", - fo_get_server_str_name(state->srv))); + "FATAL: No hostent available for server (%s)\n", + fo_get_server_str_name(state->srv)); return EFAULT; } inet_ntop(srvaddr->family, srvaddr->addr_list[0]->ipaddr, ipaddr, 128); - DEBUG(SSSDBG_FUNC_DATA, ("Found address for server %s: [%s] TTL %d\n", + DEBUG(SSSDBG_FUNC_DATA, "Found address for server %s: [%s] TTL %d\n", fo_get_server_str_name(state->srv), ipaddr, - srvaddr->addr_list[0]->ttl)); + srvaddr->addr_list[0]->ttl); } srv_status_change = fo_get_server_hostname_last_change(state->srv); @@ -750,14 +750,14 @@ void be_fo_set_port_status(struct be_ctx *ctx, be_svc = be_fo_find_svc_data(ctx, service_name); if (be_svc == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("No service associated with name %s\n", service_name)); + "No service associated with name %s\n", service_name); return; } if (!fo_svc_has_server(be_svc->fo_service, server)) { DEBUG(SSSDBG_OP_FAILURE, - ("The server %p is not valid anymore, cannot set its status\n", - server)); + "The server %p is not valid anymore, cannot set its status\n", + server); return; } @@ -796,7 +796,7 @@ static errno_t be_res_get_opts(struct be_resolv_ctx *res_ctx, } str_family = dp_opt_get_string(res_ctx->opts, DP_RES_OPT_FAMILY_ORDER); - DEBUG(SSSDBG_CONF_SETTINGS, ("Lookup order: %s\n", str_family)); + DEBUG(SSSDBG_CONF_SETTINGS, "Lookup order: %s\n", str_family); if (strcasecmp(str_family, "ipv4_first") == 0) { res_ctx->family_order = IPV4_FIRST; @@ -807,8 +807,8 @@ static errno_t be_res_get_opts(struct be_resolv_ctx *res_ctx, } else if (strcasecmp(str_family, "ipv6_only") == 0) { res_ctx->family_order = IPV6_ONLY; } else { - DEBUG(SSSDBG_OP_FAILURE, ("Unknown value for option %s: %s\n", - dp_res_default_opts[DP_RES_OPT_FAMILY_ORDER].opt_name, str_family)); + DEBUG(SSSDBG_OP_FAILURE, "Unknown value for option %s: %s\n", + dp_res_default_opts[DP_RES_OPT_FAMILY_ORDER].opt_name, str_family); return EINVAL; } diff --git a/src/providers/data_provider_opts.c b/src/providers/data_provider_opts.c index 0cc48e46e..c6adbb1c9 100644 --- a/src/providers/data_provider_opts.c +++ b/src/providers/data_provider_opts.c @@ -53,15 +53,15 @@ int dp_get_options(TALLOC_CTX *memctx, ((opts[i].def_val.string != NULL) && (opts[i].val.string == NULL))) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); if (ret == EOK) ret = EINVAL; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has%s value %s\n", + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has%s value %s\n", opts[i].opt_name, opts[i].val.cstring ? "" : " no", - opts[i].val.cstring ? opts[i].val.cstring : "")); + opts[i].val.cstring ? opts[i].val.cstring : ""); break; case DP_OPT_BLOB: @@ -70,8 +70,8 @@ int dp_get_options(TALLOC_CTX *memctx, NULL, &tmp); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } @@ -86,8 +86,8 @@ int dp_get_options(TALLOC_CTX *memctx, opts[i].val.blob.length = 0; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has %s binary value.\n", - opts[i].opt_name, opts[i].val.blob.length?"a":"no")); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has %s binary value.\n", + opts[i].opt_name, opts[i].val.blob.length?"a":"no"); break; case DP_OPT_NUMBER: @@ -97,12 +97,12 @@ int dp_get_options(TALLOC_CTX *memctx, &opts[i].val.number); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has value %d\n", - opts[i].opt_name, opts[i].val.number)); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has value %d\n", + opts[i].opt_name, opts[i].val.number); break; case DP_OPT_BOOL: @@ -112,12 +112,12 @@ int dp_get_options(TALLOC_CTX *memctx, &opts[i].val.boolean); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s is %s\n", - opts[i].opt_name, opts[i].val.boolean?"TRUE":"FALSE")); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s is %s\n", + opts[i].opt_name, opts[i].val.boolean?"TRUE":"FALSE"); break; } } @@ -158,14 +158,14 @@ static int dp_copy_options_ex(TALLOC_CTX *memctx, } if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to copy value for option (%s)\n", - opts[i].opt_name)); + "Failed to copy value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has%s value %s\n", + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has%s value %s\n", opts[i].opt_name, opts[i].val.cstring ? "" : " no", - opts[i].val.cstring ? opts[i].val.cstring : "")); + opts[i].val.cstring ? opts[i].val.cstring : ""); break; case DP_OPT_BLOB: @@ -176,12 +176,12 @@ static int dp_copy_options_ex(TALLOC_CTX *memctx, } if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has %s binary value.\n", - opts[i].opt_name, opts[i].val.blob.length?"a":"no")); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has %s binary value.\n", + opts[i].opt_name, opts[i].val.blob.length?"a":"no"); break; case DP_OPT_NUMBER: @@ -192,12 +192,12 @@ static int dp_copy_options_ex(TALLOC_CTX *memctx, } if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has value %d\n", - opts[i].opt_name, opts[i].val.number)); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has value %d\n", + opts[i].opt_name, opts[i].val.number); break; case DP_OPT_BOOL: @@ -208,12 +208,12 @@ static int dp_copy_options_ex(TALLOC_CTX *memctx, } if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for option (%s)\n", - opts[i].opt_name)); + "Failed to retrieve value for option (%s)\n", + opts[i].opt_name); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s is %s\n", - opts[i].opt_name, opts[i].val.boolean?"TRUE":"FALSE")); + DEBUG(SSSDBG_TRACE_FUNC, "Option %s is %s\n", + opts[i].opt_name, opts[i].val.boolean?"TRUE":"FALSE"); break; } } @@ -261,10 +261,10 @@ const char *_dp_opt_get_cstring(struct dp_option *opts, int id, const char *location) { if (opts[id].type != DP_OPT_STRING) { - DEBUG(0, ("[%s] Requested type 'String' for option '%s'" + DEBUG(0, "[%s] Requested type 'String' for option '%s'" " but value is of type '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return NULL; } return opts[id].val.cstring; @@ -274,10 +274,10 @@ char *_dp_opt_get_string(struct dp_option *opts, int id, const char *location) { if (opts[id].type != DP_OPT_STRING) { - DEBUG(0, ("[%s] Requested type 'String' for option '%s'" + DEBUG(0, "[%s] Requested type 'String' for option '%s'" " but value is of type '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return NULL; } return opts[id].val.string; @@ -288,10 +288,10 @@ struct dp_opt_blob _dp_opt_get_blob(struct dp_option *opts, { struct dp_opt_blob null_blob = { NULL, 0 }; if (opts[id].type != DP_OPT_BLOB) { - DEBUG(0, ("[%s] Requested type 'Blob' for option '%s'" + DEBUG(0, "[%s] Requested type 'Blob' for option '%s'" " but value is of type '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return null_blob; } return opts[id].val.blob; @@ -301,10 +301,10 @@ int _dp_opt_get_int(struct dp_option *opts, int id, const char *location) { if (opts[id].type != DP_OPT_NUMBER) { - DEBUG(0, ("[%s] Requested type 'Number' for option '%s'" + DEBUG(0, "[%s] Requested type 'Number' for option '%s'" " but value is of type '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return 0; } return opts[id].val.number; @@ -314,10 +314,10 @@ bool _dp_opt_get_bool(struct dp_option *opts, int id, const char *location) { if (opts[id].type != DP_OPT_BOOL) { - DEBUG(0, ("[%s] Requested type 'Boolean' for option '%s'" + DEBUG(0, "[%s] Requested type 'Boolean' for option '%s'" " but value is of type '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return false; } return opts[id].val.boolean; @@ -328,10 +328,10 @@ int _dp_opt_set_string(struct dp_option *opts, int id, const char *s, const char *location) { if (opts[id].type != DP_OPT_STRING) { - DEBUG(0, ("[%s] Requested type 'String' for option '%s'" + DEBUG(0, "[%s] Requested type 'String' for option '%s'" " but type is '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return EINVAL; } @@ -341,7 +341,7 @@ int _dp_opt_set_string(struct dp_option *opts, int id, if (s) { opts[id].val.string = talloc_strdup(opts, s); if (!opts[id].val.string) { - DEBUG(0, ("talloc_strdup() failed!\n")); + DEBUG(0, "talloc_strdup() failed!\n"); return ENOMEM; } } @@ -353,10 +353,10 @@ int _dp_opt_set_blob(struct dp_option *opts, int id, struct dp_opt_blob b, const char *location) { if (opts[id].type != DP_OPT_BLOB) { - DEBUG(0, ("[%s] Requested type 'Blob' for option '%s'" + DEBUG(0, "[%s] Requested type 'Blob' for option '%s'" " but type is '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return EINVAL; } @@ -367,7 +367,7 @@ int _dp_opt_set_blob(struct dp_option *opts, int id, if (b.data) { opts[id].val.blob.data = talloc_memdup(opts, b.data, b.length); if (!opts[id].val.blob.data) { - DEBUG(0, ("talloc_memdup() failed!\n")); + DEBUG(0, "talloc_memdup() failed!\n"); return ENOMEM; } } @@ -380,10 +380,10 @@ int _dp_opt_set_int(struct dp_option *opts, int id, int i, const char *location) { if (opts[id].type != DP_OPT_NUMBER) { - DEBUG(0, ("[%s] Requested type 'Number' for option '%s'" + DEBUG(0, "[%s] Requested type 'Number' for option '%s'" " but type is '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return EINVAL; } @@ -396,10 +396,10 @@ int _dp_opt_set_bool(struct dp_option *opts, int id, bool b, const char *location) { if (opts[id].type != DP_OPT_BOOL) { - DEBUG(0, ("[%s] Requested type 'Boolean' for option '%s'" + DEBUG(0, "[%s] Requested type 'Boolean' for option '%s'" " but type is '%s'!\n", location, opts[id].opt_name, - dp_opt_type_to_string(opts[id].type))); + dp_opt_type_to_string(opts[id].type)); return EINVAL; } diff --git a/src/providers/dp_auth_util.c b/src/providers/dp_auth_util.c index 3bcd797ef..faf7f36e3 100644 --- a/src/providers/dp_auth_util.c +++ b/src/providers/dp_auth_util.c @@ -108,7 +108,7 @@ bool dp_unpack_pam_request(DBusMessage *msg, TALLOC_CTX *mem_ctx, DBUS_TYPE_INVALID); if (!db_ret) { - DEBUG(1, ("dbus_message_get_args failed.\n")); + DEBUG(1, "dbus_message_get_args failed.\n"); return false; } @@ -117,20 +117,20 @@ bool dp_unpack_pam_request(DBusMessage *msg, TALLOC_CTX *mem_ctx, ret = copy_pam_data(mem_ctx, &pd, new_pd); if (ret != EOK) { - DEBUG(1, ("copy_pam_data failed.\n")); + DEBUG(1, "copy_pam_data failed.\n"); return false; } ret = sss_authtok_set((*new_pd)->authtok, authtok_type, authtok_data, authtok_length); if (ret) { - DEBUG(1, ("Failed to set auth token: %d [%s]\n", ret, strerror(ret))); + DEBUG(1, "Failed to set auth token: %d [%s]\n", ret, strerror(ret)); return false; } ret = sss_authtok_set((*new_pd)->newauthtok, new_authtok_type, new_authtok_data, new_authtok_length); if (ret) { - DEBUG(1, ("Failed to set auth token: %d [%s]\n", ret, strerror(ret))); + DEBUG(1, "Failed to set auth token: %d [%s]\n", ret, strerror(ret)); return false; } @@ -229,30 +229,30 @@ bool dp_unpack_pam_response(DBusMessage *msg, struct pam_data *pd, DBusError *db const uint8_t *data; if (!dbus_message_iter_init(msg, &iter)) { - DEBUG(1, ("pam response has no arguments.\n")); + DEBUG(1, "pam response has no arguments.\n"); return false; } if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_UINT32) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } dbus_message_iter_get_basic(&iter, &(pd->pam_status)); if (!dbus_message_iter_next(&iter)) { - DEBUG(1, ("pam response has too few arguments.\n")); + DEBUG(1, "pam response has too few arguments.\n"); return false; } /* After this point will be an array of pam data */ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) { - DEBUG(1, ("pam response format error.\n")); - DEBUG(1, ("Type was %c\n", (char)dbus_message_iter_get_arg_type(&iter))); + DEBUG(1, "pam response format error.\n"); + DEBUG(1, "Type was %c\n", (char)dbus_message_iter_get_arg_type(&iter)); return false; } if (dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } @@ -260,7 +260,7 @@ bool dp_unpack_pam_response(DBusMessage *msg, struct pam_data *pd, DBusError *db while (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_INVALID) { /* Read in a pam data struct */ if (dbus_message_iter_get_arg_type(&array_iter) != DBUS_TYPE_STRUCT) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } @@ -270,20 +270,20 @@ bool dp_unpack_pam_response(DBusMessage *msg, struct pam_data *pd, DBusError *db /* Get the pam data type */ if (dbus_message_iter_get_arg_type(&struct_iter) != DBUS_TYPE_UINT32) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } dbus_message_iter_get_basic(&struct_iter, &type); if (!dbus_message_iter_next(&struct_iter)) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } /* Get the byte array */ if (dbus_message_iter_get_arg_type(&struct_iter) != DBUS_TYPE_ARRAY || dbus_message_iter_get_element_type(&struct_iter) != DBUS_TYPE_BYTE) { - DEBUG(1, ("pam response format error.\n")); + DEBUG(1, "pam response format error.\n"); return false; } @@ -291,7 +291,7 @@ bool dp_unpack_pam_response(DBusMessage *msg, struct pam_data *pd, DBusError *db dbus_message_iter_get_fixed_array(&sub_iter, &data, &len); if (pam_add_response(pd, type, len, data) != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); return false; } dbus_message_iter_next(&array_iter); @@ -316,8 +316,8 @@ void dp_id_callback(DBusPendingCall *pending, void *ptr) * until reply is valid or timeout has occurred. If reply is NULL * here, something is seriously wrong and we should bail out. */ - DEBUG(0, ("Severe error. A reply callback was called but no" - " reply was received and no timeout occurred\n")); + DEBUG(0, "Severe error. A reply callback was called but no" + " reply was received and no timeout occurred\n"); /* FIXME: Destroy this connection ? */ goto done; @@ -330,19 +330,19 @@ void dp_id_callback(DBusPendingCall *pending, void *ptr) DBUS_TYPE_UINT16, &dp_ver, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(1, ("Failed to parse message\n")); + DEBUG(1, "Failed to parse message\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); /* FIXME: Destroy this connection ? */ goto done; } - DEBUG(4, ("Got id ack and version (%d) from DP\n", dp_ver)); + DEBUG(4, "Got id ack and version (%d) from DP\n", dp_ver); break; case DBUS_MESSAGE_TYPE_ERROR: - DEBUG(0,("The Monitor returned an error [%s]\n", - dbus_message_get_error_name(reply))); + DEBUG(0,"The Monitor returned an error [%s]\n", + dbus_message_get_error_name(reply)); /* Falling through to default intentionally*/ default: /* @@ -375,19 +375,19 @@ int dp_common_send_id(struct sbus_connection *conn, uint16_t version, DP_INTERFACE, DP_METHOD_REGISTER); if (msg == NULL) { - DEBUG(0, ("Out of memory?!\n")); + DEBUG(0, "Out of memory?!\n"); return ENOMEM; } - DEBUG(4, ("Sending ID to DP: (%d,%s)\n", - version, name)); + DEBUG(4, "Sending ID to DP: (%d,%s)\n", + version, name); ret = dbus_message_append_args(msg, DBUS_TYPE_UINT16, &version, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(1, ("Failed to build message\n")); + DEBUG(1, "Failed to build message\n"); return EIO; } diff --git a/src/providers/dp_dyndns.c b/src/providers/dp_dyndns.c index cd1143132..faeb47364 100644 --- a/src/providers/dp_dyndns.c +++ b/src/providers/dp_dyndns.c @@ -120,7 +120,7 @@ sss_iface_addr_list_as_str_list(TALLOC_CTX *mem_ctx, break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown address family\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown address family\n"); continue; } @@ -154,18 +154,18 @@ ok_for_dns(struct sockaddr *sa) if (inet_ntop(AF_INET6, addr6, straddr, INET6_ADDRSTRLEN) == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, - ("inet_ntop failed, won't log IP addresses\n")); + "inet_ntop failed, won't log IP addresses\n"); snprintf(straddr, INET6_ADDRSTRLEN, "unknown"); } if (IN6_IS_ADDR_LINKLOCAL(addr6)) { - DEBUG(SSSDBG_FUNC_DATA, ("Link local IPv6 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Link local IPv6 address %s\n", straddr); return false; } else if (IN6_IS_ADDR_LOOPBACK(addr6)) { - DEBUG(SSSDBG_FUNC_DATA, ("Loopback IPv6 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Loopback IPv6 address %s\n", straddr); return false; } else if (IN6_IS_ADDR_MULTICAST(addr6)) { - DEBUG(SSSDBG_FUNC_DATA, ("Multicast IPv6 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Multicast IPv6 address %s\n", straddr); return false; } break; @@ -174,27 +174,27 @@ ok_for_dns(struct sockaddr *sa) if (inet_ntop(AF_INET, addr, straddr, INET6_ADDRSTRLEN) == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, - ("inet_ntop failed, won't log IP addresses\n")); + "inet_ntop failed, won't log IP addresses\n"); snprintf(straddr, INET6_ADDRSTRLEN, "unknown"); } if (IN_MULTICAST(ntohl(addr->s_addr))) { - DEBUG(SSSDBG_FUNC_DATA, ("Multicast IPv4 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Multicast IPv4 address %s\n", straddr); return false; } else if (inet_netof(*addr) == IN_LOOPBACKNET) { - DEBUG(SSSDBG_FUNC_DATA, ("Loopback IPv4 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Loopback IPv4 address %s\n", straddr); return false; } else if ((addr->s_addr & htonl(0xffff0000)) == htonl(0xa9fe0000)) { /* 169.254.0.0/16 */ - DEBUG(SSSDBG_FUNC_DATA, ("Link-local IPv4 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Link-local IPv4 address %s\n", straddr); return false; } else if (addr->s_addr == htonl(INADDR_BROADCAST)) { - DEBUG(SSSDBG_FUNC_DATA, ("Broadcast IPv4 address %s\n", straddr)); + DEBUG(SSSDBG_FUNC_DATA, "Broadcast IPv4 address %s\n", straddr); return false; } break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown address family\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown address family\n"); return false; } @@ -221,7 +221,7 @@ sss_iface_addr_list_get(TALLOC_CTX *mem_ctx, const char *ifname, if (ret == -1) { ret = errno; DEBUG(SSSDBG_OP_FAILURE, - ("Could not read interfaces [%d][%s]\n", ret, strerror(ret))); + "Could not read interfaces [%d][%s]\n", ret, strerror(ret)); goto done; } @@ -298,7 +298,7 @@ nsupdate_msg_add_fwd(char *update_msg, struct sss_iface_addr *addresses, if (ip == NULL) { ret = errno; DEBUG(SSSDBG_OP_FAILURE, - ("inet_ntop failed [%d]: %s\n", ret, strerror(ret))); + "inet_ntop failed [%d]: %s\n", ret, strerror(ret)); return NULL; } break; @@ -310,13 +310,13 @@ nsupdate_msg_add_fwd(char *update_msg, struct sss_iface_addr *addresses, if (ip == NULL) { ret = errno; DEBUG(SSSDBG_OP_FAILURE, - ("inet_ntop failed [%d]: %s\n", ret, strerror(ret))); + "inet_ntop failed [%d]: %s\n", ret, strerror(ret)); return NULL; } break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown address family\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown address family\n"); return NULL; } @@ -359,7 +359,7 @@ nsupdate_msg_add_ptr(char *update_msg, struct sss_iface_addr *addresses, addr = (uint8_t *) &((struct sockaddr_in6 *) old_record->addr)->sin6_addr; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown address family\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown address family\n"); return NULL; } @@ -388,7 +388,7 @@ nsupdate_msg_add_ptr(char *update_msg, struct sss_iface_addr *addresses, addr = (uint8_t *) &((struct sockaddr_in6 *) new_record->addr)->sin6_addr; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown address family\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown address family\n"); return NULL; } @@ -436,15 +436,15 @@ nsupdate_msg_create_common(TALLOC_CTX *mem_ctx, const char *realm, */ if (servername) { DEBUG(SSSDBG_FUNC_DATA, - ("Creating update message for server [%s] and realm [%s]\n.", - servername, realm)); + "Creating update message for server [%s] and realm [%s]\n.", + servername, realm); /* Add the server, realm and headers */ update_msg = talloc_asprintf(tmp_ctx, "server %s\n%s", servername, realm_directive); } else { DEBUG(SSSDBG_FUNC_DATA, - ("Creating update message for realm [%s].\n", realm)); + "Creating update message for realm [%s].\n", realm); /* Add the realm headers */ update_msg = talloc_asprintf(tmp_ctx, "%s", realm_directive); } @@ -490,7 +490,7 @@ be_nsupdate_create_fwd_msg(TALLOC_CTX *mem_ctx, const char *realm, if (zone) { DEBUG(SSSDBG_FUNC_DATA, - ("Setting the zone explicitly to [%s].\n", zone)); + "Setting the zone explicitly to [%s].\n", zone); update_msg = talloc_asprintf_append(update_msg, "zone %s.\n", zone); if (update_msg == NULL) { ret = ENOMEM; @@ -506,10 +506,10 @@ be_nsupdate_create_fwd_msg(TALLOC_CTX *mem_ctx, const char *realm, } DEBUG(SSSDBG_TRACE_FUNC, - (" -- Begin nsupdate message -- \n%s", - update_msg)); + " -- Begin nsupdate message -- \n%s", + update_msg); DEBUG(SSSDBG_TRACE_FUNC, - (" -- End nsupdate message -- \n")); + " -- End nsupdate message -- \n"); ret = ERR_OK; *_update_msg = talloc_steal(mem_ctx, update_msg); @@ -548,10 +548,10 @@ be_nsupdate_create_ptr_msg(TALLOC_CTX *mem_ctx, const char *realm, } DEBUG(SSSDBG_TRACE_FUNC, - (" -- Begin nsupdate message -- \n%s", - update_msg)); + " -- Begin nsupdate message -- \n%s", + update_msg); DEBUG(SSSDBG_TRACE_FUNC, - (" -- End nsupdate message -- \n")); + " -- End nsupdate message -- \n"); ret = ERR_OK; *_update_msg = talloc_steal(mem_ctx, update_msg); @@ -650,9 +650,9 @@ nsupdate_get_addrs_done(struct tevent_req *subreq) goto done; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not resolve address for this machine, error [%d]: %s, " + "Could not resolve address for this machine, error [%d]: %s, " "resolver returned: [%d]: %s\n", ret, sss_strerror(ret), - resolv_status, resolv_strerror(resolv_status))); + resolv_status, resolv_strerror(resolv_status)); goto done; } @@ -665,8 +665,8 @@ nsupdate_get_addrs_done(struct tevent_req *subreq) * c-ares, but we need to handle it gracefully. */ DEBUG(SSSDBG_MINOR_FAILURE, - ("Lookup of [%s] returned no addresses. Skipping.\n", - rhostent->name)); + "Lookup of [%s] returned no addresses. Skipping.\n", + rhostent->name); count = 0; } @@ -726,8 +726,8 @@ done: tevent_req_done(req); } else if (ret != EAGAIN) { DEBUG(SSSDBG_OP_FAILURE, - ("nsupdate_get_addrs_done failed: [%d]: [%s]\n", - ret, sss_strerror(ret))); + "nsupdate_get_addrs_done failed: [%d]: [%s]\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); } /* EAGAIN - another lookup in progress */ @@ -803,8 +803,8 @@ nsupdate_child_send(TALLOC_CTX *mem_ctx, ret = child_handler_setup(ev, child_pid, nsupdate_child_handler, req, &state->child_ctx); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set up child handlers [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not set up child handlers [%d]: %s\n", + ret, sss_strerror(ret)); ret = ERR_DYNDNS_FAILED; goto done; } @@ -848,7 +848,7 @@ nsupdate_child_timeout(struct tevent_context *ev, struct nsupdate_child_state *state = tevent_req_data(req, struct nsupdate_child_state); - DEBUG(SSSDBG_CRIT_FAILURE, ("Timeout reached for dynamic DNS update\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Timeout reached for dynamic DNS update\n"); child_handler_destroy(state->child_ctx); state->child_ctx = NULL; state->child_status = ETIMEDOUT; @@ -867,13 +867,13 @@ nsupdate_child_stdin_done(struct tevent_req *subreq) /* Verify that the buffer was sent, then return * and wait for the sigchld handler to finish. */ - DEBUG(SSSDBG_TRACE_LIBS, ("Sending nsupdate data complete\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Sending nsupdate data complete\n"); ret = write_pipe_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Sending nsupdate data failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Sending nsupdate data failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ERR_DYNDNS_FAILED); return; } @@ -899,15 +899,15 @@ nsupdate_child_handler(int child_status, if (WIFEXITED(child_status) && WEXITSTATUS(child_status) != 0) { DEBUG(SSSDBG_OP_FAILURE, - ("Dynamic DNS child failed with status [%d]\n", child_status)); + "Dynamic DNS child failed with status [%d]\n", child_status); tevent_req_error(req, ERR_DYNDNS_FAILED); return; } if (WIFSIGNALED(child_status)) { DEBUG(SSSDBG_OP_FAILURE, - ("Dynamic DNS child was terminated by signal [%d]\n", - WTERMSIG(child_status))); + "Dynamic DNS child was terminated by signal [%d]\n", + WTERMSIG(child_status)); tevent_req_error(req, ERR_DYNDNS_FAILED); return; } @@ -964,7 +964,7 @@ struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("pipe failed [%d][%s].\n", ret, strerror(ret))); + "pipe failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -976,7 +976,7 @@ struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("dup2 failed [%d][%s].\n", ret, strerror(ret))); + "dup2 failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -990,7 +990,7 @@ struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, execv(NSUPDATE_PATH, args); /* The child should never end up here */ ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("execv failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "execv failed [%d][%s].\n", ret, strerror(ret)); goto done; } else if (child_pid > 0) { /* parent */ close(pipefd_to_child[0]); @@ -1005,7 +1005,7 @@ struct tevent_req *be_nsupdate_send(TALLOC_CTX *mem_ctx, } else { /* error */ ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("fork failed [%d][%s].\n", ret, strerror(ret))); + "fork failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -1039,10 +1039,10 @@ be_nsupdate_args(TALLOC_CTX *mem_ctx, switch (auth_type) { case BE_NSUPDATE_AUTH_NONE: - DEBUG(SSSDBG_FUNC_DATA, ("nsupdate auth type: none\n")); + DEBUG(SSSDBG_FUNC_DATA, "nsupdate auth type: none\n"); break; case BE_NSUPDATE_AUTH_GSS_TSIG: - DEBUG(SSSDBG_FUNC_DATA, ("nsupdate auth type: GSS-TSIG\n")); + DEBUG(SSSDBG_FUNC_DATA, "nsupdate auth type: GSS-TSIG\n"); argv[argc] = talloc_strdup(argv, "-g"); if (argv[argc] == NULL) { goto fail; @@ -1050,12 +1050,12 @@ be_nsupdate_args(TALLOC_CTX *mem_ctx, argc++; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown nsupdate auth type\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown nsupdate auth type\n"); goto fail; } if (force_tcp) { - DEBUG(SSSDBG_FUNC_DATA, ("TCP is set to on\n")); + DEBUG(SSSDBG_FUNC_DATA, "TCP is set to on\n"); argv[argc] = talloc_strdup(argv, "-v"); if (argv[argc] == NULL) { goto fail; @@ -1082,14 +1082,14 @@ be_nsupdate_done(struct tevent_req *subreq) ret = nsupdate_child_recv(subreq, &state->child_status); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("nsupdate child execution failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "nsupdate child execution failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } DEBUG(SSSDBG_FUNC_DATA, - ("nsupdate child status: %d\n", state->child_status)); + "nsupdate child status: %d\n", state->child_status); tevent_req_done(req); } @@ -1127,13 +1127,13 @@ void be_nsupdate_timer_schedule(struct tevent_context *ev, struct timeval tv; if (ctx->refresh_timer) { - DEBUG(SSSDBG_FUNC_DATA, ("Timer already scheduled\n")); + DEBUG(SSSDBG_FUNC_DATA, "Timer already scheduled\n"); return; } refresh = dp_opt_get_int(ctx->opts, DP_OPT_DYNDNS_REFRESH_INTERVAL); if (refresh == 0) return; - DEBUG(SSSDBG_FUNC_DATA, ("Scheduling timer in %d seconds\n", refresh)); + DEBUG(SSSDBG_FUNC_DATA, "Scheduling timer in %d seconds\n", refresh); tv = tevent_timeval_current_ofs(refresh, 0); ctx->refresh_timer = tevent_add_timer(ev, ctx, tv, @@ -1141,7 +1141,7 @@ void be_nsupdate_timer_schedule(struct tevent_context *ev, if (!ctx->refresh_timer) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to add dyndns refresh timer event\n")); + "Failed to add dyndns refresh timer event\n"); } } @@ -1158,12 +1158,12 @@ be_nsupdate_check(void) ret = errno; if (ret == ENOENT) { DEBUG(SSSDBG_MINOR_FAILURE, - ("%s does not exist. Dynamic DNS updates disabled\n", - NSUPDATE_PATH)); + "%s does not exist. Dynamic DNS updates disabled\n", + NSUPDATE_PATH); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Could not set up dynamic DNS updates: [%d][%s]\n", - ret, strerror(ret))); + "Could not set up dynamic DNS updates: [%d][%s]\n", + ret, strerror(ret)); } } @@ -1200,7 +1200,7 @@ be_nsupdate_init(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, ret = dp_get_options(ctx, be_ctx->cdb, be_ctx->conf_path, src_opts, DP_OPT_DYNDNS, &ctx->opts); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot retrieve dynamic DNS options\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot retrieve dynamic DNS options\n"); return ret; } @@ -1210,7 +1210,7 @@ be_nsupdate_init(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, } else if (strcasecmp(strauth, "none") == 0) { ctx->auth_type = BE_NSUPDATE_AUTH_NONE; } else { - DEBUG(SSSDBG_OP_FAILURE, ("Uknown dyndns auth type %s\n", strauth)); + DEBUG(SSSDBG_OP_FAILURE, "Uknown dyndns auth type %s\n", strauth); return EINVAL; } diff --git a/src/providers/dp_pam_data_util.c b/src/providers/dp_pam_data_util.c index 2bc5368f7..8b0ca88aa 100644 --- a/src/providers/dp_pam_data_util.c +++ b/src/providers/dp_pam_data_util.c @@ -65,19 +65,19 @@ struct pam_data *create_pam_data(TALLOC_CTX *mem_ctx) pd = talloc_zero(mem_ctx, struct pam_data); if (pd == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); goto failed; } pd->authtok = sss_authtok_new(pd); if (pd->authtok == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); goto failed; } pd->newauthtok = sss_authtok_new(pd); if (pd->newauthtok == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); goto failed; } @@ -174,23 +174,23 @@ errno_t copy_pam_data(TALLOC_CTX *mem_ctx, struct pam_data *src, failed: talloc_free(pd); - DEBUG(1, ("copy_pam_data failed: (%d) %s.\n", ret, strerror(ret))); + DEBUG(1, "copy_pam_data failed: (%d) %s.\n", ret, strerror(ret)); return ret; } void pam_print_data(int l, struct pam_data *pd) { - DEBUG(l, ("command: %s\n", pamcmd2str(pd->cmd))); - DEBUG(l, ("domain: %s\n", PAM_SAFE_ITEM(pd->domain))); - DEBUG(l, ("user: %s\n", PAM_SAFE_ITEM(pd->user))); - DEBUG(l, ("service: %s\n", PAM_SAFE_ITEM(pd->service))); - DEBUG(l, ("tty: %s\n", PAM_SAFE_ITEM(pd->tty))); - DEBUG(l, ("ruser: %s\n", PAM_SAFE_ITEM(pd->ruser))); - DEBUG(l, ("rhost: %s\n", PAM_SAFE_ITEM(pd->rhost))); - DEBUG(l, ("authtok type: %d\n", sss_authtok_get_type(pd->authtok))); - DEBUG(l, ("newauthtok type: %d\n", sss_authtok_get_type(pd->newauthtok))); - DEBUG(l, ("priv: %d\n", pd->priv)); - DEBUG(l, ("cli_pid: %d\n", pd->cli_pid)); + DEBUG(l, "command: %s\n", pamcmd2str(pd->cmd)); + DEBUG(l, "domain: %s\n", PAM_SAFE_ITEM(pd->domain)); + DEBUG(l, "user: %s\n", PAM_SAFE_ITEM(pd->user)); + DEBUG(l, "service: %s\n", PAM_SAFE_ITEM(pd->service)); + DEBUG(l, "tty: %s\n", PAM_SAFE_ITEM(pd->tty)); + DEBUG(l, "ruser: %s\n", PAM_SAFE_ITEM(pd->ruser)); + DEBUG(l, "rhost: %s\n", PAM_SAFE_ITEM(pd->rhost)); + DEBUG(l, "authtok type: %d\n", sss_authtok_get_type(pd->authtok)); + DEBUG(l, "newauthtok type: %d\n", sss_authtok_get_type(pd->newauthtok)); + DEBUG(l, "priv: %d\n", pd->priv); + DEBUG(l, "cli_pid: %d\n", pd->cli_pid); } int pam_add_response(struct pam_data *pd, enum response_type type, diff --git a/src/providers/dp_ptask.c b/src/providers/dp_ptask.c index 44a5e148a..8214112a0 100644 --- a/src/providers/dp_ptask.c +++ b/src/providers/dp_ptask.c @@ -60,11 +60,11 @@ static int be_ptask_destructor(void *pvt) task = talloc_get_type(pvt, struct be_ptask); if (task == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("BUG: task is NULL\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "BUG: task is NULL\n"); return 0; } - DEBUG(SSSDBG_TRACE_FUNC, ("Terminating periodic task [%s]\n", task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Terminating periodic task [%s]\n", task->name); return 0; } @@ -75,11 +75,11 @@ static void be_ptask_online_cb(void *pvt) task = talloc_get_type(pvt, struct be_ptask); if (task == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("BUG: task is NULL\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "BUG: task is NULL\n"); return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Back end is online\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Back end is online\n"); be_ptask_enable(task); } @@ -88,7 +88,7 @@ static void be_ptask_offline_cb(void *pvt) struct be_ptask *task = NULL; task = talloc_get_type(pvt, struct be_ptask); - DEBUG(SSSDBG_TRACE_FUNC, ("Back end is offline\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Back end is offline\n"); be_ptask_disable(task); } @@ -100,7 +100,7 @@ static void be_ptask_timeout(struct tevent_context *ev, struct be_ptask *task = NULL; task = talloc_get_type(pvt, struct be_ptask); - DEBUG(SSSDBG_OP_FAILURE, ("Task [%s]: timed out\n", task->name)); + DEBUG(SSSDBG_OP_FAILURE, "Task [%s]: timed out\n", task->name); talloc_zfree(task->req); be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_NOW); @@ -120,7 +120,7 @@ static void be_ptask_execute(struct tevent_context *ev, task->timer = NULL; /* timer is freed by tevent */ if (be_is_offline(task->be_ctx)) { - DEBUG(SSSDBG_TRACE_FUNC, ("Back end is offline\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Back end is offline\n"); switch (task->offline) { case BE_PTASK_OFFLINE_SKIP: be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_NOW); @@ -134,16 +134,16 @@ static void be_ptask_execute(struct tevent_context *ev, } } - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: executing task, timeout %lu " - "seconds\n", task->name, task->timeout)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: executing task, timeout %lu " + "seconds\n", task->name, task->timeout); task->last_execution = time(NULL); task->req = task->send_fn(task, task->ev, task->be_ctx, task, task->pvt); if (task->req == NULL) { /* skip this iteration and try again later */ - DEBUG(SSSDBG_OP_FAILURE, ("Task [%s]: failed to execute task, " - "will try again later\n", task->name)); + DEBUG(SSSDBG_OP_FAILURE, "Task [%s]: failed to execute task, " + "will try again later\n", task->name); be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_NOW); return; @@ -161,8 +161,8 @@ static void be_ptask_execute(struct tevent_context *ev, * we need to cancel the request. */ talloc_zfree(task->req); - DEBUG(SSSDBG_OP_FAILURE, ("Task [%s]: failed to set timeout, " - "the task will be rescheduled\n", task->name)); + DEBUG(SSSDBG_OP_FAILURE, "Task [%s]: failed to set timeout, " + "the task will be rescheduled\n", task->name); be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_NOW); } @@ -183,14 +183,14 @@ static void be_ptask_done(struct tevent_req *req) task->req = NULL; switch (ret) { case EOK: - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: finished successfully\n", - task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: finished successfully\n", + task->name); be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_LAST); break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Task [%s]: failed with [%d]: %s\n", - task->name, ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Task [%s]: failed with [%d]: %s\n", + task->name, ret, sss_strerror(ret)); be_ptask_schedule(task, task->period, BE_PTASK_SCHEDULE_FROM_NOW); break; @@ -204,7 +204,7 @@ static void be_ptask_schedule(struct be_ptask *task, struct timeval tv; if (!task->enabled) { - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: disabled\n", task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: disabled\n", task->name); return; } @@ -212,29 +212,29 @@ static void be_ptask_schedule(struct be_ptask *task, case BE_PTASK_SCHEDULE_FROM_NOW: tv = tevent_timeval_current_ofs(delay, 0); - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: scheduling task %lu seconds " - "from now [%lu]\n", task->name, delay, tv.tv_sec)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: scheduling task %lu seconds " + "from now [%lu]\n", task->name, delay, tv.tv_sec); break; case BE_PTASK_SCHEDULE_FROM_LAST: tv = tevent_timeval_set(task->last_execution + delay, 0); - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: scheduling task %lu seconds " + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: scheduling task %lu seconds " "from last execution time [%lu]\n", - task->name, delay, tv.tv_sec)); + task->name, delay, tv.tv_sec); break; } if (task->timer != NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Task [%s]: another timer is already " - "active?\n", task->name)); + DEBUG(SSSDBG_MINOR_FAILURE, "Task [%s]: another timer is already " + "active?\n", task->name); talloc_zfree(task->timer); } task->timer = tevent_add_timer(task->ev, task, tv, be_ptask_execute, task); if (task->timer == NULL) { /* nothing we can do about it */ - DEBUG(SSSDBG_CRIT_FAILURE, ("FATAL: Unable to schedule task [%s]\n", - task->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "FATAL: Unable to schedule task [%s]\n", + task->name); be_ptask_disable(task); } } @@ -289,20 +289,20 @@ errno_t be_ptask_create(TALLOC_CTX *mem_ctx, /* install offline and online callbacks */ ret = be_add_online_cb(task, be_ctx, be_ptask_online_cb, task, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to install online callback " - "[%d]: %s", ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to install online callback " + "[%d]: %s", ret, sss_strerror(ret)); goto done; } ret = be_add_offline_cb(task, be_ctx, be_ptask_offline_cb, task, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to install offline callback " - "[%d]: %s", ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to install offline callback " + "[%d]: %s", ret, sss_strerror(ret)); goto done; } } - DEBUG(SSSDBG_TRACE_FUNC, ("Periodic task [%s] was created\n", task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Periodic task [%s] was created\n", task->name); be_ptask_schedule(task, first_delay, BE_PTASK_SCHEDULE_FROM_NOW); @@ -323,12 +323,12 @@ done: void be_ptask_enable(struct be_ptask *task) { if (task->enabled) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Task [%s]: already enabled\n", - task->name)); + DEBUG(SSSDBG_MINOR_FAILURE, "Task [%s]: already enabled\n", + task->name); return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: enabling task\n", task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: enabling task\n", task->name); task->enabled = true; be_ptask_schedule(task, task->enabled_delay, BE_PTASK_SCHEDULE_FROM_NOW); @@ -337,7 +337,7 @@ void be_ptask_enable(struct be_ptask *task) /* Disable the task, but if a request already in progress, let it finish. */ void be_ptask_disable(struct be_ptask *task) { - DEBUG(SSSDBG_TRACE_FUNC, ("Task [%s]: disabling task\n", task->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Task [%s]: disabling task\n", task->name); talloc_zfree(task->timer); task->enabled = false; @@ -377,7 +377,7 @@ be_ptask_sync_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct be_ptask_sync_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } diff --git a/src/providers/dp_refresh.c b/src/providers/dp_refresh.c index c368668e1..109fdc3c0 100644 --- a/src/providers/dp_refresh.c +++ b/src/providers/dp_refresh.c @@ -71,7 +71,7 @@ static errno_t be_refresh_get_values(TALLOC_CTX *mem_ctx, ret = sysdb_msg2attrs(tmp_ctx, count, msgs, &records); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not convert ldb message to sysdb_attrs\n")); + "Could not convert ldb message to sysdb_attrs\n"); goto done; } @@ -191,7 +191,7 @@ struct tevent_req *be_refresh_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct be_refresh_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -208,8 +208,8 @@ struct tevent_req *be_refresh_send(TALLOC_CTX *mem_ctx, if (ret == EOK) { goto immediately; } else if (ret != EAGAIN) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_refresh_step() failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "be_refresh_step() failed [%d]: %s\n", + ret, sss_strerror(ret)); goto immediately; } @@ -255,8 +255,8 @@ static errno_t be_refresh_step(struct tevent_req *req) ret = state->cb->get_values(state, state->be_ctx->domain, state->period, &values); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to obtain DN list [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to obtain DN list [%d]: %s\n", + ret, sss_strerror(ret)); goto done; } diff --git a/src/providers/fail_over.c b/src/providers/fail_over.c index 98c200659..e8d49039a 100644 --- a/src/providers/fail_over.c +++ b/src/providers/fail_over.c @@ -140,12 +140,12 @@ fo_context_init(TALLOC_CTX *mem_ctx, struct fo_options *opts) ctx = talloc_zero(mem_ctx, struct fo_ctx); if (ctx == NULL) { - DEBUG(1, ("No memory\n")); + DEBUG(1, "No memory\n"); return NULL; } ctx->opts = talloc_zero(ctx, struct fo_options); if (ctx->opts == NULL) { - DEBUG(1, ("No memory\n")); + DEBUG(1, "No memory\n"); return NULL; } @@ -155,8 +155,8 @@ fo_context_init(TALLOC_CTX *mem_ctx, struct fo_options *opts) ctx->opts->service_resolv_timeout = opts->service_resolv_timeout; DEBUG(SSSDBG_TRACE_FUNC, - ("Created new fail over context, retry timeout is %ld\n", - ctx->opts->retry_timeout)); + "Created new fail over context, retry timeout is %ld\n", + ctx->opts->retry_timeout); return ctx; } @@ -223,8 +223,8 @@ collapse_srv_lookup(struct fo_server **_server) server = *_server; meta = server->srv_data->meta; - DEBUG(4, ("Need to refresh SRV lookup for domain %s\n", - meta->srv_data->dns_domain)); + DEBUG(4, "Need to refresh SRV lookup for domain %s\n", + meta->srv_data->dns_domain); if (server != meta) { while (server->prev && server->prev->srv_data == meta->srv_data) { @@ -282,7 +282,7 @@ get_srv_data_status(struct srv_data *data) data->last_status_change.tv_sec = 0; break; default: - DEBUG(1, ("Unknown state for SRV server!\n")); + DEBUG(1, "Unknown state for SRV server!\n"); } } @@ -292,8 +292,8 @@ get_srv_data_status(struct srv_data *data) static void set_srv_data_status(struct srv_data *data, enum srv_lookup_status status) { - DEBUG(4, ("Marking SRV lookup of service '%s' as '%s'\n", - data->meta->service->name, str_srv_data_status(status))); + DEBUG(4, "Marking SRV lookup of service '%s' as '%s'\n", + data->meta->service->name, str_srv_data_status(status)); gettimeofday(&data->last_status_change, NULL); data->srv_lookup_status = status; @@ -312,15 +312,15 @@ get_server_status(struct fo_server *server) if (server->common == NULL) return SERVER_NAME_RESOLVED; - DEBUG(7, ("Status of server '%s' is '%s'\n", SERVER_NAME(server), - str_server_status(server->common->server_status))); + DEBUG(7, "Status of server '%s' is '%s'\n", SERVER_NAME(server), + str_server_status(server->common->server_status)); timeout = server->service->ctx->opts->retry_timeout; gettimeofday(&tv, NULL); if (timeout != 0 && server->common->server_status == SERVER_NOT_WORKING) { if (STATUS_DIFF(server->common, tv) > timeout) { - DEBUG(4, ("Reseting the server status of '%s'\n", - SERVER_NAME(server))); + DEBUG(4, "Reseting the server status of '%s'\n", + SERVER_NAME(server)); server->common->server_status = SERVER_NAME_NOT_RESOLVED; server->common->last_status_change.tv_sec = tv.tv_sec; } @@ -328,8 +328,8 @@ get_server_status(struct fo_server *server) if (server->common->rhostent && STATUS_DIFF(server->common, tv) > server->common->rhostent->addr_list[0]->ttl) { - DEBUG(4, ("Hostname resolution expired, resetting the server " - "status of '%s'\n", SERVER_NAME(server))); + DEBUG(4, "Hostname resolution expired, resetting the server " + "status of '%s'\n", SERVER_NAME(server)); fo_set_server_status(server, SERVER_NAME_NOT_RESOLVED); } @@ -346,15 +346,15 @@ get_port_status(struct fo_server *server) struct timeval tv; time_t timeout; - DEBUG(7, ("Port status of port %d for server '%s' is '%s'\n", server->port, - SERVER_NAME(server), str_port_status(server->port_status))); + DEBUG(7, "Port status of port %d for server '%s' is '%s'\n", server->port, + SERVER_NAME(server), str_port_status(server->port_status)); timeout = server->service->ctx->opts->retry_timeout; if (timeout != 0 && server->port_status == PORT_NOT_WORKING) { gettimeofday(&tv, NULL); if (STATUS_DIFF(server, tv) > timeout) { - DEBUG(4, ("Reseting the status of port %d for server '%s'\n", - server->port, SERVER_NAME(server))); + DEBUG(4, "Reseting the status of port %d for server '%s'\n", + server->port, SERVER_NAME(server)); server->port_status = PORT_NEUTRAL; server->last_status_change.tv_sec = tv.tv_sec; } @@ -398,10 +398,10 @@ fo_new_service(struct fo_ctx *ctx, const char *name, struct fo_service *service; int ret; - DEBUG(SSSDBG_TRACE_FUNC, ("Creating new service '%s'\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Creating new service '%s'\n", name); ret = fo_get_service(ctx, name, &service); if (ret == EOK) { - DEBUG(5, ("Service '%s' already exists\n", name)); + DEBUG(5, "Service '%s' already exists\n", name); if (_service) { *_service = service; } @@ -473,7 +473,7 @@ static int server_common_destructor(void *memptr) common = talloc_get_type(memptr, struct server_common); if (common->request_list) { - DEBUG(1, ("BUG: pending requests still associated with this server\n")); + DEBUG(1, "BUG: pending requests still associated with this server\n"); return -1; } DLIST_REMOVE(common->ctx->server_common_list, common); @@ -518,8 +518,8 @@ fo_add_srv_server(struct fo_service *service, const char *srv, struct fo_server *server; DEBUG(SSSDBG_TRACE_FUNC, - ("Adding new SRV server to service '%s' using '%s'.\n", - service->name, proto)); + "Adding new SRV server to service '%s' using '%s'.\n", + service->name, proto); DLIST_FOR_EACH(server, service->server_list) { /* Compare user data only if user_data_cmp and both arguments @@ -713,16 +713,16 @@ static errno_t fo_add_server_to_list(struct fo_server **to_list, server->user_data); if (exists) { - DEBUG(SSSDBG_TRACE_FUNC, ("Server '%s:%d' for service '%s' " - "is already present\n", debug_name, server->port, service_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Server '%s:%d' for service '%s' " + "is already present\n", debug_name, server->port, service_name); return EEXIST; } DLIST_ADD_END(*to_list, server, struct fo_server *); - DEBUG(SSSDBG_TRACE_FUNC, ("Inserted %s server '%s:%d' to service " + DEBUG(SSSDBG_TRACE_FUNC, "Inserted %s server '%s:%d' to service " "'%s'\n", (server->primary ? "primary" : "backup"), - debug_name, server->port, service_name)); + debug_name, server->port, service_name); return EOK; } @@ -879,7 +879,7 @@ set_lookup_hook(struct fo_server *server, struct tevent_req *req) request = talloc(req, struct resolve_service_request); if (request == NULL) { - DEBUG(1, ("No memory\n")); + DEBUG(1, "No memory\n"); talloc_free(request); return ENOMEM; } @@ -936,7 +936,7 @@ fo_resolve_service_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct tevent_req *subreq; struct resolve_service_state *state; - DEBUG(4, ("Trying to resolve service '%s'\n", service->name)); + DEBUG(4, "Trying to resolve service '%s'\n", service->name); req = tevent_req_create(mem_ctx, &state, struct resolve_service_state); if (req == NULL) return NULL; @@ -947,7 +947,7 @@ fo_resolve_service_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, ret = get_first_server_entity(service, &server); if (ret != EOK) { - DEBUG(1, ("No available servers for service '%s'\n", service->name)); + DEBUG(1, "No available servers for service '%s'\n", service->name); goto done; } @@ -955,7 +955,7 @@ fo_resolve_service_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, ret = fo_resolve_service_activate_timeout(req, ev, ctx->opts->service_resolv_timeout); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set service timeout\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not set service timeout\n"); goto done; } @@ -999,7 +999,7 @@ fo_resolve_service_timeout(struct tevent_context *ev, { struct tevent_req *req = talloc_get_type(pvt, struct tevent_req); - DEBUG(SSSDBG_MINOR_FAILURE, ("Service resolving timeout reached\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Service resolving timeout reached\n"); tevent_req_error(req, ETIMEDOUT); } @@ -1017,12 +1017,12 @@ fo_resolve_service_activate_timeout(struct tevent_req *req, state->timeout_handler = tevent_add_timer(ev, state, tv, fo_resolve_service_timeout, req); if (state->timeout_handler == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_add_timer failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_add_timer failed.\n"); return ENOMEM; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Resolve timeout set to %lu seconds\n", - timeout_seconds)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Resolve timeout set to %lu seconds\n", + timeout_seconds); return EOK; } @@ -1105,9 +1105,9 @@ fo_resolve_service_done(struct tevent_req *subreq) &common->rhostent); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(1, ("Failed to resolve server '%s': %s\n", + DEBUG(1, "Failed to resolve server '%s': %s\n", common->name, - resolv_strerror(resolv_status))); + resolv_strerror(resolv_status)); /* If the resolver failed to resolve a hostname but did not * encounter an error, tell the caller to retry another server. * @@ -1189,8 +1189,8 @@ resolve_srv_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, state->meta = server->srv_data->meta; status = get_srv_data_status(server->srv_data); - DEBUG(SSSDBG_FUNC_DATA, ("The status of SRV lookup is %s\n", - str_srv_data_status(status))); + DEBUG(SSSDBG_FUNC_DATA, "The status of SRV lookup is %s\n", + str_srv_data_status(status)); switch(status) { case SRV_EXPIRED: /* Need a refresh */ state->meta = collapse_srv_lookup(&server); @@ -1207,7 +1207,7 @@ resolve_srv_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, } if (ctx->srv_send_fn == NULL || ctx->srv_recv_fn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("No SRV lookup plugin is set\n")); + DEBUG(SSSDBG_OP_FAILURE, "No SRV lookup plugin is set\n"); ret = ENOTSUP; goto done; } @@ -1234,7 +1234,7 @@ resolve_srv_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, tevent_req_post(req, state->ev); return req; default: - DEBUG(1, ("Unexpected status %d for a SRV server\n", status)); + DEBUG(1, "Unexpected status %d for a SRV server\n", status); ret = EIO; goto done; } @@ -1271,8 +1271,8 @@ resolve_srv_done(struct tevent_req *subreq) case EOK: if ((num_primary_servers == 0 || primary_servers == NULL) && (num_backup_servers == 0 || backup_servers == NULL)) { - DEBUG(SSSDBG_CRIT_FAILURE, ("SRV lookup plugin returned EOK but " - "no servers\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "SRV lookup plugin returned EOK but " + "no servers\n"); ret = EFAULT; goto done; } @@ -1308,8 +1308,8 @@ resolve_srv_done(struct tevent_req *subreq) if (last_server == state->meta) { /* SRV lookup returned only those servers * that are already present. */ - DEBUG(SSSDBG_TRACE_FUNC, ("SRV lookup did not return " - "any new server.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "SRV lookup did not return " + "any new server.\n"); ret = ERR_SRV_DUPLICATES; goto done; } @@ -1318,7 +1318,7 @@ resolve_srv_done(struct tevent_req *subreq) * We will return the first new server. */ if (state->meta->next == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("BUG: state->meta->next is NULL\n")); + "BUG: state->meta->next is NULL\n"); ret = ERR_INTERNAL; goto done; } @@ -1341,8 +1341,8 @@ resolve_srv_done(struct tevent_req *subreq) fo_set_port_status(state->meta, PORT_NOT_WORKING); /* fall through */ default: - DEBUG(SSSDBG_OP_FAILURE, ("Unable to resolve SRV [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to resolve SRV [%d]: %s\n", + ret, sss_strerror(ret)); } done: @@ -1385,8 +1385,8 @@ static void set_server_common_status(struct server_common *common, enum server_status status) { - DEBUG(4, ("Marking server '%s' as '%s'\n", common->name, - str_server_status(status))); + DEBUG(4, "Marking server '%s' as '%s'\n", common->name, + str_server_status(status)); common->server_status = status; gettimeofday(&common->last_status_change, NULL); @@ -1396,7 +1396,7 @@ void fo_set_server_status(struct fo_server *server, enum server_status status) { if (server->common == NULL) { - DEBUG(1, ("Bug: Trying to set server status of a name-less server\n")); + DEBUG(1, "Bug: Trying to set server status of a name-less server\n"); return; } @@ -1408,8 +1408,8 @@ fo_set_port_status(struct fo_server *server, enum port_status status) { struct fo_server *siter; - DEBUG(4, ("Marking port %d of server '%s' as '%s'\n", server->port, - SERVER_NAME(server), str_port_status(status))); + DEBUG(4, "Marking port %d of server '%s' as '%s'\n", server->port, + SERVER_NAME(server), str_port_status(status)); server->port_status = status; gettimeofday(&server->last_status_change, NULL); @@ -1426,9 +1426,9 @@ fo_set_port_status(struct fo_server *server, enum port_status status) DLIST_FOR_EACH(siter, server->service->server_list) { if (fo_server_cmp(siter, server)) { DEBUG(SSSDBG_TRACE_FUNC, - ("Marking port %d of duplicate server '%s' as '%s'\n", + "Marking port %d of duplicate server '%s' as '%s'\n", siter->port, SERVER_NAME(siter), - str_port_status(status))); + str_port_status(status)); siter->port_status = status; gettimeofday(&siter->last_status_change, NULL); } @@ -1440,7 +1440,7 @@ void fo_try_next_server(struct fo_service *service) struct fo_server *server; if (!service) { - DEBUG(1, ("Bug: No service supplied\n")); + DEBUG(1, "Bug: No service supplied\n"); return; } @@ -1493,7 +1493,7 @@ struct resolv_hostent * fo_get_server_hostent(struct fo_server *server) { if (server->common == NULL) { - DEBUG(1, ("Bug: Trying to get hostent from a name-less server\n")); + DEBUG(1, "Bug: Trying to get hostent from a name-less server\n"); return NULL; } @@ -1559,12 +1559,12 @@ bool fo_set_srv_lookup_plugin(struct fo_ctx *ctx, void *pvt) { if (ctx == NULL || send_fn == NULL || recv_fn == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid parameters\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid parameters\n"); return false; } if (ctx->srv_send_fn != NULL || ctx->srv_recv_fn != NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("SRV lookup plugin is already set\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "SRV lookup plugin is already set\n"); return false; } diff --git a/src/providers/fail_over_srv.c b/src/providers/fail_over_srv.c index c27416899..1b99f3150 100644 --- a/src/providers/fail_over_srv.c +++ b/src/providers/fail_over_srv.c @@ -48,7 +48,7 @@ struct tevent_req *fo_discover_srv_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct fo_discover_srv_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -95,13 +95,13 @@ static void fo_discover_srv_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got answer. Processing...\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Got answer. Processing...\n"); /* sort and store the answer */ ret = resolv_sort_srv_reply(&reply_list); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not sort the answers from DNS " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not sort the answers from DNS " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -110,7 +110,7 @@ static void fo_discover_srv_done(struct tevent_req *subreq) state->num_servers++; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got %zu servers\n", state->num_servers)); + DEBUG(SSSDBG_TRACE_FUNC, "Got %zu servers\n", state->num_servers); state->servers = talloc_array(state, struct fo_server_info, state->num_servers); @@ -201,7 +201,7 @@ struct tevent_req *fo_discover_servers_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct fo_discover_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; } @@ -248,7 +248,7 @@ struct tevent_req *fo_discover_servers_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_FUNC, ("Looking up primary servers\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Looking up primary servers\n"); domains = talloc_zero_array(state, const char *, 3); if (domains == NULL) { @@ -293,8 +293,8 @@ static void fo_discover_servers_primary_done(struct tevent_req *subreq) &state->num_primary_servers); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to retrieve primary servers " - "[%d]: %s\n", ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to retrieve primary servers " + "[%d]: %s\n", ret, sss_strerror(ret)); if (ret != ERR_SRV_NOT_FOUND && ret != ERR_SRV_LOOKUP_ERROR) { /* abort on system error */ goto done; @@ -303,7 +303,7 @@ static void fo_discover_servers_primary_done(struct tevent_req *subreq) if (state->backup_domain == NULL) { /* if there is no backup domain, we are done */ - DEBUG(SSSDBG_TRACE_FUNC, ("No backup domain specified\n")); + DEBUG(SSSDBG_TRACE_FUNC, "No backup domain specified\n"); goto done; } @@ -320,7 +320,7 @@ static void fo_discover_servers_primary_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Looking up backup servers\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Looking up backup servers\n"); domains = talloc_zero_array(state, const char *, 2); if (domains == NULL) { @@ -365,8 +365,8 @@ static void fo_discover_servers_backup_done(struct tevent_req *subreq) &state->num_backup_servers); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to retrieve backup servers " - "[%d]: %s\n", ret, sss_strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to retrieve backup servers " + "[%d]: %s\n", ret, sss_strerror(ret)); if (ret == ERR_SRV_NOT_FOUND || ret == ERR_SRV_LOOKUP_ERROR) { /* we have successfully fetched primary servers, so we will * finish the request normally on non system error */ @@ -495,7 +495,7 @@ struct tevent_req *fo_resolve_srv_dns_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct fo_resolve_srv_dns_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index 704419484..e75a70d67 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -152,7 +152,7 @@ static void ipa_hbac_check(struct tevent_req *req) hbac_ctx = talloc_zero(be_req, struct hbac_ctx); if (hbac_ctx == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); ret = ENOMEM; goto fail; } @@ -167,7 +167,7 @@ static void ipa_hbac_check(struct tevent_req *req) hbac_ctx->tr_ctx = ipa_access_ctx->tr_ctx; hbac_ctx->search_bases = ipa_access_ctx->hbac_search_bases; if (hbac_ctx->search_bases == NULL) { - DEBUG(1, ("No HBAC search base found.\n")); + DEBUG(1, "No HBAC search base found.\n"); ret = EINVAL; goto fail; } @@ -206,7 +206,7 @@ static int hbac_retry(struct hbac_ctx *hbac_ctx) struct be_ctx *be_ctx = be_req_get_be_ctx(hbac_ctx->be_req); offline = be_is_offline(be_ctx); - DEBUG(9, ("Connection status is [%s].\n", offline ? "offline" : "online")); + DEBUG(9, "Connection status is [%s].\n", offline ? "offline" : "online"); refresh_interval = dp_opt_get_int(hbac_ctx->ipa_options, IPA_HBAC_REFRESH); @@ -214,7 +214,7 @@ static int hbac_retry(struct hbac_ctx *hbac_ctx) now = time(NULL); if (now < access_ctx->last_update + refresh_interval) { /* Simulate offline mode and just go to the cache */ - DEBUG(6, ("Performing cached HBAC evaluation\n")); + DEBUG(6, "Performing cached HBAC evaluation\n"); offline = true; } @@ -223,14 +223,14 @@ static int hbac_retry(struct hbac_ctx *hbac_ctx) hbac_ctx->sdap_op = sdap_id_op_create(hbac_ctx, hbac_ctx->sdap_ctx->conn->conn_cache); if (hbac_ctx->sdap_op == NULL) { - DEBUG(1, ("sdap_id_op_create failed.\n")); + DEBUG(1, "sdap_id_op_create failed.\n"); return EIO; } } subreq = sdap_id_op_connect_send(hbac_ctx->sdap_op, hbac_ctx, &ret); if (!subreq) { - DEBUG(1, ("sdap_id_op_connect_send failed: %d(%s).\n", ret, strerror(ret))); + DEBUG(1, "sdap_id_op_connect_send failed: %d(%s).\n", ret, strerror(ret)); talloc_zfree(hbac_ctx->sdap_op); return ret; } @@ -367,7 +367,7 @@ static int hbac_get_host_info_step(struct hbac_ctx *hbac_ctx) hbac_ctx->access_ctx->hostgroup_map, hbac_ctx->access_ctx->host_search_bases); if (req == NULL) { - DEBUG(1, ("Could not get host info\n")); + DEBUG(1, "Could not get host info\n"); return ENOMEM; } tevent_req_set_callback(req, hbac_get_service_info_step, hbac_ctx); @@ -398,7 +398,7 @@ static void hbac_get_service_info_step(struct tevent_req *req) hbac_ctx->sdap_ctx->opts, hbac_ctx->search_bases); if (req == NULL) { - DEBUG(1,("Could not get service info\n")); + DEBUG(1,"Could not get service info\n"); goto fail; } tevent_req_set_callback(req, hbac_get_rule_info_step, hbac_ctx); @@ -432,7 +432,7 @@ static void hbac_get_rule_info_step(struct tevent_req *req) hbac_ctx->ipa_host = NULL; ipa_hostname = dp_opt_get_cstring(hbac_ctx->ipa_options, IPA_HOSTNAME); if (ipa_hostname == NULL) { - DEBUG(1, ("Missing ipa_hostname, this should never happen.\n")); + DEBUG(1, "Missing ipa_hostname, this should never happen.\n"); goto fail; } @@ -441,7 +441,7 @@ static void hbac_get_rule_info_step(struct tevent_req *req) SYSDB_FQDN, &hostname); if (ret != EOK) { - DEBUG(1, ("Could not locate IPA host\n")); + DEBUG(1, "Could not locate IPA host\n"); goto fail; } @@ -451,7 +451,7 @@ static void hbac_get_rule_info_step(struct tevent_req *req) } } if (hbac_ctx->ipa_host == NULL) { - DEBUG(1, ("Could not locate IPA host\n")); + DEBUG(1, "Could not locate IPA host\n"); goto fail; } @@ -465,7 +465,7 @@ static void hbac_get_rule_info_step(struct tevent_req *req) hbac_ctx->search_bases, hbac_ctx->ipa_host); if (req == NULL) { - DEBUG(1, ("Could not get rules\n")); + DEBUG(1, "Could not get rules\n"); goto fail; } @@ -518,7 +518,7 @@ static void hbac_sysdb_save(struct tevent_req *req) ret = sysdb_delete_recursive(domain->sysdb, base_dn, true); talloc_free(tmp_ctx); if (ret != EOK) { - DEBUG(1, ("sysdb_delete_recursive failed.\n")); + DEBUG(1, "sysdb_delete_recursive failed.\n"); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); return; } @@ -534,7 +534,7 @@ static void hbac_sysdb_save(struct tevent_req *req) ret = sysdb_transaction_start(domain->sysdb); if (ret != EOK) { - DEBUG(0, ("Could not start transaction\n")); + DEBUG(0, "Could not start transaction\n"); goto fail; } in_transaction = true; @@ -547,8 +547,8 @@ static void hbac_sysdb_save(struct tevent_req *req) hbac_ctx->hostgroup_count, hbac_ctx->hostgroups); if (ret != EOK) { - DEBUG(1, ("Error saving hosts: [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Error saving hosts: [%d][%s]\n", + ret, strerror(ret)); goto fail; } @@ -560,8 +560,8 @@ static void hbac_sysdb_save(struct tevent_req *req) hbac_ctx->servicegroup_count, hbac_ctx->servicegroups); if (ret != EOK) { - DEBUG(1, ("Error saving services: [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Error saving services: [%d][%s]\n", + ret, strerror(ret)); goto fail; } /* Save the rules */ @@ -571,14 +571,14 @@ static void hbac_sysdb_save(struct tevent_req *req) hbac_ctx->rules, NULL, NULL, 0, NULL); if (ret != EOK) { - DEBUG(1, ("Error saving rules: [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Error saving rules: [%d][%s]\n", + ret, strerror(ret)); goto fail; } ret = sysdb_transaction_commit(domain->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -601,7 +601,7 @@ fail: if (in_transaction) { ret = sysdb_transaction_cancel(domain->sysdb); if (ret != EOK) { - DEBUG(0, ("Could not cancel transaction\n")); + DEBUG(0, "Could not cancel transaction\n"); } } ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); @@ -620,43 +620,43 @@ void ipa_hbac_evaluate_rules(struct hbac_ctx *hbac_ctx) ret = hbac_get_cached_rules(hbac_ctx, be_ctx->domain, &hbac_ctx->rule_count, &hbac_ctx->rules); if (ret != EOK) { - DEBUG(1, ("Could not retrieve rules from the cache\n")); + DEBUG(1, "Could not retrieve rules from the cache\n"); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); } ret = hbac_ctx_to_rules(hbac_ctx, hbac_ctx, &hbac_rules, &eval_req); if (ret == EPERM) { - DEBUG(1, ("DENY rules detected. Denying access to all users\n")); + DEBUG(1, "DENY rules detected. Denying access to all users\n"); ipa_access_reply(hbac_ctx, PAM_PERM_DENIED); return; } else if (ret != EOK) { - DEBUG(1, ("Could not construct HBAC rules\n")); + DEBUG(1, "Could not construct HBAC rules\n"); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); return; } result = hbac_evaluate(hbac_rules, eval_req, &info); if (result == HBAC_EVAL_ALLOW) { - DEBUG(3, ("Access granted by HBAC rule [%s]\n", - info->rule_name)); + DEBUG(3, "Access granted by HBAC rule [%s]\n", + info->rule_name); hbac_free_info(info); ipa_access_reply(hbac_ctx, PAM_SUCCESS); return; } else if (result == HBAC_EVAL_ERROR) { - DEBUG(1, ("Error [%s] occurred in rule [%s]\n", + DEBUG(1, "Error [%s] occurred in rule [%s]\n", hbac_error_string(info->code), - info->rule_name)); + info->rule_name); hbac_free_info(info); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); return; } else if (result == HBAC_EVAL_OOM) { - DEBUG(1, ("Insufficient memory\n")); + DEBUG(1, "Insufficient memory\n"); ipa_access_reply(hbac_ctx, PAM_SYSTEM_ERR); return; } - DEBUG(3, ("Access denied by HBAC rules\n")); + DEBUG(3, "Access denied by HBAC rules\n"); hbac_free_info(info); ipa_access_reply(hbac_ctx, PAM_PERM_DENIED); } @@ -702,7 +702,7 @@ errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx, HBAC_RULES_SUBDIR, attrs, &rule_count, &msgs); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("Error looking up HBAC rules")); + DEBUG(1, "Error looking up HBAC rules"); goto done; } if (ret == ENOENT) { rule_count = 0; @@ -710,7 +710,7 @@ errno_t hbac_get_cached_rules(TALLOC_CTX *mem_ctx, ret = sysdb_msg2attrs(tmp_ctx, rule_count, msgs, &rules); if (ret != EOK) { - DEBUG(1, ("Could not convert ldb message to sysdb_attrs\n")); + DEBUG(1, "Could not convert ldb message to sysdb_attrs\n"); goto done; } diff --git a/src/providers/ipa/ipa_auth.c b/src/providers/ipa/ipa_auth.c index 651196a96..4d5821601 100644 --- a/src/providers/ipa/ipa_auth.c +++ b/src/providers/ipa/ipa_auth.c @@ -54,14 +54,14 @@ static struct tevent_req *get_password_migration_flag_send(TALLOC_CTX *memctx, struct get_password_migration_flag_state *state; if (sdap_id_ctx == NULL || ipa_realm == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Missing parameter.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Missing parameter.\n"); return NULL; } req = tevent_req_create(memctx, &state, struct get_password_migration_flag_state); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("tevent_req_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "tevent_req_create failed.\n"); return NULL; } @@ -74,14 +74,14 @@ static struct tevent_req *get_password_migration_flag_send(TALLOC_CTX *memctx, state->sdap_op = sdap_id_op_create(state, state->sdap_id_ctx->conn->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"); goto fail; } subreq = sdap_id_op_connect_send(state->sdap_op, state, &ret); if (!subreq) { - 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; } @@ -107,12 +107,12 @@ static void get_password_migration_flag_auth_done(struct tevent_req *subreq) if (ret) { if (dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No IPA server is available, cannot get the " - "migration flag while offline\n")); + "No IPA server is available, cannot get the " + "migration flag while offline\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to IPA server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to connect to IPA server: [%d](%s)\n", + ret, strerror(ret)); } tevent_req_error(req, ret); @@ -194,7 +194,7 @@ void ipa_auth(struct be_req *be_req) state = talloc_zero(be_req, struct ipa_auth_state); if (state == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed.\n"); goto fail; } @@ -219,14 +219,14 @@ void ipa_auth(struct be_req *be_req) struct ipa_auth_ctx); break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Unsupported PAM task.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unsupported PAM task.\n"); goto fail; } req = krb5_auth_send(state, state->ev, be_ctx, state->pd, state->ipa_auth_ctx->krb5_auth_ctx); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_auth_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_auth_send failed.\n"); goto fail; } @@ -251,7 +251,7 @@ static void ipa_auth_handler_done(struct tevent_req *req) talloc_zfree(req); state->pd->pam_status = pam_status; if (ret != EOK && pam_status != PAM_CRED_ERR) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_auth_recv request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_auth_recv request failed.\n"); dp_err = DP_ERR_OK; goto done; } @@ -270,7 +270,7 @@ static void ipa_auth_handler_done(struct tevent_req *req) IPA_KRB5_REALM)); if (req == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("get_password_migration_flag failed.\n")); + "get_password_migration_flag failed.\n"); goto done; } @@ -293,8 +293,8 @@ static void ipa_get_migration_flag_done(struct tevent_req *req) &state->password_migration); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("get_password_migration_flag " - "request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "get_password_migration_flag " + "request failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; dp_err = DP_ERR_OK; goto done; @@ -307,7 +307,7 @@ static void ipa_get_migration_flag_done(struct tevent_req *req) state->ipa_auth_ctx->sdap_auth_ctx->service, true, CON_TLS_ON, true); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_cli_connect_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_cli_connect_send failed.\n"); goto done; } @@ -315,7 +315,7 @@ static void ipa_get_migration_flag_done(struct tevent_req *req) return; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Password migration is not enabled.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Password migration is not enabled.\n"); dp_err = DP_ERR_OK; done: be_req_terminate(state->be_req, dp_err, state->pd->pam_status, NULL); @@ -336,17 +336,17 @@ static void ipa_migration_flag_connect_done(struct tevent_req *req) talloc_zfree(req); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot connect to LDAP server to perform migration\n")); + "Cannot connect to LDAP server to perform migration\n"); goto done; } state->pd->pam_status = PAM_SYSTEM_ERR; - DEBUG(SSSDBG_TRACE_FUNC, ("Assuming Kerberos password is missing, " - "starting password migration.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Assuming Kerberos password is missing, " + "starting password migration.\n"); attrs = talloc_array(state, const char *, 2); if (attrs == NULL) { - DEBUG(1, ("talloc_array failed.\n")); + DEBUG(1, "talloc_array failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; dp_err = DP_ERR_OK; goto done; @@ -358,14 +358,14 @@ static void ipa_migration_flag_connect_done(struct tevent_req *req) be_ctx->domain, state->pd->user, attrs, &user_msg); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_search_user_by_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_search_user_by_name failed.\n"); goto done; } dn = ldb_msg_find_attr_as_string(user_msg, SYSDB_ORIG_DN, NULL); if (dn == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Missing original DN for user [%s].\n", - state->pd->user)); + DEBUG(SSSDBG_MINOR_FAILURE, "Missing original DN for user [%s].\n", + state->pd->user); state->pd->pam_status = PAM_SYSTEM_ERR; dp_err = DP_ERR_OK; goto done; @@ -374,7 +374,7 @@ static void ipa_migration_flag_connect_done(struct tevent_req *req) req = sdap_auth_send(state, state->ev, state->sh, NULL, NULL, dn, state->pd->authtok); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_auth_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_auth_send failed.\n"); goto done; } @@ -403,26 +403,26 @@ static void ipa_auth_ldap_done(struct tevent_req *req) case ERR_AUTH_FAILED: case ERR_PASSWORD_EXPIRED: /* TODO: do we need to handle expired passwords? */ - DEBUG(SSSDBG_MINOR_FAILURE, ("LDAP authentication failed, " - "Password migration not possible.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "LDAP authentication failed, " + "Password migration not possible.\n"); state->pd->pam_status = PAM_CRED_INSUFFICIENT; dp_err = DP_ERR_OK; goto done; default: - DEBUG(SSSDBG_OP_FAILURE, ("auth_send request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "auth_send request failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; dp_err = DP_ERR_OK; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("LDAP authentication succeded, " - "trying Kerberos authentication again.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "LDAP authentication succeded, " + "trying Kerberos authentication again.\n"); req = krb5_auth_send(state, state->ev, be_ctx, state->pd, state->ipa_auth_ctx->krb5_auth_ctx); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_auth_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_auth_send failed.\n"); goto done; } @@ -444,7 +444,7 @@ static void ipa_auth_handler_retry_done(struct tevent_req *req) ret = krb5_auth_recv(req, &pam_status, &dp_err); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_auth_recv request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_auth_recv request failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; dp_err = DP_ERR_OK; goto done; diff --git a/src/providers/ipa/ipa_autofs.c b/src/providers/ipa/ipa_autofs.c index de343212f..504735d3e 100644 --- a/src/providers/ipa/ipa_autofs.c +++ b/src/providers/ipa/ipa_autofs.c @@ -44,7 +44,7 @@ int ipa_autofs_init(struct be_ctx *be_ctx, { int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing autofs LDAP back end\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing autofs LDAP back end\n"); *ops = &ipa_autofs_ops; *pvt_data = id_ctx->sdap_id_ctx; @@ -52,7 +52,7 @@ int ipa_autofs_init(struct be_ctx *be_ctx, ret = ipa_get_autofs_options(id_ctx->ipa_options, be_ctx->cdb, be_ctx->conf_path, &id_ctx->sdap_id_ctx->opts); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot get IPA autofs options\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get IPA autofs options\n"); return ret; } diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index d4db1549b..d96288b6b 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -73,20 +73,20 @@ int ipa_get_options(TALLOC_CTX *memctx, server = dp_opt_get_string(opts->basic, IPA_SERVER); if (!server) { - DEBUG(1, ("No ipa server set, will use service discovery!\n")); + DEBUG(1, "No ipa server set, will use service discovery!\n"); } ipa_hostname = dp_opt_get_string(opts->basic, IPA_HOSTNAME); if (ipa_hostname == NULL) { ret = gethostname(hostname, HOST_NAME_MAX); if (ret != EOK) { - DEBUG(1, ("gethostname failed [%d][%s].\n", errno, - strerror(errno))); + DEBUG(1, "gethostname failed [%d][%s].\n", errno, + strerror(errno)); ret = errno; goto done; } hostname[HOST_NAME_MAX] = '\0'; - DEBUG(9, ("Setting ipa_hostname to [%s].\n", hostname)); + DEBUG(9, "Setting ipa_hostname to [%s].\n", hostname); ret = dp_opt_set_string(opts->basic, IPA_HOSTNAME, hostname); if (ret != EOK) { goto done; @@ -150,7 +150,7 @@ static errno_t ipa_parse_search_base(TALLOC_CTX *mem_ctx, break; default: DEBUG(SSSDBG_CONF_SETTINGS, - ("Unknown search base type: [%d]\n", class)); + "Unknown search base type: [%d]\n", class); class_name = "UNKNOWN"; /* Non-fatal */ break; @@ -224,9 +224,9 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_SEARCH_BASE].opt_name, - dp_opt_get_string(ipa_opts->id->basic, SDAP_SEARCH_BASE))); + dp_opt_get_string(ipa_opts->id->basic, SDAP_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SEARCH_BASE, @@ -238,7 +238,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, realm = dp_opt_get_string(ipa_opts->basic, IPA_KRB5_REALM); value = talloc_strdup(tmpctx, realm); if (value == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -247,9 +247,9 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, if (ret != EOK) { goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_KRB5_REALM].opt_name, - dp_opt_get_string(ipa_opts->id->basic, SDAP_KRB5_REALM))); + dp_opt_get_string(ipa_opts->id->basic, SDAP_KRB5_REALM)); } ret = sdap_set_sasl_options(ipa_opts->id, @@ -260,7 +260,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, dp_opt_get_string(ipa_opts->id->basic, SDAP_KRB5_KEYTAB)); 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; } @@ -277,10 +277,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_USER_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_USER_SEARCH_BASE))); + SDAP_USER_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_USER_SEARCH_BASE, @@ -296,10 +296,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_GROUP_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_GROUP_SEARCH_BASE))); + SDAP_GROUP_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_GROUP_SEARCH_BASE, @@ -334,10 +334,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, } #endif - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_SUDO_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_SUDO_SEARCH_BASE))); + SDAP_SUDO_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SUDO_SEARCH_BASE, @@ -357,10 +357,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_NETGROUP_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_NETGROUP_SEARCH_BASE))); + SDAP_NETGROUP_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_NETGROUP_SEARCH_BASE, @@ -376,10 +376,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->basic[IPA_HOST_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_HOST_SEARCH_BASE))); + IPA_HOST_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts->basic, ipa_opts->basic, IPA_HOST_SEARCH_BASE, @@ -399,10 +399,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->basic[IPA_HBAC_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_HBAC_SEARCH_BASE))); + IPA_HBAC_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts->basic, ipa_opts->basic, IPA_HBAC_SEARCH_BASE, @@ -422,10 +422,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->basic[IPA_SELINUX_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_SELINUX_SEARCH_BASE))); + IPA_SELINUX_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts->basic, ipa_opts->basic, IPA_SELINUX_SEARCH_BASE, @@ -436,7 +436,7 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, if (value != NULL) { ret = deref_string_to_val(value, &i); if (ret != EOK) { - DEBUG(1, ("Failed to verify ldap_deref option.\n")); + DEBUG(1, "Failed to verify ldap_deref option.\n"); goto done; } } @@ -450,10 +450,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_GROUP_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_GROUP_SEARCH_BASE))); + SDAP_GROUP_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_SERVICE_SEARCH_BASE, @@ -473,10 +473,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->basic[IPA_SUBDOMAINS_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_SUBDOMAINS_SEARCH_BASE))); + IPA_SUBDOMAINS_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts, ipa_opts->basic, IPA_SUBDOMAINS_SEARCH_BASE, @@ -496,10 +496,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->basic[IPA_MASTER_DOMAIN_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_MASTER_DOMAIN_SEARCH_BASE))); + IPA_MASTER_DOMAIN_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts, ipa_opts->basic, IPA_MASTER_DOMAIN_SEARCH_BASE, @@ -519,10 +519,10 @@ int ipa_get_id_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->basic[IPA_RANGES_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->basic, - IPA_RANGES_SEARCH_BASE))); + IPA_RANGES_SEARCH_BASE)); } ret = ipa_parse_search_base(ipa_opts, ipa_opts->basic, IPA_RANGES_SEARCH_BASE, @@ -638,7 +638,7 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, /* FIXME - this can be removed in a future version */ ret = krb5_try_kdcip(cdb, conf_path, ipa_opts->auth, KRB5_KDC); if (ret != EOK) { - DEBUG(1, ("sss_krb5_try_kdcip failed.\n")); + DEBUG(1, "sss_krb5_try_kdcip failed.\n"); goto done; } @@ -651,7 +651,7 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, } copy = talloc_strdup(ipa_opts->auth, value); if (copy == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -659,9 +659,9 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, if (ret != EOK) { goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", ipa_opts->auth[KRB5_REALM].opt_name, - dp_opt_get_string(ipa_opts->auth, KRB5_REALM))); + dp_opt_get_string(ipa_opts->auth, KRB5_REALM)); } /* If krb5_fast_principal was not set explicitly, default to @@ -675,8 +675,8 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, dp_opt_get_string(ipa_opts->auth, KRB5_REALM)); if (value == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot set %s!\n", - ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name)); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot set %s!\n", + ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name); ret = ENOMEM; goto done; } @@ -684,13 +684,13 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, ret = dp_opt_set_string(ipa_opts->auth, KRB5_FAST_PRINCIPAL, value); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot set %s!\n", - ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name)); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot set %s!\n", + ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name); goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", - ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name, value)); + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", + ipa_opts->auth[KRB5_FAST_PRINCIPAL].opt_name, value); } /* Set flag that controls whether we want to write the @@ -698,9 +698,9 @@ int ipa_get_auth_options(struct ipa_options *ipa_opts, */ ipa_opts->service->krb5_service->write_kdcinfo = \ dp_opt_get_bool(ipa_opts->auth, KRB5_USE_KDCINFO); - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", ipa_opts->auth[KRB5_USE_KDCINFO].opt_name, - ipa_opts->service->krb5_service->write_kdcinfo ? "true" : "false")); + ipa_opts->service->krb5_service->write_kdcinfo ? "true" : "false"); *_opts = ipa_opts->auth; ret = EOK; @@ -727,53 +727,53 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed\n")); + DEBUG(1, "talloc_new failed\n"); return; } service = talloc_get_type(private_data, struct ipa_service); if (!service) { - DEBUG(1, ("FATAL: Bad private_data\n")); + DEBUG(1, "FATAL: Bad private_data\n"); talloc_free(tmp_ctx); return; } srvaddr = fo_get_server_hostent(server); if (!srvaddr) { - DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_str_name(server))); + DEBUG(1, "FATAL: No hostent available for server (%s)\n", + fo_get_server_str_name(server)); talloc_free(tmp_ctx); return; } sockaddr = resolv_get_sockaddr_address(tmp_ctx, srvaddr, LDAP_PORT); if (sockaddr == NULL) { - DEBUG(1, ("resolv_get_sockaddr_address failed.\n")); + DEBUG(1, "resolv_get_sockaddr_address failed.\n"); talloc_free(tmp_ctx); return; } address = resolv_get_string_address(tmp_ctx, srvaddr); if (address == NULL) { - DEBUG(1, ("resolv_get_string_address failed.\n")); + DEBUG(1, "resolv_get_string_address failed.\n"); talloc_free(tmp_ctx); return; } srv_name = fo_get_server_name(server); if (srv_name == NULL) { - DEBUG(1, ("Could not get server host name\n")); + DEBUG(1, "Could not get server host name\n"); talloc_free(tmp_ctx); return; } new_uri = talloc_asprintf(service, "ldap://%s", srv_name); if (!new_uri) { - DEBUG(2, ("Failed to copy URI ...\n")); + DEBUG(2, "Failed to copy URI ...\n"); talloc_free(tmp_ctx); return; } - DEBUG(6, ("Constructed uri '%s'\n", new_uri)); + DEBUG(6, "Constructed uri '%s'\n", new_uri); /* free old one and replace with new one */ talloc_zfree(service->sdap->uri); @@ -786,7 +786,7 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) srvaddr->family, address); if (safe_address == NULL) { - DEBUG(1, ("sss_escape_ip_address failed.\n")); + DEBUG(1, "sss_escape_ip_address failed.\n"); talloc_free(tmp_ctx); return; } @@ -794,7 +794,7 @@ static void ipa_resolve_callback(void *private_data, struct fo_server *server) ret = write_krb5info_file(service->krb5_service->realm, safe_address, SSS_KRB5KDC_FO_SRV); if (ret != EOK) { - DEBUG(2, ("write_krb5info_file failed, authentication might fail.\n")); + DEBUG(2, "write_krb5info_file failed, authentication might fail.\n"); } } @@ -821,7 +821,7 @@ static errno_t _ipa_servers_init(struct be_ctx *ctx, /* split server parm into a 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; } @@ -833,9 +833,9 @@ static errno_t _ipa_servers_init(struct be_ctx *ctx, 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; } @@ -843,11 +843,11 @@ static errno_t _ipa_servers_init(struct be_ctx *ctx, ret = be_fo_add_srv_server(ctx, "IPA", "ldap", ipa_domain, BE_FO_PROTO_TCP, false, NULL); if (ret) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Failed to add server\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Failed to add server\n"); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Added service lookup for service IPA\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Added service lookup for service IPA\n"); continue; } @@ -860,11 +860,11 @@ static errno_t _ipa_servers_init(struct be_ctx *ctx, ret = be_fo_add_server(ctx, "IPA", list[i], 0, NULL, 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_TRACE_FUNC, ("Added Server %s\n", list[i])); + DEBUG(SSSDBG_TRACE_FUNC, "Added Server %s\n", list[i]); } done: @@ -925,7 +925,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_add_service(ctx, "IPA", ipa_user_data_cmp); if (ret != EOK) { - DEBUG(1, ("Failed to create failover service!\n")); + DEBUG(1, "Failed to create failover service!\n"); goto done; } @@ -944,7 +944,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, realm = dp_opt_get_string(options->basic, IPA_KRB5_REALM); if (!realm) { - DEBUG(1, ("No Kerberos realm set\n")); + DEBUG(1, "No Kerberos realm set\n"); ret = EINVAL; goto done; } @@ -957,7 +957,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, 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; } @@ -976,7 +976,7 @@ int ipa_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_service_add_callback(memctx, ctx, "IPA", ipa_resolve_callback, service); if (ret != EOK) { - DEBUG(1, ("Failed to add failover callback!\n")); + DEBUG(1, "Failed to add failover callback!\n"); goto done; } @@ -1031,17 +1031,17 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts, goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Option %s set to %s\n", + DEBUG(SSSDBG_TRACE_LIBS, "Option %s set to %s\n", ipa_opts->id->basic[SDAP_AUTOFS_SEARCH_BASE].opt_name, dp_opt_get_string(ipa_opts->id->basic, - SDAP_AUTOFS_SEARCH_BASE))); + SDAP_AUTOFS_SEARCH_BASE)); } ret = sdap_parse_search_base(ipa_opts->id, ipa_opts->id->basic, SDAP_AUTOFS_SEARCH_BASE, &ipa_opts->id->sdom->autofs_search_bases); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not parse autofs search base\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not parse autofs search base\n"); goto done; } @@ -1051,7 +1051,7 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts, &ipa_opts->id->autofs_mobject_map); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not get autofs map object attribute map\n")); + "Could not get autofs map object attribute map\n"); goto done; } @@ -1061,7 +1061,7 @@ int ipa_get_autofs_options(struct ipa_options *ipa_opts, &ipa_opts->id->autofs_entry_map); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not get autofs entry object attribute map\n")); + "Could not get autofs entry object attribute map\n"); goto done; } @@ -1083,14 +1083,14 @@ errno_t ipa_get_dyndns_options(struct be_ctx *be_ctx, ret = be_nsupdate_init(ctx, be_ctx, ipa_dyndns_opts, &ctx->dyndns_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot initialize IPA dyndns opts [%d]: %s\n", - ret, sss_strerror(ret))); + "Cannot initialize IPA dyndns opts [%d]: %s\n", + ret, sss_strerror(ret)); return ret; } if (ctx->basic == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("IPA basic options not (yet) " - "initialized, cannot copy legacy options\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "IPA basic options not (yet) " + "initialized, cannot copy legacy options\n"); return EOK; } @@ -1098,8 +1098,8 @@ errno_t ipa_get_dyndns_options(struct be_ctx *be_ctx, ret = confdb_get_string(be_ctx->cdb, ctx, be_ctx->conf_path, "ipa_dyndns_update", NULL, &val); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot get the value of %s\n", - "ipa_dyndns_update")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot get the value of %s\n", + "ipa_dyndns_update"); /* Not fatal */ } else if (ret == EOK && val) { if (strcasecmp(val, "FALSE") == 0) { @@ -1108,20 +1108,20 @@ errno_t ipa_get_dyndns_options(struct be_ctx *be_ctx, update = true; } else { DEBUG(SSSDBG_MINOR_FAILURE, - ("ipa_dyndns_update value is not a boolean!\n")); + "ipa_dyndns_update value is not a boolean!\n"); talloc_free(val); return EINVAL; } - DEBUG(SSSDBG_MINOR_FAILURE, ("Deprecation warning: The option %s is " + DEBUG(SSSDBG_MINOR_FAILURE, "Deprecation warning: The option %s is " "deprecated and should not be used in favor of %s\n", - "ipa_dyndns_update", "dyndns_update")); + "ipa_dyndns_update", "dyndns_update"); ret = dp_opt_set_bool(ctx->dyndns_ctx->opts, DP_OPT_DYNDNS_UPDATE, update); talloc_free(val); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set option value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set option value\n"); return ret; } } @@ -1129,17 +1129,17 @@ errno_t ipa_get_dyndns_options(struct be_ctx *be_ctx, ret = confdb_get_int(be_ctx->cdb, be_ctx->conf_path, "ipa_dyndns_ttl", -1, &ttl); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot get the value of %s\n", - "ipa_dyndns_ttl")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot get the value of %s\n", + "ipa_dyndns_ttl"); /* Not fatal */ } else if (ret == EOK && ttl != -1) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Deprecation warning: The option %s is " + DEBUG(SSSDBG_MINOR_FAILURE, "Deprecation warning: The option %s is " "deprecated and should not be used in favor of %s\n", - "ipa_dyndns_ttl", "dyndns_ttl")); + "ipa_dyndns_ttl", "dyndns_ttl"); ret = dp_opt_set_int(ctx->dyndns_ctx->opts, DP_OPT_DYNDNS_TTL, ttl); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set option value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set option value\n"); return ret; } } @@ -1148,18 +1148,18 @@ errno_t ipa_get_dyndns_options(struct be_ctx *be_ctx, ret = confdb_get_string(be_ctx->cdb, ctx, be_ctx->conf_path, "ipa_dyndns_iface", NULL, &val); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot get the value of %s\n", - "ipa_dyndns_iface")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot get the value of %s\n", + "ipa_dyndns_iface"); /* Not fatal */ } else if (ret == EOK && val) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Deprecation warning: The option %s is " + DEBUG(SSSDBG_MINOR_FAILURE, "Deprecation warning: The option %s is " "deprecated and should not be used in favor of %s\n", - "ipa_dyndns_iface", "dyndns_iface")); + "ipa_dyndns_iface", "dyndns_iface"); ret = dp_opt_set_string(ctx->dyndns_ctx->opts, DP_OPT_DYNDNS_IFACE, val); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set option value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set option value\n"); return ret; } } diff --git a/src/providers/ipa/ipa_config.c b/src/providers/ipa/ipa_config.c index 0b392f512..0d564f5b5 100644 --- a/src/providers/ipa/ipa_config.c +++ b/src/providers/ipa/ipa_config.c @@ -70,14 +70,14 @@ ipa_get_config_send(TALLOC_CTX *mem_ctx, ret = domain_to_basedn(state, domain, &ldap_basedn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("domain_to_basedn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "domain_to_basedn failed.\n"); goto done; } state->base = talloc_asprintf(state, IPA_CONFIG_SEARCH_BASE_TEMPLATE, ldap_basedn); if (state->base == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -124,8 +124,8 @@ static void ipa_get_config_done(struct tevent_req *subreq) } if (reply_count != 1) { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected number of results, expected 1, " - "got %zu.\n", reply_count)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected number of results, expected 1, " + "got %zu.\n", reply_count); ret = EINVAL; goto done; } diff --git a/src/providers/ipa/ipa_dyndns.c b/src/providers/ipa/ipa_dyndns.c index a74a3cc18..ca11c00c7 100644 --- a/src/providers/ipa/ipa_dyndns.c +++ b/src/providers/ipa/ipa_dyndns.c @@ -39,15 +39,15 @@ errno_t ipa_dyndns_init(struct be_ctx *be_ctx, ctx->be_res = be_ctx->be_res; if (ctx->be_res == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Resolver must be initialized in order " - "to use the IPA dynamic DNS updates\n")); + DEBUG(SSSDBG_OP_FAILURE, "Resolver must be initialized in order " + "to use the IPA dynamic DNS updates\n"); return EINVAL; } ret = be_nsupdate_init_timer(ctx->dyndns_ctx, be_ctx->ev, ipa_dyndns_timer, ctx); 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; } @@ -55,7 +55,7 @@ errno_t ipa_dyndns_init(struct be_ctx *be_ctx, ipa_dyndns_update, ctx, 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; } @@ -80,7 +80,7 @@ void ipa_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; @@ -98,8 +98,8 @@ static void ipa_dyndns_timer_connected(struct tevent_req *req) talloc_zfree(req); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to IPA: [%d](%s)\n", - ret, sss_strerror(ret))); + "Failed to connect to IPA: [%d](%s)\n", + ret, sss_strerror(ret)); return; } @@ -121,7 +121,7 @@ void ipa_dyndns_update(void *pvt) struct tevent_req *req = ipa_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, ipa_dyndns_nsupdate_done, NULL); @@ -132,12 +132,12 @@ static void ipa_dyndns_nsupdate_done(struct tevent_req *req) int ret = ipa_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 ipa_dyndns_update_state { @@ -157,7 +157,7 @@ ipa_dyndns_update_send(struct ipa_options *ctx) const char *servername; int i; - DEBUG(SSSDBG_TRACE_FUNC, ("Performing update\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Performing update\n"); req = tevent_req_create(ctx, &state, struct ipa_dyndns_update_state); if (req == NULL) { @@ -167,8 +167,8 @@ ipa_dyndns_update_send(struct ipa_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; @@ -190,7 +190,7 @@ ipa_dyndns_update_send(struct ipa_options *ctx) if (strncmp(ctx->service->sdap->uri, "ldap://", 7) != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unexpected format of LDAP URI.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unexpected format of LDAP URI.\n"); ret = EIO; goto done; } @@ -219,8 +219,8 @@ ipa_dyndns_update_send(struct ipa_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, ipa_dyndns_sdap_update_done, req); @@ -243,7 +243,7 @@ static void ipa_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/ipa/ipa_hbac_common.c b/src/providers/ipa/ipa_hbac_common.c index 0473a028c..81830cdef 100644 --- a/src/providers/ipa/ipa_hbac_common.c +++ b/src/providers/ipa/ipa_hbac_common.c @@ -39,7 +39,7 @@ ipa_hbac_save_list(struct sss_domain_info *domain, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed.\n")); + DEBUG(1, "talloc_new failed.\n"); return ENOMEM; } @@ -53,7 +53,7 @@ ipa_hbac_save_list(struct sss_domain_info *domain, ret = sysdb_delete_recursive(domain->sysdb, base_dn, true); if (ret != EOK) { - DEBUG(1, ("sysdb_delete_recursive failed.\n")); + DEBUG(1, "sysdb_delete_recursive failed.\n"); goto done; } } @@ -61,27 +61,27 @@ ipa_hbac_save_list(struct sss_domain_info *domain, for (c = 0; c < count; c++) { ret = sysdb_attrs_get_el(list[c], naming_attribute, &el); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_get_el failed.\n")); + DEBUG(1, "sysdb_attrs_get_el failed.\n"); goto done; } if (el->num_values == 0) { - DEBUG(1, ("[%s] not found.\n", naming_attribute)); + DEBUG(1, "[%s] not found.\n", naming_attribute); ret = EINVAL; goto done; } object_name = talloc_strndup(tmp_ctx, (const char *)el->values[0].data, el->values[0].length); if (object_name == NULL) { - DEBUG(1, ("talloc_strndup failed.\n")); + DEBUG(1, "talloc_strndup failed.\n"); ret = ENOMEM; goto done; } - DEBUG(9, ("Object name: [%s].\n", object_name)); + DEBUG(9, "Object name: [%s].\n", object_name); ret = sysdb_store_custom(domain->sysdb, domain, object_name, subdir, list[c]); if (ret != EOK) { - DEBUG(1, ("sysdb_store_custom failed.\n")); + DEBUG(1, "sysdb_store_custom failed.\n"); goto done; } } @@ -114,7 +114,7 @@ ipa_hbac_sysdb_save(struct sss_domain_info *domain, /* Save the entries and groups to the cache */ ret = sysdb_transaction_start(domain->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; @@ -123,8 +123,8 @@ ipa_hbac_sysdb_save(struct sss_domain_info *domain, ret = ipa_hbac_save_list(domain, true, primary_subdir, attr_name, primary_count, primary); if (ret != EOK) { - DEBUG(1, ("Could not save %s. [%d][%s]\n", - primary_subdir, ret, strerror(ret))); + DEBUG(1, "Could not save %s. [%d][%s]\n", + primary_subdir, ret, strerror(ret)); goto done; } @@ -133,15 +133,15 @@ ipa_hbac_sysdb_save(struct sss_domain_info *domain, ret = ipa_hbac_save_list(domain, true, group_subdir, groupattr_name, group_count, groups); if (ret != EOK) { - DEBUG(1, ("Could not save %s. [%d][%s]\n", - group_subdir, ret, strerror(ret))); + DEBUG(1, "Could not save %s. [%d][%s]\n", + group_subdir, ret, strerror(ret)); goto done; } } ret = sysdb_transaction_commit(domain->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; @@ -150,12 +150,12 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(domain->sysdb); if (sret != EOK) { - DEBUG(0, ("Could not cancel sysdb transaction\n")); + DEBUG(0, "Could not cancel sysdb transaction\n"); } } if (ret != EOK) { - DEBUG(3, ("Error [%d][%s]\n", ret, strerror(ret))); + DEBUG(3, "Error [%d][%s]\n", ret, strerror(ret)); } return ret; } @@ -171,7 +171,7 @@ replace_attribute_name(const char *old_name, for (i = 0; i < count; i++) { ret = sysdb_attrs_replace_name(list[i], old_name, new_name); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_replace_name failed.\n")); + DEBUG(1, "sysdb_attrs_replace_name failed.\n"); return ret; } } @@ -236,7 +236,7 @@ hbac_ctx_to_rules(TALLOC_CTX *mem_ctx, if (ret == EPERM) { goto done; } else if (ret != EOK) { - DEBUG(1, ("Could not construct rules\n")); + DEBUG(1, "Could not construct rules\n"); goto done; } } @@ -245,7 +245,7 @@ hbac_ctx_to_rules(TALLOC_CTX *mem_ctx, /* Create the eval request */ ret = hbac_ctx_to_eval_request(tmp_ctx, hbac_ctx, &new_request); if (ret != EOK) { - DEBUG(1, ("Could not construct eval request\n")); + DEBUG(1, "Could not construct eval request\n"); goto done; } @@ -276,7 +276,7 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_el(hbac_ctx->rules[idx], IPA_CN, &el); if (ret != EOK || el->num_values == 0) { - DEBUG(4, ("rule has no name, assuming '(none)'.\n")); + DEBUG(4, "rule has no name, assuming '(none)'.\n"); new_rule->name = talloc_strdup(new_rule, "(none)"); } else { new_rule->name = talloc_strndup(new_rule, @@ -284,7 +284,7 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, el->values[0].length); } - DEBUG(7, ("Processing rule [%s]\n", new_rule->name)); + DEBUG(7, "Processing rule [%s]\n", new_rule->name); ret = sysdb_attrs_get_bool(hbac_ctx->rules[idx], IPA_ENABLED_FLAG, &new_rule->enabled); @@ -301,7 +301,7 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret != EOK) goto done; if (strcasecmp(rule_type, IPA_HBAC_ALLOW) != 0) { - DEBUG(7, ("Rule [%s] is not an ALLOW rule\n", new_rule->name)); + DEBUG(7, "Rule [%s] is not an ALLOW rule\n", new_rule->name); ret = EPERM; goto done; } @@ -312,8 +312,8 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, hbac_ctx->rules[idx], &new_rule->users); if (ret != EOK) { - DEBUG(1, ("Could not parse users for rule [%s]\n", - new_rule->name)); + DEBUG(1, "Could not parse users for rule [%s]\n", + new_rule->name); goto done; } @@ -323,8 +323,8 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, hbac_ctx->rules[idx], &new_rule->services); if (ret != EOK) { - DEBUG(1, ("Could not parse services for rule [%s]\n", - new_rule->name)); + DEBUG(1, "Could not parse services for rule [%s]\n", + new_rule->name); goto done; } @@ -334,8 +334,8 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, hbac_ctx->rules[idx], &new_rule->targethosts); if (ret != EOK) { - DEBUG(1, ("Could not parse target hosts for rule [%s]\n", - new_rule->name)); + DEBUG(1, "Could not parse target hosts for rule [%s]\n", + new_rule->name); goto done; } @@ -348,8 +348,8 @@ hbac_attrs_to_rule(TALLOC_CTX *mem_ctx, IPA_HBAC_SUPPORT_SRCHOST), &new_rule->srchosts); if (ret != EOK) { - DEBUG(1, ("Could not parse source hosts for rule [%s]\n", - new_rule->name)); + DEBUG(1, "Could not parse source hosts for rule [%s]\n", + new_rule->name); goto done; } @@ -381,12 +381,12 @@ hbac_get_category(struct sysdb_attrs *attrs, if (ret != ENOENT) { for (i = 0; categories[i]; i++) { if (strcasecmp("all", categories[i]) == 0) { - DEBUG(5, ("Category is set to 'all'.\n")); + DEBUG(5, "Category is set to 'all'.\n"); cats |= HBAC_CATEGORY_ALL; continue; } - DEBUG(9, ("Unsupported user category [%s].\n", - categories[i])); + DEBUG(9, "Unsupported user category [%s].\n", + categories[i]); } } @@ -450,7 +450,7 @@ hbac_ctx_to_eval_request(TALLOC_CTX *mem_ctx, if (strcasecmp(pd->domain, domain->name) != 0) { user_dom = find_subdomain_by_name(domain, pd->domain, true); if (user_dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_subdomain_by_name failed.\n"); ret = ENOMEM; goto done; } @@ -486,7 +486,7 @@ hbac_ctx_to_eval_request(TALLOC_CTX *mem_ctx, /* The target host is always the current machine */ thost = dp_opt_get_cstring(hbac_ctx->ipa_options, IPA_HOSTNAME); if (thost == NULL) { - DEBUG(1, ("Missing ipa_hostname, this should never happen.\n")); + DEBUG(1, "Missing ipa_hostname, this should never happen.\n"); ret = EINVAL; goto done; } @@ -539,18 +539,18 @@ hbac_eval_user_element(TALLOC_CTX *mem_ctx, ret = sysdb_search_user_by_name(tmp_ctx, sysdb, domain, users->name, attrs, &msg); if (ret != EOK) { - DEBUG(1, ("Could not determine user memberships for [%s]\n", - users->name)); + DEBUG(1, "Could not determine user memberships for [%s]\n", + users->name); goto done; } el = ldb_msg_find_element(msg, SYSDB_ORIG_MEMBEROF); if (el == NULL || el->num_values == 0) { - DEBUG(7, ("No groups for [%s]\n", users->name)); + DEBUG(7, "No groups for [%s]\n", users->name); ret = create_empty_grouplist(users); goto done; } - DEBUG(7, ("[%d] groups for [%s]\n", el->num_values, users->name)); + DEBUG(7, "[%d] groups for [%s]\n", el->num_values, users->name); users->groups = talloc_array(users, const char *, el->num_values + 1); if (users->groups == NULL) { @@ -564,16 +564,16 @@ hbac_eval_user_element(TALLOC_CTX *mem_ctx, ret = get_ipa_groupname(users->groups, sysdb, member_dn, &users->groups[num_groups]); if (ret != EOK && ret != ENOENT) { - DEBUG(3, ("Parse error on [%s]\n", member_dn)); + DEBUG(3, "Parse error on [%s]\n", member_dn); goto done; } else if (ret == EOK) { - DEBUG(7, ("Added group [%s] for user [%s]\n", - users->groups[num_groups], users->name)); + DEBUG(7, "Added group [%s] for user [%s]\n", + users->groups[num_groups], users->name); num_groups++; continue; } /* Skip entries that are not groups */ - DEBUG(8, ("Skipping non-group memberOf [%s]\n", member_dn)); + DEBUG(8, "Skipping non-group memberOf [%s]\n", member_dn); } users->groups[num_groups] = NULL; @@ -646,7 +646,7 @@ hbac_eval_service_element(TALLOC_CTX *mem_ctx, } else if (ret != EOK) { goto done; } else if (count > 1) { - DEBUG(1, ("More than one result for a BASE search!\n")); + DEBUG(1, "More than one result for a BASE search!\n"); ret = EIO; goto done; } @@ -754,7 +754,7 @@ hbac_eval_host_element(TALLOC_CTX *mem_ctx, } else if (ret != EOK) { goto done; } else if (count > 1) { - DEBUG(1, ("More than one result for a BASE search!\n")); + DEBUG(1, "More than one result for a BASE search!\n"); ret = EIO; goto done; } diff --git a/src/providers/ipa/ipa_hbac_hosts.c b/src/providers/ipa/ipa_hbac_hosts.c index 7f387c633..7616aa8d0 100644 --- a/src/providers/ipa/ipa_hbac_hosts.c +++ b/src/providers/ipa/ipa_hbac_hosts.c @@ -63,7 +63,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, /* First check for host category */ ret = hbac_get_category(rule_attrs, category_attr, &new_hosts->category); if (ret != EOK) { - DEBUG(1, ("Could not identify host categories\n")); + DEBUG(1, "Could not identify host categories\n"); goto done; } if (new_hosts->category & HBAC_CATEGORY_ALL) { @@ -75,12 +75,12 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the list of DNs from the member_attr */ ret = sysdb_attrs_get_el(rule_attrs, member_attr, &el); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("sysdb_attrs_get_el failed.\n")); + DEBUG(1, "sysdb_attrs_get_el failed.\n"); goto done; } if (ret == ENOENT || el->num_values == 0) { el->num_values = 0; - DEBUG(4, ("No host specified, rule will never apply.\n")); + DEBUG(4, "No host specified, rule will never apply.\n"); } /* Assume maximum size; We'll trim it later */ @@ -124,7 +124,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple hosts. Skipping \n")); + DEBUG(1, "Original DN matched multiple hosts. Skipping \n"); talloc_zfree(member_dn); continue; } @@ -134,7 +134,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, SYSDB_FQDN, NULL); if (name == NULL) { - DEBUG(1, ("FQDN is missing!\n")); + DEBUG(1, "FQDN is missing!\n"); ret = EFAULT; goto done; } @@ -145,8 +145,8 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - DEBUG(8, ("Added host [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added host [%s] to rule [%s]\n", + name, rule_name); num_hosts++; } else { /* ret == ENOENT */ /* Check if this is a hostgroup */ @@ -160,8 +160,8 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple hostgroups. " - "Skipping\n")); + DEBUG(1, "Original DN matched multiple hostgroups. " + "Skipping\n"); talloc_zfree(member_dn); continue; } @@ -169,7 +169,7 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Original DN matched a single group. Get the groupname */ name = ldb_msg_find_attr_as_string(msgs[0], SYSDB_NAME, NULL); if (name == NULL) { - DEBUG(1, ("Hostgroup name is missing!\n")); + DEBUG(1, "Hostgroup name is missing!\n"); ret = EFAULT; goto done; } @@ -181,14 +181,14 @@ static errno_t hbac_host_attrs_to_rule(TALLOC_CTX *mem_ctx, goto done; } - DEBUG(8, ("Added hostgroup [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added hostgroup [%s] to rule [%s]\n", + name, rule_name); num_hostgroups++; } else { /* ret == ENOENT */ /* Neither a host nor a hostgroup? Skip it */ DEBUG(SSSDBG_TRACE_LIBS, - ("[%s] does not map to either a host or hostgroup. " - "Skipping\n", member_dn)); + "[%s] does not map to either a host or hostgroup. " + "Skipping\n", member_dn); } } talloc_zfree(member_dn); @@ -229,7 +229,7 @@ hbac_thost_attrs_to_rule(TALLOC_CTX *mem_ctx, struct sysdb_attrs *rule_attrs, struct hbac_rule_element **thosts) { - DEBUG(7, ("Processing target hosts for rule [%s]\n", rule_name)); + DEBUG(7, "Processing target hosts for rule [%s]\n", rule_name); return hbac_host_attrs_to_rule(mem_ctx, domain, rule_name, rule_attrs, @@ -255,10 +255,10 @@ hbac_shost_attrs_to_rule(TALLOC_CTX *mem_ctx, tmp_ctx = talloc_new(mem_ctx); if (tmp_ctx == NULL) return ENOMEM; - DEBUG(SSSDBG_TRACE_FUNC, ("Processing source hosts for rule [%s]\n", rule_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing source hosts for rule [%s]\n", rule_name); if (!support_srchost) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Source hosts disabled, setting ALL\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Source hosts disabled, setting ALL\n"); shosts = talloc_zero(tmp_ctx, struct hbac_rule_element); if (shosts == NULL) { ret = ENOMEM; @@ -306,8 +306,8 @@ hbac_shost_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - DEBUG(8, ("Added external source host [%s] to rule [%s]\n", - shosts->names[idx], rule_name)); + DEBUG(8, "Added external source host [%s] to rule [%s]\n", + shosts->names[idx], rule_name); } shosts->names[idx] = NULL; } diff --git a/src/providers/ipa/ipa_hbac_rules.c b/src/providers/ipa/ipa_hbac_rules.c index 24caf1fd4..dcc5e7634 100644 --- a/src/providers/ipa/ipa_hbac_rules.c +++ b/src/providers/ipa/ipa_hbac_rules.c @@ -68,7 +68,7 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, const char **memberof_list; if (ipa_host == NULL) { - DEBUG(1, ("Missing host\n")); + DEBUG(1, "Missing host\n"); return NULL; } @@ -77,7 +77,7 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(ipa_host, SYSDB_ORIG_DN, &host_dn); if (ret != EOK) { - DEBUG(1, ("Could not identify IPA hostname\n")); + DEBUG(1, "Could not identify IPA hostname\n"); goto error; } @@ -86,7 +86,7 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ipa_hbac_rule_state); if (req == NULL) { - DEBUG(1, ("tevent_req_create failed.\n")); + DEBUG(1, "tevent_req_create failed.\n"); return NULL; } @@ -144,7 +144,7 @@ ipa_hbac_rule_info_send(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string_array(ipa_host, SYSDB_ORIG_MEMBEROF, tmp_ctx, &memberof_list); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("Could not identify ")); + DEBUG(1, "Could not identify "); } if (ret == ENOENT) { /* This host is not a member of any hostgroups */ memberof_list = talloc_array(tmp_ctx, const char *, 1); @@ -224,9 +224,9 @@ ipa_hbac_rule_info_next(struct tevent_req *req, return ENOMEM; } - DEBUG(SSSDBG_TRACE_FUNC, ("Sending request for next search base: " + DEBUG(SSSDBG_TRACE_FUNC, "Sending request for next search base: " "[%s][%d][%s]\n", base->basedn, base->scope, - state->cur_filter)); + state->cur_filter); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, base->basedn, base->scope, @@ -236,7 +236,7 @@ ipa_hbac_rule_info_next(struct tevent_req *req, SDAP_ENUM_SEARCH_TIMEOUT), true); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_get_generic_send failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_get_generic_send failed.\n"); return ENOMEM; } tevent_req_set_callback(subreq, ipa_hbac_rule_info_done, req); @@ -262,7 +262,7 @@ ipa_hbac_rule_info_done(struct tevent_req *subreq) &rule_count, &rules); if (ret != EOK) { - DEBUG(3, ("Could not retrieve HBAC rules\n")); + DEBUG(3, "Could not retrieve HBAC rules\n"); goto fail; } @@ -293,7 +293,7 @@ ipa_hbac_rule_info_done(struct tevent_req *subreq) } else if (ret != EOK) { goto fail; } else if (ret == EOK && state->rule_count == 0) { - DEBUG(3, ("No rules apply to this host\n")); + DEBUG(3, "No rules apply to this host\n"); tevent_req_error(req, ENOENT); return; } diff --git a/src/providers/ipa/ipa_hbac_services.c b/src/providers/ipa/ipa_hbac_services.c index ace01fae2..85333d835 100644 --- a/src/providers/ipa/ipa_hbac_services.c +++ b/src/providers/ipa/ipa_hbac_services.c @@ -69,7 +69,7 @@ ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ipa_hbac_service_state); if (req == NULL) { - DEBUG(1, ("tevent_req_create failed.\n")); + DEBUG(1, "tevent_req_create failed.\n"); return NULL; } @@ -92,7 +92,7 @@ ipa_hbac_service_info_send(TALLOC_CTX *mem_ctx, state->attrs = talloc_array(state, const char *, 6); if (state->attrs == NULL) { - DEBUG(1, ("Failed to allocate service attribute list.\n")); + DEBUG(1, "Failed to allocate service attribute list.\n"); ret = ENOMEM; goto immediate; } @@ -143,9 +143,9 @@ static errno_t ipa_hbac_service_info_next(struct tevent_req *req, return ENOMEM; } - DEBUG(SSSDBG_TRACE_FUNC, ("Sending request for next search base: " + DEBUG(SSSDBG_TRACE_FUNC, "Sending request for next search base: " "[%s][%d][%s]\n", base->basedn, base->scope, - state->cur_filter)); + state->cur_filter); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, base->basedn, base->scope, state->cur_filter, @@ -154,7 +154,7 @@ static errno_t ipa_hbac_service_info_next(struct tevent_req *req, SDAP_ENUM_SEARCH_TIMEOUT), true); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error requesting service info\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error requesting service info\n"); return EIO; } tevent_req_set_callback(subreq, ipa_hbac_service_info_done, req); @@ -203,7 +203,7 @@ ipa_hbac_service_info_done(struct tevent_req *subreq) state->service_count, state->services); if (ret != EOK) { - DEBUG(1, ("Could not replace attribute names\n")); + DEBUG(1, "Could not replace attribute names\n"); goto done; } @@ -258,9 +258,9 @@ ipa_hbac_servicegroup_info_next(struct tevent_req *req, } /* Look up service groups */ - DEBUG(SSSDBG_TRACE_FUNC, ("Sending request for next search base: " + DEBUG(SSSDBG_TRACE_FUNC, "Sending request for next search base: " "[%s][%d][%s]\n", base->basedn, base->scope, - state->cur_filter)); + state->cur_filter); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, base->basedn, base->scope, state->cur_filter, state->attrs, NULL, 0, @@ -268,7 +268,7 @@ ipa_hbac_servicegroup_info_next(struct tevent_req *req, SDAP_ENUM_SEARCH_TIMEOUT), true); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error requesting servicegroup info\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error requesting servicegroup info\n"); return EIO; } tevent_req_set_callback(subreq, ipa_hbac_servicegroup_info_done, req); @@ -303,7 +303,7 @@ ipa_hbac_servicegroup_info_done(struct tevent_req *subreq) group_count, groups); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not replace attribute names\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not replace attribute names\n"); goto done; } @@ -311,7 +311,7 @@ ipa_hbac_servicegroup_info_done(struct tevent_req *subreq) state->servicegroup_count, state->servicegroups); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not replace attribute names\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not replace attribute names\n"); goto done; } @@ -346,7 +346,7 @@ done: if (ret == EOK) { tevent_req_done(req); } else { - DEBUG(3, ("Error [%d][%s]\n", ret, strerror(ret))); + DEBUG(3, "Error [%d][%s]\n", ret, strerror(ret)); tevent_req_error(req, ret); } } @@ -399,7 +399,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, struct ldb_message **msgs; const char *name; - DEBUG(7, ("Processing PAM services for rule [%s]\n", rule_name)); + DEBUG(7, "Processing PAM services for rule [%s]\n", rule_name); tmp_ctx = talloc_new(mem_ctx); if (tmp_ctx == NULL) return ENOMEM; @@ -414,7 +414,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = hbac_get_category(rule_attrs, IPA_SERVICE_CATEGORY, &new_services->category); if (ret != EOK) { - DEBUG(1, ("Could not identify service categories\n")); + DEBUG(1, "Could not identify service categories\n"); goto done; } if (new_services->category & HBAC_CATEGORY_ALL) { @@ -426,12 +426,12 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Get the list of DNs from the member attr */ ret = sysdb_attrs_get_el(rule_attrs, IPA_MEMBER_SERVICE, &el); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("sysdb_attrs_get_el failed.\n")); + DEBUG(1, "sysdb_attrs_get_el failed.\n"); goto done; } if (ret == ENOENT || el->num_values == 0) { el->num_values = 0; - DEBUG(4, ("No services specified, rule will never apply.\n")); + DEBUG(4, "No services specified, rule will never apply.\n"); } /* Assume maximum size; We'll trim it later */ @@ -475,8 +475,8 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple services. " - "Skipping \n")); + DEBUG(1, "Original DN matched multiple services. " + "Skipping \n"); talloc_zfree(member_dn); continue; } @@ -484,7 +484,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Original DN matched a single service. Get the service name */ name = ldb_msg_find_attr_as_string(msgs[0], IPA_CN, NULL); if (name == NULL) { - DEBUG(1, ("Attribute is missing!\n")); + DEBUG(1, "Attribute is missing!\n"); ret = EFAULT; goto done; } @@ -495,8 +495,8 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - DEBUG(8, ("Added service [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added service [%s] to rule [%s]\n", + name, rule_name); num_services++; } else { /* ret == ENOENT */ /* Check if this is a service group */ @@ -510,8 +510,8 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple service groups. " - "Skipping\n")); + DEBUG(1, "Original DN matched multiple service groups. " + "Skipping\n"); talloc_zfree(member_dn); continue; } @@ -519,7 +519,7 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Original DN matched a single group. Get the groupname */ name = ldb_msg_find_attr_as_string(msgs[0], IPA_CN, NULL); if (name == NULL) { - DEBUG(1, ("Attribute is missing!\n")); + DEBUG(1, "Attribute is missing!\n"); ret = EFAULT; goto done; } @@ -531,13 +531,13 @@ hbac_service_attrs_to_rule(TALLOC_CTX *mem_ctx, goto done; } - DEBUG(8, ("Added service group [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added service group [%s] to rule [%s]\n", + name, rule_name); num_servicegroups++; } else { /* ret == ENOENT */ /* Neither a service nor a service group? Skip it */ - DEBUG(1, ("[%s] does not map to either a service or " - "service group. Skipping\n", member_dn)); + DEBUG(1, "[%s] does not map to either a service or " + "service group. Skipping\n", member_dn); } } talloc_zfree(member_dn); diff --git a/src/providers/ipa/ipa_hbac_users.c b/src/providers/ipa/ipa_hbac_users.c index a5fcaad4e..7c83b8911 100644 --- a/src/providers/ipa/ipa_hbac_users.c +++ b/src/providers/ipa/ipa_hbac_users.c @@ -172,12 +172,12 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, goto done; } - DEBUG(7, ("Processing users for rule [%s]\n", rule_name)); + DEBUG(7, "Processing users for rule [%s]\n", rule_name); ret = hbac_get_category(rule_attrs, IPA_USER_CATEGORY, &new_users->category); if (ret != EOK) { - DEBUG(1, ("Could not identify user categories\n")); + DEBUG(1, "Could not identify user categories\n"); goto done; } if (new_users->category & HBAC_CATEGORY_ALL) { @@ -188,12 +188,12 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_el(rule_attrs, IPA_MEMBER_USER, &el); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("sysdb_attrs_get_el failed.\n")); + DEBUG(1, "sysdb_attrs_get_el failed.\n"); goto done; } if (ret == ENOENT || el->num_values == 0) { el->num_values = 0; - DEBUG(4, ("No user specified, rule will never apply.\n")); + DEBUG(4, "No user specified, rule will never apply.\n"); } new_users->names = talloc_array(new_users, @@ -234,7 +234,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple users. Skipping \n")); + DEBUG(1, "Original DN matched multiple users. Skipping \n"); talloc_zfree(member_dn); continue; } @@ -242,7 +242,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Original DN matched a single user. Get the username */ name = ldb_msg_find_attr_as_string(msgs[0], SYSDB_NAME, NULL); if (name == NULL) { - DEBUG(1, ("Attribute is missing!\n")); + DEBUG(1, "Attribute is missing!\n"); ret = EFAULT; goto done; } @@ -253,8 +253,8 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - DEBUG(8, ("Added user [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added user [%s] to rule [%s]\n", + name, rule_name); num_users++; } else { /* Check if it is a group instead */ @@ -267,8 +267,8 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, if (ret == EOK) { if (count > 1) { - DEBUG(1, ("Original DN matched multiple groups. " - "Skipping\n")); + DEBUG(1, "Original DN matched multiple groups. " + "Skipping\n"); talloc_zfree(member_dn); continue; } @@ -276,7 +276,7 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, /* Original DN matched a single group. Get the groupname */ name = ldb_msg_find_attr_as_string(msgs[0], SYSDB_NAME, NULL); if (name == NULL) { - DEBUG(1, ("Attribute is missing!\n")); + DEBUG(1, "Attribute is missing!\n"); ret = EFAULT; goto done; } @@ -287,8 +287,8 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, ret = ENOMEM; goto done; } - DEBUG(8, ("Added POSIX group [%s] to rule [%s]\n", - name, rule_name)); + DEBUG(8, "Added POSIX group [%s] to rule [%s]\n", + name, rule_name); num_groups++; } else { /* If the group still matches the group pattern, @@ -298,13 +298,13 @@ hbac_user_attrs_to_rule(TALLOC_CTX *mem_ctx, member_user, &new_users->groups[num_groups]); if (ret == EOK) { - DEBUG(8, ("Added non-POSIX group [%s] to rule [%s]\n", - new_users->groups[num_groups], rule_name)); + DEBUG(8, "Added non-POSIX group [%s] to rule [%s]\n", + new_users->groups[num_groups], rule_name); num_groups++; } else { /* Not a group, so we don't care about it */ - DEBUG(1, ("[%s] does not map to either a user or group. " - "Skipping\n", member_dn)); + DEBUG(1, "[%s] does not map to either a user or group. " + "Skipping\n", member_dn); } } } diff --git a/src/providers/ipa/ipa_hostid.c b/src/providers/ipa/ipa_hostid.c index 7afe350a8..210123090 100644 --- a/src/providers/ipa/ipa_hostid.c +++ b/src/providers/ipa/ipa_hostid.c @@ -110,7 +110,7 @@ ipa_host_info_complete(struct be_req *breq, int dp_error, error_text = NULL; } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Bug: dp_error is OK on failed request")); + "Bug: dp_error is OK on failed request"); dp_error = DP_ERR_FATAL; error_text = default_error_text; } @@ -167,7 +167,7 @@ hosts_get_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, ctx->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -270,7 +270,7 @@ hosts_get_done(struct tevent_req *subreq) if (state->count == 0) { DEBUG(SSSDBG_OP_FAILURE, - ("No host with name [%s] found.\n", state->name)); + "No host with name [%s] found.\n", state->name); ret = sysdb_delete_ssh_host(state->domain->sysdb, state->domain, state->name); @@ -284,7 +284,7 @@ hosts_get_done(struct tevent_req *subreq) if (state->count > 1) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Found more than one host with name [%s].\n", state->name)); + "Found more than one host with name [%s].\n", state->name); ret = EINVAL; goto done; } diff --git a/src/providers/ipa/ipa_hosts.c b/src/providers/ipa/ipa_hosts.c index 1323cac60..64f80f082 100644 --- a/src/providers/ipa/ipa_hosts.c +++ b/src/providers/ipa/ipa_hosts.c @@ -122,7 +122,7 @@ ipa_host_info_send(TALLOC_CTX *mem_ctx, ret = ipa_host_info_next(req, state); if (ret == EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No host search base configured?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No host search base configured?\n"); ret = EINVAL; } @@ -169,7 +169,7 @@ static errno_t ipa_host_info_next(struct tevent_req *req, SDAP_ENUM_SEARCH_TIMEOUT), true); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error requesting host info\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error requesting host info\n"); talloc_zfree(state->cur_filter); return EIO; } @@ -232,7 +232,7 @@ ipa_host_info_done(struct tevent_req *subreq) ret = ipa_hostgroup_info_next(req, state); if (ret == EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No host search base configured?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No host search base configured?\n"); tevent_req_error(req, EINVAL); return; } else if (ret != EAGAIN) { @@ -255,7 +255,7 @@ ipa_host_info_done(struct tevent_req *subreq) } if (!sdap_has_deref_support(state->sh, state->opts)) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Server does not support deref\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Server does not support deref\n"); tevent_req_error(req, EIO); return; } @@ -268,7 +268,7 @@ ipa_host_info_done(struct tevent_req *subreq) dp_opt_get_int(state->opts->basic, SDAP_ENUM_SEARCH_TIMEOUT)); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error requesting host info\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error requesting host info\n"); tevent_req_error(req, EIO); return; } @@ -307,7 +307,7 @@ static errno_t ipa_hostgroup_info_next(struct tevent_req *req, SDAP_ENUM_SEARCH_TIMEOUT), true); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error requesting hostgroup info\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error requesting hostgroup info\n"); talloc_zfree(state->cur_filter); return EIO; } @@ -340,7 +340,7 @@ ipa_hostgroup_info_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_get_generic_recv failed: [%d]\n", ret)); + "sdap_get_generic_recv failed: [%d]\n", ret); tevent_req_error(req, ret); return; } @@ -385,7 +385,7 @@ ipa_hostgroup_info_done(struct tevent_req *subreq) if (ret != EOK) goto done; if (state->hostgroup_count == 0) { - DEBUG(SSSDBG_FUNC_DATA, ("No host groups were dereferenced\n")); + DEBUG(SSSDBG_FUNC_DATA, "No host groups were dereferenced\n"); } else { state->hostgroups = talloc_zero_array(state, struct sysdb_attrs *, state->hostgroup_count); @@ -411,8 +411,8 @@ ipa_hostgroup_info_done(struct tevent_req *subreq) &hostgroup_name); if (ret != EOK) goto done; - DEBUG(SSSDBG_FUNC_DATA, ("Dereferenced host group: %s\n", - hostgroup_name)); + DEBUG(SSSDBG_FUNC_DATA, "Dereferenced host group: %s\n", + hostgroup_name); state->hostgroups[j] = talloc_steal(state->hostgroups, deref_result[i]->attrs); j++; @@ -425,7 +425,7 @@ done: if (ret == EOK) { tevent_req_done(req); } else { - DEBUG(SSSDBG_OP_FAILURE, ("Error [%d][%s]\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Error [%d][%s]\n", ret, strerror(ret)); tevent_req_error(req, ret); } } diff --git a/src/providers/ipa/ipa_id.c b/src/providers/ipa/ipa_id.c index 6e0964400..77e5e1b24 100644 --- a/src/providers/ipa/ipa_id.c +++ b/src/providers/ipa/ipa_id.c @@ -39,7 +39,7 @@ static const char *ipa_account_info_error_text(int ret, int *dp_error, return NULL; } DEBUG(SSSDBG_CRIT_FAILURE, - ("Bug: dp_error is OK on failed request\n")); + "Bug: dp_error is OK on failed request\n"); *dp_error = DP_ERR_FATAL; break; case DP_ERR_OFFLINE: @@ -191,7 +191,7 @@ static struct tevent_req *ipa_id_get_netgroup_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, ctx->conn->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -211,7 +211,7 @@ static struct tevent_req *ipa_id_get_netgroup_send(TALLOC_CTX *memctx, clean_name, ctx->opts->netgroup_map[IPA_OC_NETGROUP].name); if (!state->filter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto fail; } @@ -302,8 +302,8 @@ static void ipa_id_get_netgroup_done(struct tevent_req *subreq) } if (ret == EOK && state->count > 1) { - DEBUG(1, ("Found more than one netgroup with the name [%s].\n", - state->name)); + DEBUG(1, "Found more than one netgroup with the name [%s].\n", + state->name); tevent_req_error(req, EINVAL); return; } diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c index a65086af4..c5bab4bba 100644 --- a/src/providers/ipa/ipa_idmap.c +++ b/src/providers/ipa/ipa_idmap.c @@ -48,8 +48,8 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, &has_algorithmic_mapping); if (err == IDMAP_SUCCESS) { DEBUG(SSSDBG_TRACE_ALL, - ("Idmap of domain [%s] already known, nothing to do.\n", - dom_sid_str)); + "Idmap of domain [%s] already known, nothing to do.\n", + dom_sid_str); return EOK; } else { err = sss_idmap_domain_by_name_has_algorithmic_mapping(idmap_ctx->map, @@ -57,30 +57,30 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, &has_algorithmic_mapping); if (err == IDMAP_SUCCESS) { DEBUG(SSSDBG_TRACE_ALL, - ("Idmap of domain [%s] already known, nothing to do.\n", - dom_sid_str)); + "Idmap of domain [%s] already known, nothing to do.\n", + dom_sid_str); return EOK; } } - DEBUG(SSSDBG_TRACE_ALL, ("Trying to add idmap for domain [%s].\n", - dom_sid_str)); + DEBUG(SSSDBG_TRACE_ALL, "Trying to add idmap for domain [%s].\n", + dom_sid_str); if (err != IDMAP_SID_UNKNOWN && err != IDMAP_NAME_UNKNOWN) { DEBUG(SSSDBG_OP_FAILURE, - ("sss_idmap_domain_has_algorithmic_mapping failed.\n")); + "sss_idmap_domain_has_algorithmic_mapping failed.\n"); return EINVAL; } dom = find_subdomain_by_sid(idmap_ctx->id_ctx->be->domain, dom_sid_str); if (dom == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("find_subdomain_by_sid failed with SID [%s].\n", dom_sid_str)); + "find_subdomain_by_sid failed with SID [%s].\n", dom_sid_str); return EINVAL; } if (dom->forest == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No forest available for domain [%s].\n", - dom_sid_str)); + DEBUG(SSSDBG_MINOR_FAILURE, "No forest available for domain [%s].\n", + dom_sid_str); return EINVAL; } @@ -88,20 +88,20 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, dom->forest, true); if (forest_root == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("find_subdomain_by_name failed to find forest root [%s].\n", - dom->forest)); + "find_subdomain_by_name failed to find forest root [%s].\n", + dom->forest); return ENOENT; } if (forest_root->domain_id == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Forest root [%s] does not have a SID.\n", - dom->forest)); + DEBUG(SSSDBG_MINOR_FAILURE, "Forest root [%s] does not have a SID.\n", + dom->forest); return EINVAL; } tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } @@ -113,8 +113,8 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, if (r->range_type == NULL || strcmp(r->range_type, IPA_RANGE_AD_TRUST_POSIX) != 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Forest root does not have range type [%s].\n", - IPA_RANGE_AD_TRUST_POSIX)); + "Forest root does not have range type [%s].\n", + IPA_RANGE_AD_TRUST_POSIX); ret = EINVAL; goto done; } @@ -123,7 +123,7 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, range.max = r->base_id + r->id_range_size -1; range_id = talloc_asprintf(tmp_ctx, "%s-%s", dom_sid_str, r->name); if (range_id == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -132,7 +132,7 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, &range, range_id, 0, true); if (err != IDMAP_SUCCESS && err != IDMAP_COLLISION) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not add range [%s] to ID map\n", range_id)); + "Could not add range [%s] to ID map\n", range_id); ret = EIO; goto done; } @@ -142,8 +142,8 @@ static errno_t ipa_idmap_check_posix_child(struct sdap_idmap_ctx *idmap_ctx, } if (!found) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No idrange found for forest root [%s].\n", - forest_root->domain_id)); + DEBUG(SSSDBG_MINOR_FAILURE, "No idrange found for forest root [%s].\n", + forest_root->domain_id); ret = ENOENT; goto done; } @@ -179,9 +179,9 @@ errno_t get_idmap_data_from_range(struct range_info *r, char *domain_name, *_name = r->trusted_dom_sid; *_sid = r->trusted_dom_sid; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Cannot determine range type, " \ + DEBUG(SSSDBG_MINOR_FAILURE, "Cannot determine range type, " \ "for id range [%s].\n", - r->name)); + r->name); return EINVAL; } } else { @@ -201,9 +201,9 @@ errno_t get_idmap_data_from_range(struct range_info *r, char *domain_name, *_name = r->trusted_dom_sid; *_sid = r->trusted_dom_sid; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Range type [%s] of id range " \ + DEBUG(SSSDBG_MINOR_FAILURE, "Range type [%s] of id range " \ "[%s] not supported.\n", \ - r->range_type, r->name)); + r->range_type, r->name); return EINVAL; } } @@ -233,14 +233,14 @@ errno_t ipa_idmap_get_ranges_from_sysdb(struct sdap_idmap_ctx *idmap_ctx, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } ret = sysdb_get_ranges(tmp_ctx, idmap_ctx->id_ctx->be->domain->sysdb, &range_count, &range_list); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_ranges failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_get_ranges failed.\n"); goto done; } @@ -250,9 +250,9 @@ errno_t ipa_idmap_get_ranges_from_sysdb(struct sdap_idmap_ctx *idmap_ctx, &name, &sid, &rid, &range, &external_mapping); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("get_idmap_data_from_range failed for " \ + DEBUG(SSSDBG_OP_FAILURE, "get_idmap_data_from_range failed for " \ "id range [%s], skipping.\n", - range_list[c]->name)); + range_list[c]->name); continue; } @@ -261,8 +261,8 @@ errno_t ipa_idmap_get_ranges_from_sysdb(struct sdap_idmap_ctx *idmap_ctx, external_mapping); if (err != IDMAP_SUCCESS) { if (!allow_collisions || err != IDMAP_COLLISION) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not add range [%s] to ID map\n", - range_list[c]->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not add range [%s] to ID map\n", + range_list[c]->name); ret = EIO; goto done; } @@ -273,7 +273,7 @@ errno_t ipa_idmap_get_ranges_from_sysdb(struct sdap_idmap_ctx *idmap_ctx, ret = ipa_idmap_check_posix_child(idmap_ctx, dom_name, dom_sid_str, range_count, range_list); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_idmap_check_posix_child failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_idmap_check_posix_child failed.\n"); goto done; } } @@ -320,8 +320,8 @@ errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, &idmap_ctx->map); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not initialize the ID map: [%s]\n", - idmap_error_string(err))); + "Could not initialize the ID map: [%s]\n", + idmap_error_string(err)); if (err == IDMAP_OUT_OF_MEMORY) { ret = ENOMEM; } else { @@ -333,7 +333,7 @@ errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, ret = ipa_idmap_get_ranges_from_sysdb(idmap_ctx, NULL, NULL, false); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("ipa_idmap_get_ranges_from_sysdb failed.\n")); + "ipa_idmap_get_ranges_from_sysdb failed.\n"); goto done; } diff --git a/src/providers/ipa/ipa_init.c b/src/providers/ipa/ipa_init.c index b1440da16..5a77fc8ad 100644 --- a/src/providers/ipa/ipa_init.c +++ b/src/providers/ipa/ipa_init.c @@ -96,7 +96,7 @@ static bool srv_in_server_list(const char *servers) /* split server parm into a 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; } @@ -132,7 +132,7 @@ int common_ipa_init(struct be_ctx *bectx) ipa_backup_servers, ipa_options, &ipa_options->service); if (ret != EOK) { - DEBUG(0, ("Failed to init IPA failover service!\n")); + DEBUG(0, "Failed to init IPA failover service!\n"); return ret; } @@ -200,7 +200,7 @@ int sssm_ipa_id_init(struct be_ctx *bectx, */ 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 == EOK) { /* nsupdate is available. Dynamic updates @@ -208,7 +208,7 @@ int sssm_ipa_id_init(struct be_ctx *bectx, */ ret = ipa_dyndns_init(sdap_ctx->be, ipa_options); if (ret != EOK) { - DEBUG(1, ("Failure setting up automatic DNS update\n")); + DEBUG(1, "Failure setting up automatic DNS update\n"); /* We will continue without DNS updating */ } } @@ -216,8 +216,8 @@ int sssm_ipa_id_init(struct be_ctx *bectx, ret = setup_tls_config(sdap_ctx->opts->basic); if (ret != EOK) { - DEBUG(1, ("setup_tls_config failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "setup_tls_config failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -233,8 +233,8 @@ int sssm_ipa_id_init(struct be_ctx *bectx, ret = sdap_setup_child(); if (ret != EOK) { - DEBUG(1, ("setup_child failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "setup_child failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -248,7 +248,7 @@ int sssm_ipa_id_init(struct be_ctx *bectx, srv_ctx = ipa_srv_plugin_ctx_init(bectx, bectx->be_res->resolv, hostname, ipa_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; } @@ -258,8 +258,8 @@ int sssm_ipa_id_init(struct be_ctx *bectx, } else if (server_mode == true) { ipa_servers = dp_opt_get_string(ipa_options->basic, IPA_SERVER); if (srv_in_server_list(ipa_servers) == true) { - DEBUG(SSSDBG_MINOR_FAILURE, ("SRV resolution enabled on the IPA server. " - "Site discovery of trusted AD servers might not work\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "SRV resolution enabled on the IPA server. " + "Site discovery of trusted AD servers might not work\n"); /* If SRV discovery is enabled on the server and * dns_discovery_domain is set explicitly, then @@ -274,18 +274,18 @@ int sssm_ipa_id_init(struct be_ctx *bectx, "It is recommended not to use SRV discovery or the " "dns_discovery_domain option for the IPA domain while " "running on the server itself\n")); - DEBUG(SSSDBG_CRIT_FAILURE, ("SRV discovery is enabled on IPA " + DEBUG(SSSDBG_CRIT_FAILURE, "SRV discovery is enabled on IPA " "server while using custom dns_discovery_domain. " "DNS discovery of trusted AD domain will likely fail. " "It is recommended not to use SRV discovery or the " "dns_discovery_domain option for the IPA domain while " - "running on the server itself\n")); + "running on the server itself\n"); } 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; } } else { @@ -295,21 +295,21 @@ int sssm_ipa_id_init(struct be_ctx *bectx, ret = dp_opt_set_string(bectx->be_res->opts, DP_RES_OPT_DNS_DOMAIN, NULL); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not reset the " + DEBUG(SSSDBG_MINOR_FAILURE, "Could not reset the " "dns_discovery_domain, trusted AD domains discovery " "might fail. Please remove dns_discovery_domain " - "from the config file and restart the SSSD\n")); + "from the config file and restart the SSSD\n"); } else { - DEBUG(SSSDBG_CONF_SETTINGS, ("The value of dns_discovery_domain " - "will be ignored in ipa_server_mode\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "The value of dns_discovery_domain " + "will be ignored in ipa_server_mode\n"); } } } else { /* fall back to standard plugin on clients. */ 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; } } @@ -320,8 +320,8 @@ int sssm_ipa_id_init(struct be_ctx *bectx, sdap_refresh_netgroups_recv, sdap_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 = &ipa_id_ops; @@ -368,7 +368,7 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, ret = sssm_ipa_id_init(bectx, &id_ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(1, ("sssm_ipa_id_init failed.\n")); + DEBUG(1, "sssm_ipa_id_init failed.\n"); goto done; } ipa_auth_ctx->sdap_id_ctx = id_ctx->sdap_id_ctx; @@ -376,7 +376,7 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, ret = dp_copy_options(ipa_auth_ctx, ipa_options->basic, IPA_OPTS_BASIC, &ipa_auth_ctx->ipa_options); if (ret != EOK) { - DEBUG(1, ("dp_copy_options failed.\n")); + DEBUG(1, "dp_copy_options failed.\n"); goto done; } @@ -419,8 +419,8 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, ret = setup_tls_config(sdap_auth_ctx->opts->basic); if (ret != EOK) { - DEBUG(1, ("setup_tls_config failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "setup_tls_config failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -428,8 +428,8 @@ int sssm_ipa_auth_init(struct be_ctx *bectx, 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; } @@ -464,13 +464,13 @@ int sssm_ipa_access_init(struct be_ctx *bectx, ipa_access_ctx = talloc_zero(bectx, struct ipa_access_ctx); if (ipa_access_ctx == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(1, ("sssm_ipa_id_init failed.\n")); + DEBUG(1, "sssm_ipa_id_init failed.\n"); goto done; } ipa_access_ctx->sdap_ctx = id_ctx->sdap_id_ctx; @@ -482,7 +482,7 @@ int sssm_ipa_access_init(struct be_ctx *bectx, ret = dp_copy_options(ipa_access_ctx, ipa_options->basic, IPA_OPTS_BASIC, &ipa_access_ctx->ipa_options); if (ret != EOK) { - DEBUG(1, ("dp_copy_options failed.\n")); + DEBUG(1, "dp_copy_options failed.\n"); goto done; } @@ -516,13 +516,13 @@ int sssm_ipa_selinux_init(struct be_ctx *bectx, selinux_ctx = talloc_zero(bectx, struct ipa_selinux_ctx); if (selinux_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } ret = sssm_ipa_id_init(bectx, ops, (void **) &selinux_ctx->id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ipa_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ipa_id_init failed.\n"); goto done; } @@ -553,13 +553,13 @@ int sssm_ipa_hostid_init(struct be_ctx *bectx, hostid_ctx = talloc_zero(bectx, struct ipa_hostid_ctx); if (hostid_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ipa_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ipa_id_init failed.\n"); goto done; } hostid_ctx->sdap_id_ctx = id_ctx->sdap_id_ctx; @@ -585,18 +585,18 @@ int sssm_ipa_autofs_init(struct be_ctx *bectx, struct ipa_id_ctx *id_ctx; int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing IPA autofs handler\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing IPA autofs handler\n"); ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ipa_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ipa_id_init failed.\n"); return ret; } return ipa_autofs_init(bectx, id_ctx, ops, pvt_data); #else - DEBUG(SSSDBG_MINOR_FAILURE, ("Autofs init handler called but SSSD is " - "built without autofs support, ignoring\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Autofs init handler called but SSSD is " + "built without autofs support, ignoring\n"); return EOK; #endif } @@ -610,19 +610,19 @@ int sssm_ipa_subdomains_init(struct be_ctx *bectx, ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ipa_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ipa_id_init failed.\n"); return ret; } ret = ipa_subdom_init(bectx, id_ctx, ops, pvt_data); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ipa_subdom_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ipa_subdom_init failed.\n"); return ret; } ret = ipa_ad_subdom_init(bectx, id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ipa_ad_subdom_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ipa_ad_subdom_init failed.\n"); return ret; } @@ -637,18 +637,18 @@ int sssm_ipa_sudo_init(struct be_ctx *bectx, struct ipa_id_ctx *id_ctx; int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing IPA sudo handler\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing IPA sudo handler\n"); ret = sssm_ipa_id_init(bectx, ops, (void **) &id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sssm_ipa_id_init failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sssm_ipa_id_init failed.\n"); return ret; } return ipa_sudo_init(bectx, id_ctx, ops, pvt_data); #else - DEBUG(SSSDBG_MINOR_FAILURE, ("Sudo init handler called but SSSD is " - "built without sudo support, ignoring\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Sudo init handler called but SSSD is " + "built without sudo support, ignoring\n"); return EOK; #endif } diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c index 0ddc6bff4..184549fa2 100644 --- a/src/providers/ipa/ipa_netgroups.c +++ b/src/providers/ipa/ipa_netgroups.c @@ -84,7 +84,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, goto fail; } name = (const char *)el->values[0].data; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Storing netgroup %s\n", name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Storing netgroup %s\n", name); netgroup_attrs = sysdb_new_attrs(mem_ctx); if (!netgroup_attrs) { @@ -97,10 +97,10 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, goto fail; } if (el->num_values == 0) { - DEBUG(7, ("Original DN is not available for [%s].\n", name)); + DEBUG(7, "Original DN is not available for [%s].\n", name); } else { - DEBUG(7, ("Adding original DN [%s] to attributes of [%s].\n", - el->values[0].data, name)); + DEBUG(7, "Adding original DN [%s] to attributes of [%s].\n", + el->values[0].data, name); ret = sysdb_attrs_add_string(netgroup_attrs, SYSDB_ORIG_DN, (const char *)el->values[0].data); if (ret) { @@ -113,7 +113,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, goto fail; } if (el->num_values == 0) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("No netgroup triples for netgroup [%s].\n", name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "No netgroup triples for netgroup [%s].\n", name); ret = sysdb_attrs_get_el(netgroup_attrs, SYSDB_NETGROUP_TRIPLE, &el); if (ret != EOK) { goto fail; @@ -136,10 +136,10 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, goto fail; } if (el->num_values == 0) { - DEBUG(7, ("No original members for netgroup [%s]\n", name)); + DEBUG(7, "No original members for netgroup [%s]\n", name); } else { - DEBUG(7, ("Adding original members to netgroup [%s]\n", name)); + DEBUG(7, "Adding original members to netgroup [%s]\n", name); for(c = 0; c < el->num_values; c++) { ret = sysdb_attrs_add_string(netgroup_attrs, opts->netgroup_map[IPA_AT_NETGROUP_MEMBER].sys_name, @@ -156,10 +156,10 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, goto fail; } if (el->num_values == 0) { - DEBUG(7, ("No members for netgroup [%s]\n", name)); + DEBUG(7, "No members for netgroup [%s]\n", name); } else { - DEBUG(7, ("Adding members to netgroup [%s]\n", name)); + DEBUG(7, "Adding members to netgroup [%s]\n", name); for(c = 0; c < el->num_values; c++) { ret = sysdb_attrs_add_string(netgroup_attrs, SYSDB_NETGROUP_MEMBER, (const char*)el->values[c].data); @@ -169,7 +169,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, } } - DEBUG(6, ("Storing info for netgroup %s\n", name)); + DEBUG(6, "Storing info for netgroup %s\n", name); ret = sysdb_add_netgroup(ctx, dom, name, NULL, netgroup_attrs, NULL, dom->netgroup_timeout, 0); @@ -178,7 +178,7 @@ static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx, return EOK; fail: - DEBUG(2, ("Failed to save netgroup %s\n", name)); + DEBUG(2, "Failed to save netgroup %s\n", name); return ret; } @@ -217,7 +217,7 @@ struct tevent_req *ipa_get_netgroups_send(TALLOC_CTX *memctx, if (!ipa_options->id->sdom->netgroup_search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Netgroup lookup request without a search base\n")); + "Netgroup lookup request without a search base\n"); ret = EINVAL; goto done; } @@ -260,8 +260,8 @@ static errno_t ipa_netgr_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for netgroups with base [%s]\n", - netgr_bases[state->netgr_base_iter]->basedn)); + "Searching for netgroups with base [%s]\n", + netgr_bases[state->netgr_base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -313,8 +313,8 @@ static void ipa_get_netgroups_process(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Search for netgroups, returned %zu results.\n", - netgroups_count)); + DEBUG(SSSDBG_TRACE_FUNC, "Search for netgroups, returned %zu results.\n", + netgroups_count); if (netgroups_count == 0) { /* No netgroups found in this search */ @@ -573,8 +573,8 @@ static void ipa_netgr_members_process(struct tevent_req *subreq) goto fail; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found %zu members in current search base\n", - count)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found %zu members in current search base\n", + count); next_call = NULL; /* While processing a batch of entities from one search base, @@ -610,8 +610,8 @@ static void ipa_netgr_members_process(struct tevent_req *subreq) table = state->new_hosts; } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Invalid entity type given for processing: %d\n", - state->current_entity)); + "Invalid entity type given for processing: %d\n", + state->current_entity); ret = EINVAL; goto fail; } @@ -866,7 +866,7 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state) hash_iterate(state->new_netgroups, extract_netgroups, state); for (i = 0; i < state->netgroups_count; i++) { /* load all its member netgroups, translate */ - DEBUG(SSSDBG_TRACE_INTERNAL, ("Extracting netgroup members of netgroup %d\n", i)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Extracting netgroup members of netgroup %d\n", i); ret = sysdb_attrs_get_string_array(state->netgroups[i], SYSDB_ORIG_NETGROUP_MEMBER, state, &members); @@ -899,10 +899,10 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state) } talloc_zfree(members); } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Extracted %d netgroup members\n", j)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Extracted %d netgroup members\n", j); /* Load all UIDs */ - DEBUG(SSSDBG_TRACE_ALL, ("Extracting user members of netgroup %d\n", i)); + DEBUG(SSSDBG_TRACE_ALL, "Extracting user members of netgroup %d\n", i); ret = extract_members(state, state->netgroups[i], SYSDB_ORIG_MEMBER_USER, state->new_users, @@ -910,9 +910,9 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state) if (ret != EOK) { goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Extracted %d user members\n", uids_count)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Extracted %d user members\n", uids_count); - DEBUG(SSSDBG_TRACE_ALL, ("Extracting host members of netgroup %d\n", i)); + DEBUG(SSSDBG_TRACE_ALL, "Extracting host members of netgroup %d\n", i); ret = extract_members(state, state->netgroups[i], SYSDB_ORIG_MEMBER_HOST, state->new_hosts, @@ -920,7 +920,7 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state) if (ret != EOK) { goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Extracted %d host members\n", hosts_count)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Extracted %d host members\n", hosts_count); ret = sysdb_attrs_get_el(state->netgroups[i], SYSDB_ORIG_NETGROUP_EXTERNAL_HOST, @@ -964,8 +964,8 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state) hosts = dash; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Putting together triples of " - "netgroup %d\n", i)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Putting together triples of " + "netgroup %d\n", i); for (j = 0; j < uids_count; j++) { for (k = 0; k < hosts_count; k++) { triple = talloc_asprintf(state, "(%s,%s,%s)", diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c index 8bad16d42..ac240be71 100644 --- a/src/providers/ipa/ipa_s2n_exop.c +++ b/src/providers/ipa/ipa_s2n_exop.c @@ -78,22 +78,22 @@ static struct tevent_req *ipa_s2n_exop_send(TALLOC_CTX *mem_ctx, state->retoid = NULL; state->retdata = NULL; - DEBUG(SSSDBG_TRACE_FUNC, ("Executing extended operation\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Executing extended operation\n"); ret = ldap_extended_operation(state->sh->ldap, EXOP_SID2NAME_OID, bv, NULL, NULL, &msgid); if (ret == -1 || msgid == -1) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ldap_extended_operation failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ldap_extended_operation failed\n"); ret = ERR_NETWORK_IO; goto fail; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("ldap_extended_operation sent, msgid = %d\n", msgid)); + DEBUG(SSSDBG_TRACE_INTERNAL, "ldap_extended_operation sent, msgid = %d\n", msgid); /* FIXME: get timeouts from configuration, for now 10 secs. */ ret = sdap_op_add(state, ev, state->sh, msgid, ipa_s2n_exop_done, req, 10, &state->op); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to set up operation!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to set up operation!\n"); ret = ERR_INTERNAL; goto fail; } @@ -128,13 +128,13 @@ static void ipa_s2n_exop_done(struct sdap_op *op, &result, &errmsg, NULL, NULL, NULL, 0); if (ret != LDAP_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("ldap_parse_result failed (%d)\n", state->op->msgid)); + DEBUG(SSSDBG_OP_FAILURE, "ldap_parse_result failed (%d)\n", state->op->msgid); ret = ERR_NETWORK_IO; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("ldap_extended_operation result: %s(%d), %s\n", - sss_ldap_err2string(result), result, errmsg)); + DEBUG(SSSDBG_TRACE_FUNC, "ldap_extended_operation result: %s(%d), %s\n", + sss_ldap_err2string(result), result, errmsg); if (result != LDAP_SUCCESS) { ret = ERR_NETWORK_IO; @@ -144,21 +144,21 @@ static void ipa_s2n_exop_done(struct sdap_op *op, ret = ldap_parse_extended_result(state->sh->ldap, reply->msg, &retoid, &retdata, 0); if (ret != LDAP_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("ldap_parse_extendend_result failed (%d)\n", ret)); + DEBUG(SSSDBG_OP_FAILURE, "ldap_parse_extendend_result failed (%d)\n", ret); ret = ERR_NETWORK_IO; goto done; } state->retoid = talloc_strdup(state, retoid); if (state->retoid == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } state->retdata = talloc(state, struct berval); if (state->retdata == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc failed.\n"); ret = ENOMEM; goto done; } @@ -166,7 +166,7 @@ static void ipa_s2n_exop_done(struct sdap_op *op, state->retdata->bv_val = talloc_memdup(state->retdata, retdata->bv_val, retdata->bv_len); if (state->retdata->bv_val == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_memdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_memdup failed.\n"); ret = ENOMEM; goto done; } @@ -305,8 +305,8 @@ static errno_t s2n_encode_request(TALLOC_CTX *mem_ctx, domain_name, req_input->inp.id); } else { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected input type [%d].\n", - req_input->type == REQ_INP_ID)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected input type [%d].\n", + req_input->type == REQ_INP_ID); ret = EINVAL; goto done; } @@ -321,8 +321,8 @@ static errno_t s2n_encode_request(TALLOC_CTX *mem_ctx, domain_name, req_input->inp.id); } else { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected input type [%d].\n", - req_input->type == REQ_INP_ID)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected input type [%d].\n", + req_input->type == REQ_INP_ID); ret = EINVAL; goto done; } @@ -332,8 +332,8 @@ static errno_t s2n_encode_request(TALLOC_CTX *mem_ctx, ret = ber_printf(ber, "{ees}", INP_SID, request_type, req_input->inp.secid); } else { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected input type [%d].\n", - req_input->type == REQ_INP_ID)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected input type [%d].\n", + req_input->type == REQ_INP_ID); ret = EINVAL; goto done; } @@ -429,33 +429,33 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, char *sid_str; if (retoid == NULL || retdata == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Missing OID or data.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Missing OID or data.\n"); return EINVAL; } if (strcmp(retoid, EXOP_SID2NAME_OID) != 0) { DEBUG(SSSDBG_OP_FAILURE, - ("Result has wrong OID, expected [%s], got [%s].\n", - EXOP_SID2NAME_OID, retoid)); + "Result has wrong OID, expected [%s], got [%s].\n", + EXOP_SID2NAME_OID, retoid); return EINVAL; } ber = ber_init(retdata); if (ber == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_init failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_init failed.\n"); return EINVAL; } tag = ber_scanf(ber, "{e", &type); if (tag == LBER_ERROR) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_scanf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_scanf failed.\n"); ret = EINVAL; goto done; } attrs = talloc_zero(mem_ctx, struct resp_attrs); if (attrs == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed.\n"); ret = ENOMEM; goto done; } @@ -464,7 +464,7 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, case RESP_USER: tag = ber_scanf(ber, "{aaii}}", &domain_name, &name, &uid, &gid); if (tag == LBER_ERROR) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_scanf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_scanf failed.\n"); ret = EINVAL; goto done; } @@ -476,7 +476,7 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, * lowercase the name. */ attrs->a.user.pw_name = sss_tc_utf8_str_tolower(attrs, name); if (attrs->a.user.pw_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -488,7 +488,7 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, case RESP_GROUP: tag = ber_scanf(ber, "{aai}}", &domain_name, &name, &gid); if (tag == LBER_ERROR) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_scanf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_scanf failed.\n"); ret = EINVAL; goto done; } @@ -500,7 +500,7 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, * lowercase the name. */ attrs->a.group.gr_name = sss_tc_utf8_str_tolower(attrs, name); if (attrs->a.group.gr_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -511,14 +511,14 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, case RESP_SID: tag = ber_scanf(ber, "a}", &sid_str); if (tag == LBER_ERROR) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_scanf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_scanf failed.\n"); ret = EINVAL; goto done; } attrs->a.sid_str = talloc_strdup(attrs, sid_str); if (attrs->a.sid_str == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -526,21 +526,21 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, case RESP_NAME: tag = ber_scanf(ber, "{aa}", &domain_name, &name); if (tag == LBER_ERROR) { - DEBUG(SSSDBG_OP_FAILURE, ("ber_scanf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ber_scanf failed.\n"); ret = EINVAL; goto done; } attrs->a.name = sss_tc_utf8_str_tolower(attrs, name); if (attrs->a.name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_tc_utf8_str_tolower failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_tc_utf8_str_tolower failed.\n"); ret = ENOMEM; goto done; } break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected response type [%d].\n", - type)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected response type [%d].\n", + type); ret = EINVAL; goto done; } @@ -549,7 +549,7 @@ static errno_t s2n_response_to_attrs(TALLOC_CTX *mem_ctx, if (type != RESP_SID) { attrs->domain_name = talloc_strdup(attrs, domain_name); if (attrs->domain_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -619,7 +619,7 @@ struct tevent_req *ipa_s2n_get_acct_info_send(TALLOC_CTX *mem_ctx, subreq = ipa_s2n_exop_send(state, state->ev, state->sh, bv_req); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_s2n_exop_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_s2n_exop_send failed.\n"); ret = ENOMEM; goto fail; } @@ -659,7 +659,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = ipa_s2n_exop_recv(subreq, state, &retoid, &retdata); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("s2n exop request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "s2n exop request failed.\n"); goto done; } @@ -667,19 +667,19 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) case REQ_FULL: ret = s2n_response_to_attrs(state, retoid, retdata, &attrs); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("s2n_response_to_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "s2n_response_to_attrs failed.\n"); goto done; } if (!(strcasecmp(state->dom->name, attrs->domain_name) == 0 || (state->dom->flat_name != NULL && strcasecmp(state->dom->flat_name, attrs->domain_name) == 0))) { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected domain name returned, " + DEBUG(SSSDBG_OP_FAILURE, "Unexpected domain name returned, " "expected [%s] or [%s], got [%s].\n", state->dom->name, state->dom->flat_name == NULL ? "" : state->dom->flat_name, - attrs->domain_name)); + attrs->domain_name); ret = EINVAL; goto done; } @@ -702,7 +702,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) subreq = ipa_s2n_exop_send(state, state->ev, state->sh, bv_req); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_s2n_exop_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_s2n_exop_send failed.\n"); ret = ENOMEM; goto done; } @@ -713,19 +713,19 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) case REQ_SIMPLE: ret = s2n_response_to_attrs(state, retoid, retdata, &simple_attrs); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("s2n_response_to_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "s2n_response_to_attrs failed.\n"); goto done; } break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unexpected request type.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unexpected request type.\n"); ret = EINVAL; goto done; } if (state->attrs == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Missing data of full request.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Missing data of full request.\n"); ret = EINVAL; goto done; } else { @@ -752,7 +752,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) user_attrs = sysdb_new_attrs(state); if (user_attrs == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_new_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_new_attrs failed.\n"); ret = ENOMEM; goto done; } @@ -761,7 +761,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) name = sss_tc_fqname(state, state->dom->names, state->dom, attrs->a.user.pw_name); if (!name) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to format user name.\n")); + DEBUG(SSSDBG_OP_FAILURE, "failed to format user name.\n"); ret = ENOMEM; goto done; } @@ -769,7 +769,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_lc_name_alias(user_attrs, name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sysdb_attrs_add_lc_name_alias failed.\n")); + "sysdb_attrs_add_lc_name_alias failed.\n"); goto done; } @@ -781,21 +781,21 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) * it from there. */ realm = get_uppercase_realm(state, state->dom->name); if (!realm) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to get realm.\n")); + DEBUG(SSSDBG_OP_FAILURE, "failed to get realm.\n"); ret = ENOMEM; goto done; } upn = talloc_asprintf(state, "%s@%s", attrs->a.user.pw_name, realm); if (!upn) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to format UPN.\n")); + DEBUG(SSSDBG_OP_FAILURE, "failed to format UPN.\n"); ret = ENOMEM; goto done; } ret = sysdb_attrs_add_string(user_attrs, SYSDB_UPN, upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } @@ -803,7 +803,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_string(user_attrs, SYSDB_SID_STR, state->req_input->inp.secid); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } } @@ -812,7 +812,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_string(user_attrs, SYSDB_SID_STR, simple_attrs->a.sid_str); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } } @@ -833,14 +833,14 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) name = sss_tc_fqname(state, state->dom->names, state->dom, attrs->a.group.gr_name); if (!name) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to format user name,\n")); + DEBUG(SSSDBG_OP_FAILURE, "failed to format user name,\n"); ret = ENOMEM; goto done; } group_attrs = sysdb_new_attrs(state); if (group_attrs == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_new_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_new_attrs failed.\n"); ret = ENOMEM; goto done; } @@ -848,7 +848,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_lc_name_alias(group_attrs, name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sysdb_attrs_add_lc_name_alias failed.\n")); + "sysdb_attrs_add_lc_name_alias failed.\n"); goto done; } @@ -856,7 +856,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_string(group_attrs, SYSDB_SID_STR, state->req_input->inp.secid); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } } @@ -865,7 +865,7 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) ret = sysdb_attrs_add_string(group_attrs, SYSDB_SID_STR, simple_attrs->a.sid_str); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } } @@ -875,8 +875,8 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) timeout, now); break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected response type [%d].\n", - attrs->response_type)); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected response type [%d].\n", + attrs->response_type); ret = EINVAL; goto done; } diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c index 784c5ab49..abeb04910 100644 --- a/src/providers/ipa/ipa_selinux.c +++ b/src/providers/ipa/ipa_selinux.c @@ -108,23 +108,23 @@ void ipa_selinux_handler(struct be_req *be_req) hostname = dp_opt_get_string(selinux_ctx->id_ctx->ipa_options->basic, IPA_HOSTNAME); if (!hostname) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot determine this machine's host name\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot determine this machine's host name\n"); goto fail; } if (strcasecmp(pd->domain, be_ctx->domain->name) != 0) { subdom_be_ctx = ipa_get_subdomains_be_ctx(be_ctx); if (subdom_be_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Subdomains are not configured, " \ + DEBUG(SSSDBG_OP_FAILURE, "Subdomains are not configured, " \ "cannot lookup domain [%s].\n", - pd->domain)); + pd->domain); goto fail; } else { user_domain = find_subdomain_by_name(subdom_be_ctx->domain, pd->domain, true); if (user_domain == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No domain entry found " \ - "for [%s].\n", pd->domain)); + DEBUG(SSSDBG_MINOR_FAILURE, "No domain entry found " \ + "for [%s].\n", pd->domain); goto fail; } } @@ -138,14 +138,14 @@ void ipa_selinux_handler(struct be_req *be_req) be_req, pd->user, hostname, selinux_ctx); if (op_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot create op context\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot create op context\n"); goto fail; } req = ipa_get_selinux_send(be_req, be_ctx, op_ctx->user, op_ctx->host, selinux_ctx); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initiate the search\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initiate the search\n"); goto fail; } @@ -203,7 +203,7 @@ ipa_selinux_create_op_ctx(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb, } else if (ret != EOK) { goto fail; } else if (count > 1) { - DEBUG(SSSDBG_OP_FAILURE, ("More than one result for a BASE search!\n")); + DEBUG(SSSDBG_OP_FAILURE, "More than one result for a BASE search!\n"); goto fail; } @@ -259,7 +259,7 @@ static void ipa_selinux_handler_done(struct tevent_req *req) ret = sysdb_transaction_start(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto fail; } in_transaction = true; @@ -267,7 +267,7 @@ static void ipa_selinux_handler_done(struct tevent_req *req) ret = sysdb_delete_usermaps(op_ctx->ipa_domain->sysdb, op_ctx->ipa_domain); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot delete existing maps from sysdb\n")); + "Cannot delete existing maps from sysdb\n"); goto fail; } @@ -287,7 +287,7 @@ static void ipa_selinux_handler_done(struct tevent_req *req) ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not commit transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not commit transaction\n"); goto fail; } in_transaction = false; @@ -308,7 +308,7 @@ static void ipa_selinux_handler_done(struct tevent_req *req) &order_array, &order_count); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to create ordered SELinux users array.\n")); + "Failed to create ordered SELinux users array.\n"); goto fail; } @@ -316,7 +316,7 @@ static void ipa_selinux_handler_done(struct tevent_req *req) order_array, order_count, default_user); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to evaluate ordered SELinux users array.\n")); + "Failed to evaluate ordered SELinux users array.\n"); goto fail; } @@ -333,7 +333,7 @@ fail: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } if (ret == EAGAIN) { @@ -480,10 +480,10 @@ ipa_selinux_process_seealso_maps(struct sysdb_attrs *user, el->name = SYSDB_ORIG_MEMBER_USER; DEBUG(SSSDBG_TRACE_ALL, - ("Matching HBAC rule %s with SELinux mappings\n", hbac_dn)); + "Matching HBAC rule %s with SELinux mappings\n", hbac_dn); if (!sss_selinux_match(hbac_rules[i], user, host, &priority)) { - DEBUG(SSSDBG_TRACE_ALL, ("Rule did not match\n")); + DEBUG(SSSDBG_TRACE_ALL, "Rule did not match\n"); continue; } @@ -500,9 +500,9 @@ ipa_selinux_process_seealso_maps(struct sysdb_attrs *user, } if (strcasecmp(hbac_dn, seealso_dn) == 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("HBAC rule [%s] matched, copying its" + DEBUG(SSSDBG_TRACE_FUNC, "HBAC rule [%s] matched, copying its" "attributes to SELinux user map [%s]\n", - hbac_dn, seealso_dn)); + hbac_dn, seealso_dn); /* Selinux maps priority evaluation removed --DELETE this comment before pushing*/ if (priority < top_priority) { @@ -623,7 +623,7 @@ static errno_t choose_best_seuser(struct sysdb_attrs **usermaps, 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; } @@ -700,7 +700,7 @@ static errno_t write_selinux_login_file(const char *orig_name, 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; } @@ -741,8 +741,8 @@ static errno_t write_selinux_login_file(const char *orig_name, /* continue if we can't get enforce mode or selinux is enabled */ } - DEBUG(SSSDBG_OP_FAILURE, ("unable to create temp file [%s] " - "for SELinux data [%d]: %s\n", tmp_path, ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "unable to create temp file [%s] " + "for SELinux data [%d]: %s\n", tmp_path, ret, strerror(ret)); goto done; } @@ -758,15 +758,15 @@ static errno_t write_selinux_login_file(const char *orig_name, written = sss_atomic_write_s(fd, full_string, len); if (written == -1) { ret = errno; - DEBUG(SSSDBG_OP_FAILURE, ("writing to SELinux data file %s" + DEBUG(SSSDBG_OP_FAILURE, "writing to SELinux data file %s" "failed [%d]: %s", tmp_path, ret, - strerror(ret))); + strerror(ret)); goto done; } if (written != len) { - DEBUG(SSSDBG_OP_FAILURE, ("Expected to write %zd bytes, wrote %zu", - written, len)); + DEBUG(SSSDBG_OP_FAILURE, "Expected to write %zd bytes, wrote %zu", + written, len); ret = EIO; goto done; } @@ -784,8 +784,8 @@ done: if (fd != -1) { close(fd); if (unlink(tmp_path) < 0) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not remove file [%s]", - tmp_path)); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not remove file [%s]", + tmp_path); } } @@ -810,8 +810,8 @@ static errno_t remove_selinux_login_file(const char *username) ret = EOK; } else { DEBUG(SSSDBG_OP_FAILURE, - ("Could not remove login file %s [%d]: %s\n", - path, ret, strerror(ret))); + "Could not remove login file %s [%d]: %s\n", + path, ret, strerror(ret)); } } @@ -858,7 +858,7 @@ ipa_get_selinux_send(TALLOC_CTX *mem_ctx, time_t refresh_interval; struct ipa_options *ipa_options = selinux_ctx->id_ctx->ipa_options; - DEBUG(SSSDBG_TRACE_FUNC, ("Retrieving SELinux user mapping\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Retrieving SELinux user mapping\n"); req = tevent_req_create(mem_ctx, &state, struct ipa_get_selinux_state); if (req == NULL) { return NULL; @@ -870,8 +870,8 @@ ipa_get_selinux_send(TALLOC_CTX *mem_ctx, state->host = host; offline = be_is_offline(be_ctx); - DEBUG(SSSDBG_TRACE_INTERNAL, ("Connection status is [%s].\n", - offline ? "offline" : "online")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Connection status is [%s].\n", + offline ? "offline" : "online"); if (!offline) { refresh_interval = dp_opt_get_int(ipa_options->basic, @@ -880,7 +880,7 @@ ipa_get_selinux_send(TALLOC_CTX *mem_ctx, if (now < selinux_ctx->last_update + refresh_interval) { /* SELinux maps were recently updated -> force offline */ DEBUG(SSSDBG_TRACE_INTERNAL, - ("Performing cached SELinux processing\n")); + "Performing cached SELinux processing\n"); offline = true; } } @@ -889,15 +889,15 @@ ipa_get_selinux_send(TALLOC_CTX *mem_ctx, state->op = sdap_id_op_create(state, selinux_ctx->id_ctx->sdap_id_ctx->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto immediate; } subreq = sdap_id_op_connect_send(state->op, state, &ret); if (!subreq) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_connect_send failed: " - "%d(%s).\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_connect_send failed: " + "%d(%s).\n", ret, strerror(ret)); talloc_zfree(state->op); goto immediate; } @@ -963,7 +963,7 @@ static void ipa_get_selinux_connect_done(struct tevent_req *subreq) hostname = dp_opt_get_string(state->selinux_ctx->id_ctx->ipa_options->basic, IPA_HOSTNAME); if (hostname == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot determine the host name\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot determine the host name\n"); goto fail; } @@ -1011,8 +1011,8 @@ ipa_get_selinux_maps_offline(struct tevent_req *req) ret = sysdb_search_selinux_config(state, state->be_ctx->domain->sysdb, state->be_ctx->domain, NULL, &defaults); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_search_selinux_config failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_search_selinux_config failed [%d]: %s\n", + ret, strerror(ret)); return ret; } @@ -1045,8 +1045,8 @@ ipa_get_selinux_maps_offline(struct tevent_req *req) state->be_ctx->domain, attrs, &nmaps, &maps); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_selinux_usermaps failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_get_selinux_usermaps failed [%d]: %s\n", + ret, strerror(ret)); return ret; } @@ -1060,8 +1060,8 @@ ipa_get_selinux_maps_offline(struct tevent_req *req) ret = hbac_get_cached_rules(state, state->be_ctx->domain, &state->hbac_rule_count, &state->hbac_rules); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("hbac_get_cached_rules failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "hbac_get_cached_rules failed [%d]: %s\n", + ret, strerror(ret)); return ret; } @@ -1127,7 +1127,7 @@ static void ipa_get_selinux_config_done(struct tevent_req *subreq) ret = ipa_get_config_recv(subreq, state, &state->defaults); talloc_free(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get IPA config\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not get IPA config\n"); goto done; } @@ -1185,7 +1185,7 @@ static void ipa_get_selinux_maps_done(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Found %zu SELinux user maps\n", state->nmaps)); + "Found %zu SELinux user maps\n", state->nmaps); check_hbac = false; for (i = 0; i < state->nmaps; i++) { @@ -1208,8 +1208,8 @@ static void ipa_get_selinux_maps_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("SELinux maps referenced an HBAC rule. " - "Need to refresh HBAC rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "SELinux maps referenced an HBAC rule. " + "Need to refresh HBAC rules\n"); subreq = ipa_hbac_rule_info_send(state, false, state->be_ctx->ev, sdap_id_op_handle(state->op), id_ctx->sdap_id_ctx->opts, @@ -1244,7 +1244,7 @@ static void ipa_get_selinux_hbac_done(struct tevent_req *subreq) ret = ipa_hbac_rule_info_recv(subreq, state, &state->hbac_rule_count, &state->hbac_rules); DEBUG(SSSDBG_TRACE_INTERNAL, - ("Received %zu HBAC rules\n", state->hbac_rule_count)); + "Received %zu HBAC rules\n", state->hbac_rule_count); talloc_free(subreq); if (ret != EOK) { diff --git a/src/providers/ipa/ipa_selinux_common.c b/src/providers/ipa/ipa_selinux_common.c index 2276d0c98..9f1b757ba 100644 --- a/src/providers/ipa/ipa_selinux_common.c +++ b/src/providers/ipa/ipa_selinux_common.c @@ -39,7 +39,7 @@ errno_t ipa_save_user_maps(struct sysdb_ctx *sysdb, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -47,16 +47,16 @@ errno_t ipa_save_user_maps(struct sysdb_ctx *sysdb, for (i = 0; i < map_count; i++) { ret = sysdb_store_selinux_usermap(sysdb, domain, maps[i]); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to store user map %d. " - "Ignoring.\n", i)); + DEBUG(SSSDBG_OP_FAILURE, "Failed to store user map %d. " + "Ignoring.\n", i); } else { - DEBUG(SSSDBG_TRACE_FUNC, ("User map %d processed.\n", i)); + DEBUG(SSSDBG_TRACE_FUNC, "User map %d processed.\n", i); } } ret = sysdb_transaction_commit(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -66,7 +66,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction"); } } return ret; diff --git a/src/providers/ipa/ipa_selinux_maps.c b/src/providers/ipa/ipa_selinux_maps.c index 1a210689b..315cc7de4 100644 --- a/src/providers/ipa/ipa_selinux_maps.c +++ b/src/providers/ipa/ipa_selinux_maps.c @@ -127,9 +127,9 @@ ipa_selinux_get_maps_next(struct tevent_req *req, return ENOMEM; } - DEBUG(SSSDBG_TRACE_FUNC, ("Trying to fetch SELinux maps with following " + DEBUG(SSSDBG_TRACE_FUNC, "Trying to fetch SELinux maps with following " "parameters: [%d][%s][%s]\n", base->scope, - state->cur_filter, base->basedn)); + state->cur_filter, base->basedn); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, base->basedn, base->scope, state->cur_filter, @@ -166,7 +166,7 @@ static void ipa_selinux_get_maps_done(struct tevent_req *subreq) if (count > 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("Found %zu user maps in current search base\n", count)); + "Found %zu user maps in current search base\n", count); total_count = count + state->map_count; state->maps = talloc_realloc(state, state->maps, struct sysdb_attrs *, total_count); @@ -192,7 +192,7 @@ static void ipa_selinux_get_maps_done(struct tevent_req *subreq) } if (state->map_count == 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("No SELinux user maps found!\n")); + DEBUG(SSSDBG_TRACE_FUNC, "No SELinux user maps found!\n"); ret = ENOENT; } diff --git a/src/providers/ipa/ipa_srv.c b/src/providers/ipa/ipa_srv.c index aa07cf054..7a3abc3ca 100644 --- a/src/providers/ipa/ipa_srv.c +++ b/src/providers/ipa/ipa_srv.c @@ -99,7 +99,7 @@ struct tevent_req *ipa_srv_plugin_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ipa_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; } @@ -132,8 +132,8 @@ struct tevent_req *ipa_srv_plugin_send(TALLOC_CTX *mem_ctx, goto immediately; } - 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, ev, ctx->resolv_ctx, service, protocol, primary_domain, backup_domain); @@ -173,8 +173,8 @@ static void ipa_srv_plugin_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); tevent_req_done(req); } diff --git a/src/providers/ipa/ipa_subdomains.c b/src/providers/ipa/ipa_subdomains.c index 07ae03b6a..1ed155bf8 100644 --- a/src/providers/ipa/ipa_subdomains.c +++ b/src/providers/ipa/ipa_subdomains.c @@ -84,7 +84,7 @@ struct be_ctx *ipa_get_subdomains_be_ctx(struct be_ctx *be_ctx) subdom_ctx = talloc_get_type(be_ctx->bet_info[BET_SUBDOMAINS].pvt_bet_data, struct ipa_subdomains_ctx); if (subdom_ctx == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("Subdomains are not configured.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Subdomains are not configured.\n"); return NULL; } @@ -108,7 +108,7 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, ad_options = ad_create_default_options(id_ctx, id_ctx->server_mode->realm, id_ctx->server_mode->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; } @@ -117,7 +117,7 @@ ipa_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; } @@ -125,7 +125,7 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, ret = dp_opt_set_string(ad_options->basic, AD_KRB5_REALM, id_ctx->server_mode->realm); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set AD realm\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set AD realm\n"); talloc_free(ad_options); return ret; } @@ -143,7 +143,7 @@ ipa_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; } @@ -163,7 +163,7 @@ ipa_ad_ctx_new(struct be_ctx *be_ctx, id_ctx->server_mode->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, @@ -173,7 +173,7 @@ ipa_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; } @@ -216,7 +216,7 @@ ipa_server_trust_add(struct be_ctx *be_ctx, ret = ipa_ad_ctx_new(be_ctx, id_ctx, subdom, &ad_id_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot create ad_id_ctx for subdomain %s\n", subdom->name)); + "Cannot create ad_id_ctx for subdomain %s\n", subdom->name); return ret; } @@ -261,8 +261,8 @@ ipa_ad_subdom_refresh(struct be_ctx *be_ctx, ret = ipa_server_trust_add(be_ctx, id_ctx, dom); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot create ad_id_ctx for subdomain %s\n", - dom->name)); + "Cannot create ad_id_ctx for subdomain %s\n", + dom->name); continue; } } @@ -278,7 +278,7 @@ ipa_subdom_reinit(struct ipa_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; } @@ -287,7 +287,7 @@ ipa_subdom_reinit(struct ipa_subdomains_ctx *ctx) IPA_SERVER_MODE)); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("sss_krb5_write_mappings failed.\n")); + "sss_krb5_write_mappings failed.\n"); /* Just continue */ } @@ -311,8 +311,8 @@ ipa_ad_subdom_remove(struct ipa_subdomains_ctx *ctx, } if (iter == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No IPA-AD context for subdomain %s\n", - subdom->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "No IPA-AD context for subdomain %s\n", + subdom->name); return; } @@ -338,7 +338,7 @@ const char *get_flat_name_from_subdomain_name(struct be_ctx *be_ctx, ctx = talloc_get_type(be_ctx->bet_info[BET_SUBDOMAINS].pvt_bet_data, struct ipa_subdomains_ctx); if (ctx == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("Subdomains are not configured.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Subdomains are not configured.\n"); return NULL; } @@ -376,26 +376,26 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, range_list = talloc_array(mem_ctx, struct range_info *, count + 1); if (range_list == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_array failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_array failed.\n"); return ENOMEM; } for (c = 0; c < count; c++) { r = talloc_zero(range_list, struct range_info); if (r == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed.\n"); ret = ENOMEM; goto done; } ret = sysdb_attrs_get_string(reply[c], IPA_CN, &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; } r->name = talloc_strdup(r, value); if (r->name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -404,40 +404,40 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, if (ret == EOK) { r->trusted_dom_sid = talloc_strdup(r, value); if (r->trusted_dom_sid == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } } else if (ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } ret = sysdb_attrs_get_uint32_t(reply[c], IPA_BASE_ID, &r->base_id); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } ret = sysdb_attrs_get_uint32_t(reply[c], IPA_ID_RANGE_SIZE, &r->id_range_size); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } ret = sysdb_attrs_get_uint32_t(reply[c], IPA_BASE_RID, &r->base_rid); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } ret = sysdb_attrs_get_uint32_t(reply[c], IPA_SECONDARY_BASE_RID, &r->secondary_base_rid); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } @@ -445,7 +445,7 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, if (ret == EOK) { r->range_type = talloc_strdup(r, value); if (r->range_type == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -458,11 +458,11 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, r->range_type = talloc_strdup(r, IPA_RANGE_AD_TRUST); } } else { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } if (r->range_type == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -470,7 +470,7 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, ret = get_idmap_data_from_range(r, domain_name, &name1, &sid1, &rid1, &range1, &mapping1); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("get_idmap_data_from_range failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "get_idmap_data_from_range failed.\n"); goto done; } for (d = 0; d < c; d++) { @@ -478,7 +478,7 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, &sid2, &rid2, &range2, &mapping2); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("get_idmap_data_from_range failed.\n")); + "get_idmap_data_from_range failed.\n"); goto done; } @@ -488,8 +488,8 @@ static errno_t ipa_ranges_parse_results(TALLOC_CTX *mem_ctx, range_list[d]->name, mapping2); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Collision of ranges [%s] and [%s] detected.\n", - r->name, range_list[d]->name)); + "Collision of ranges [%s] and [%s] detected.\n", + r->name, range_list[d]->name); ret = EINVAL; goto done; } @@ -520,7 +520,7 @@ static errno_t ipa_subdom_enumerates(struct sss_domain_info *parent, ret = sysdb_attrs_get_string(attrs, IPA_CN, &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; } @@ -541,21 +541,21 @@ static errno_t ipa_subdom_get_forest(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(attrs, SYSDB_ORIG_DN, &orig_dn); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } - DEBUG(SSSDBG_TRACE_ALL, ("Checking if we need the forest name for [%s].\n", - orig_dn)); + DEBUG(SSSDBG_TRACE_ALL, "Checking if we need the forest name for [%s].\n", + orig_dn); dn = ldb_dn_new(mem_ctx, ldb_ctx, orig_dn); if (dn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ldb_dn_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ldb_dn_new failed.\n"); goto done; } if (!ldb_dn_validate(dn)) { - DEBUG(SSSDBG_OP_FAILURE, ("Original DN [%s] is not a valid DN.\n", - orig_dn)); + DEBUG(SSSDBG_OP_FAILURE, "Original DN [%s] is not a valid DN.\n", + orig_dn); ret = EINVAL; goto done; } @@ -575,7 +575,7 @@ static errno_t ipa_subdom_get_forest(TALLOC_CTX *mem_ctx, val = ldb_dn_get_component_val(dn, 3); if (strncasecmp("trusts", (const char *) val->data, val->length) != 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("4th component is not 'trust', nothing to do.\n")); + "4th component is not 'trust', nothing to do.\n"); ret = EOK; goto done; } @@ -583,7 +583,7 @@ static errno_t ipa_subdom_get_forest(TALLOC_CTX *mem_ctx, val = ldb_dn_get_component_val(dn, 2); if (strncasecmp("ad", (const char *) val->data, val->length) != 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("3rd component is not 'ad', nothing to do.\n")); + "3rd component is not 'ad', nothing to do.\n"); ret = EOK; goto done; } @@ -591,7 +591,7 @@ static errno_t ipa_subdom_get_forest(TALLOC_CTX *mem_ctx, val = ldb_dn_get_component_val(dn, 1); forest = talloc_strndup(mem_ctx, (const char *) val->data, val->length); if (forest == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strndup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strndup failed.\n"); ret = ENOMEM; goto done; } @@ -627,7 +627,7 @@ static errno_t ipa_subdom_store(struct sss_domain_info *parent, ret = sysdb_attrs_get_string(attrs, IPA_CN, &name); 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; } @@ -639,13 +639,13 @@ static errno_t ipa_subdom_store(struct sss_domain_info *parent, ret = sysdb_attrs_get_string(attrs, IPA_FLATNAME, &flat); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } ret = sysdb_attrs_get_string(attrs, IPA_TRUSTED_DOMAIN_SID, &id); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); goto done; } @@ -660,7 +660,7 @@ static errno_t ipa_subdom_store(struct sss_domain_info *parent, ret = sysdb_subdomain_store(parent->sysdb, name, realm, flat, id, mpg, enumerate, forest); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_subdomain_store failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_subdomain_store failed.\n"); goto done; } @@ -695,7 +695,7 @@ static errno_t ipa_subdomains_refresh(struct ipa_subdomains_ctx *ctx, } ret = sysdb_attrs_get_string(reply[c], IPA_CN, &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) { @@ -726,8 +726,8 @@ static errno_t ipa_subdomains_refresh(struct ipa_subdomains_ctx *ctx, /* Nothing we can do about the errorr. Let's at least try * to reuse the existing domain */ - 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++; @@ -758,8 +758,8 @@ static errno_t ipa_subdomains_refresh(struct ipa_subdomains_ctx *ctx, ret = ipa_subdom_store(parent, ctx->sdap_id_ctx->opts->idmap_ctx, 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"); } } @@ -839,15 +839,15 @@ static void ipa_subdomains_retrieve(struct ipa_subdomains_ctx *ctx, struct be_re req_ctx->sdap_op = sdap_id_op_create(req_ctx, ctx->sdap_id_ctx->conn->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; } @@ -876,12 +876,12 @@ static void ipa_subdomains_get_conn_done(struct tevent_req *req) if (ret) { if (dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No IPA server is available, cannot get the " - "subdomain list while offline\n")); + "No IPA server is available, cannot get the " + "subdomain list while offline\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to IPA server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to connect to IPA server: [%d](%s)\n", + ret, strerror(ret)); } goto fail; @@ -933,7 +933,7 @@ ipa_subdomains_handler_get(struct ipa_subdomains_req_ctx *ctx, SDAP_SEARCH_TIMEOUT), 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; } @@ -958,7 +958,7 @@ static void ipa_subdomains_handler_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; } @@ -985,21 +985,21 @@ static void ipa_subdomains_handler_done(struct tevent_req *req) ret = ipa_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; } if (refresh_has_changes) { ret = ipa_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; } ret = ipa_ad_subdom_refresh(ctx->sd_ctx->be_ctx, ctx->sd_ctx->id_ctx, domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_ad_subdom_refresh failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_ad_subdom_refresh failed.\n"); goto done; } } @@ -1051,7 +1051,7 @@ static void ipa_subdomains_handler_ranges_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; } @@ -1059,14 +1059,14 @@ static void ipa_subdomains_handler_ranges_done(struct tevent_req *req) reply_count, reply, &range_list); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("ipa_ranges_parse_results request failed.\n")); + "ipa_ranges_parse_results request failed.\n"); goto done; } ret = sysdb_update_ranges(sysdb, range_list); talloc_free(range_list); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_update_ranges failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_update_ranges failed.\n"); goto done; } @@ -1079,7 +1079,7 @@ static void ipa_subdomains_handler_ranges_done(struct tevent_req *req) goto done; } - DEBUG(SSSDBG_OP_FAILURE, ("No search base for ranges available.\n")); + DEBUG(SSSDBG_OP_FAILURE, "No search base for ranges available.\n"); ret = EINVAL; done: @@ -1102,7 +1102,7 @@ static void ipa_subdomains_handler_master_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; } @@ -1134,7 +1134,7 @@ static void ipa_subdomains_handler_master_done(struct tevent_req *req) /* Right now we know there has been an error * and we don't have the master domain record */ - DEBUG(SSSDBG_CRIT_FAILURE, ("Master domain record not found!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Master domain record not found!\n"); if (!ctx->sd_ctx->configured_explicit) { ctx->sd_ctx->disabled_until = time(NULL) + @@ -1174,11 +1174,11 @@ static void ipa_subdom_reset_timeouts_cb(void *pvt) ctx = talloc_get_type(pvt, struct ipa_subdomains_ctx); if (ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Bad private pointer\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Bad private pointer\n"); return; } - DEBUG(SSSDBG_TRACE_ALL, ("Resetting last_refreshed and disabled_until.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Resetting last_refreshed and disabled_until.\n"); ctx->last_refreshed = 0; ctx->disabled_until = 0; } @@ -1192,7 +1192,7 @@ static void ipa_subdom_online_cb(void *pvt) ctx = talloc_get_type(pvt, struct ipa_subdomains_ctx); if (!ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Bad private pointer\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Bad private pointer\n"); return; } @@ -1203,7 +1203,7 @@ static void ipa_subdom_online_cb(void *pvt) be_req = be_req_create(ctx, NULL, ctx->be_ctx, ipa_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; } @@ -1213,7 +1213,7 @@ static void ipa_subdom_online_cb(void *pvt) ctx->timer_event = tevent_add_timer(ctx->be_ctx->ev, ctx, tv, ipa_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"); } } @@ -1237,7 +1237,7 @@ static errno_t get_config_status(struct be_ctx *be_ctx, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } @@ -1245,7 +1245,7 @@ static errno_t get_config_status(struct be_ctx *be_ctx, CONFDB_DOMAIN_SUBDOMAINS_PROVIDER, NULL, &tmp_str); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("confdb_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "confdb_get_string failed.\n"); goto done; } @@ -1255,8 +1255,8 @@ static errno_t get_config_status(struct be_ctx *be_ctx, *configured_explicit = true; } - DEBUG(SSSDBG_TRACE_ALL, ("IPA subdomain provider is configured %s.\n", - *configured_explicit ? "explicit" : "implicit")); + DEBUG(SSSDBG_TRACE_ALL, "IPA subdomain provider is configured %s.\n", + *configured_explicit ? "explicit" : "implicit"); ret = EOK; @@ -1282,7 +1282,7 @@ void ipa_subdomains_handler(struct be_req *be_req) now = time(NULL); if (ctx->disabled_until > now) { - DEBUG(SSSDBG_TRACE_ALL, ("Subdomain provider disabled.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Subdomain provider disabled.\n"); be_req_terminate(be_req, DP_ERR_OK, EOK, NULL); return; } @@ -1311,13 +1311,13 @@ int ipa_subdom_init(struct be_ctx *be_ctx, ret = get_config_status(be_ctx, &configured_explicit); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("get_config_status failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "get_config_status failed.\n"); return ret; } ctx = talloc_zero(id_ctx, struct ipa_subdomains_ctx); if (ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } @@ -1337,23 +1337,23 @@ int ipa_subdom_init(struct be_ctx *be_ctx, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to add subdom reset timeouts callback")); + "Failed to add subdom reset timeouts callback"); } ret = be_add_online_cb(ctx, be_ctx, ipa_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, ipa_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"); } ret = ipa_subdom_reinit(ctx); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not load the list of subdomains. " - "Users from trusted domains might not be resolved correctly\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not load the list of subdomains. " + "Users from trusted domains might not be resolved correctly\n"); } return EOK; @@ -1379,9 +1379,9 @@ int ipa_ad_subdom_init(struct be_ctx *be_ctx, CONFDB_DEFAULT_FULL_NAME_FORMAT) != 0) && (strcmp(be_ctx->domain->names->fq_fmt, CONFDB_DEFAULT_FULL_NAME_FORMAT_INTERNAL) != 0)) { - DEBUG(SSSDBG_FATAL_FAILURE, ("%s is set to a non-default value [%s] " \ + DEBUG(SSSDBG_FATAL_FAILURE, "%s is set to a non-default value [%s] " \ "lookups of subdomain users will likely fail!\n", - CONFDB_FULL_NAME_FORMAT, be_ctx->domain->names->fq_fmt)); + CONFDB_FULL_NAME_FORMAT, be_ctx->domain->names->fq_fmt); sss_log(SSS_LOG_ERR, "%s is set to a non-default value [%s] " \ "lookups of subdomain users will likely fail!\n", CONFDB_FULL_NAME_FORMAT, be_ctx->domain->names->fq_fmt); @@ -1390,13 +1390,13 @@ int ipa_ad_subdom_init(struct be_ctx *be_ctx, realm = dp_opt_get_string(id_ctx->ipa_options->basic, IPA_KRB5_REALM); if (realm == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No Kerberos realm for IPA?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No Kerberos realm for IPA?\n"); return EINVAL; } hostname = dp_opt_get_string(id_ctx->ipa_options->basic, IPA_HOSTNAME); if (hostname == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No host name for IPA?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No host name for IPA?\n"); return EINVAL; } @@ -1411,7 +1411,7 @@ int ipa_ad_subdom_init(struct be_ctx *be_ctx, ret = ipa_ad_subdom_refresh(be_ctx, id_ctx, be_ctx->domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_ad_subdom_refresh failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_ad_subdom_refresh failed.\n"); return ret; } diff --git a/src/providers/ipa/ipa_subdomains_ext_groups.c b/src/providers/ipa/ipa_subdomains_ext_groups.c index 7df3dbbb2..1d0c26054 100644 --- a/src/providers/ipa/ipa_subdomains_ext_groups.c +++ b/src/providers/ipa/ipa_subdomains_ext_groups.c @@ -58,14 +58,14 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); ret = ENOMEM; goto done; } ret = sss_hash_create(mem_ctx, reply_count, &ext_group_hash); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_hash_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_hash_create failed.\n"); goto done; } @@ -83,7 +83,7 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, } if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sysdb_attrs_get_string_array failed.\n")); + "sysdb_attrs_get_string_array failed.\n"); goto done; } @@ -95,7 +95,7 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, } if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sysdb_attrs_get_string_array failed.\n")); + "sysdb_attrs_get_string_array failed.\n"); goto done; } @@ -105,7 +105,7 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, ret = hash_lookup(ext_group_hash, &key, &value); if (ret == HASH_SUCCESS) { if (value.type != HASH_VALUE_PTR) { - DEBUG(SSSDBG_OP_FAILURE, ("Unexpected value type.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unexpected value type.\n"); ret = EINVAL; goto done; } @@ -113,18 +113,18 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, for (m = 0; mof[m] != NULL; m++) { /* hash_enter does not modify m_key.str. */ m_key.str = discard_const(mof[m]); - DEBUG(SSSDBG_TRACE_ALL, ("Adding group [%s] to SID [%s].\n", - m_key.str, key.str)); + DEBUG(SSSDBG_TRACE_ALL, "Adding group [%s] to SID [%s].\n", + m_key.str, key.str); ret = hash_enter(value.ptr, &m_key, &m_value); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("hash_enter failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "hash_enter failed.\n"); goto done; } } } else if (ret == HASH_ERROR_KEY_NOT_FOUND) { ret = sss_hash_create(ext_group_hash, 5, &m_hash); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_hash_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_hash_create failed.\n"); goto done; } @@ -132,26 +132,26 @@ static errno_t process_ext_groups(TALLOC_CTX *mem_ctx, size_t reply_count, value.ptr = m_hash; DEBUG(SSSDBG_TRACE_ALL, - ("Adding SID [%s] to external group hash.\n", key.str)); + "Adding SID [%s] to external group hash.\n", key.str); ret = hash_enter(ext_group_hash, &key, &value); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("hash_enter failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "hash_enter failed.\n"); goto done; } for (m = 0; mof[m] != NULL; m++) { /* hash_enter does not modify m_key.str. */ m_key.str = discard_const(mof[m]); - DEBUG(SSSDBG_TRACE_ALL, ("Adding group [%s] to SID [%s].\n", - m_key.str, key.str)); + DEBUG(SSSDBG_TRACE_ALL, "Adding group [%s] to SID [%s].\n", + m_key.str, key.str); ret = hash_enter(m_hash, &m_key, &m_value); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("hash_enter failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "hash_enter failed.\n"); goto done; } } } else { - DEBUG(SSSDBG_OP_FAILURE, ("hash_lookup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "hash_lookup failed.\n"); goto done; } } @@ -199,20 +199,20 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, ret = sysdb_initgroups(tmp_ctx, user_dom->sysdb, user_dom, user_name, &result); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_initgroups failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_initgroups failed.\n"); goto done; } if (result->count == 0) { - DEBUG(SSSDBG_MINOR_FAILURE, ("User [%s] not found in cache.\n", - user_name)); + DEBUG(SSSDBG_MINOR_FAILURE, "User [%s] not found in cache.\n", + user_name); ret = EOK; goto done; } ret = sss_hash_create(tmp_ctx, 10, &group_hash); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_hash_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_hash_create failed.\n"); goto done; } @@ -225,20 +225,20 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, sid = ldb_msg_find_attr_as_string(result->msgs[c], SYSDB_SID_STR, NULL); if (sid == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Group [%s] does not have a SID.\n", - ldb_dn_get_linearized(result->msgs[c]->dn))); + DEBUG(SSSDBG_MINOR_FAILURE, "Group [%s] does not have a SID.\n", + ldb_dn_get_linearized(result->msgs[c]->dn)); continue; } key.str = discard_const(sid); ret = hash_lookup(ext_group_hash, &key, &value); if (ret == HASH_ERROR_KEY_NOT_FOUND) { - DEBUG(SSSDBG_TRACE_ALL, ("SID [%s] not found in ext group hash.\n", - sid)); + DEBUG(SSSDBG_TRACE_ALL, "SID [%s] not found in ext group hash.\n", + sid); } else if (ret == HASH_SUCCESS) { iter = new_hash_iter_context(value.ptr); if (iter == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("new_hash_iter_context failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "new_hash_iter_context failed.\n"); ret = EINVAL; goto done; } @@ -246,35 +246,35 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, while ((entry = iter->next(iter)) != NULL) { ret = hash_enter(group_hash, &entry->key, &entry->value); if (ret != HASH_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to add group [%s].\n", - entry->key.str)); + DEBUG(SSSDBG_OP_FAILURE, "Failed to add group [%s].\n", + entry->key.str); } } talloc_free(iter); } else { - DEBUG(SSSDBG_OP_FAILURE, ("hash_lookup failed for SID [%s].\n", - sid)); + DEBUG(SSSDBG_OP_FAILURE, "hash_lookup failed for SID [%s].\n", + sid); } } g_count = hash_count(group_hash); if (g_count == 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("No external groupmemberships found.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "No external groupmemberships found.\n"); ret = EOK; goto done; } groups = talloc_zero_array(mem_ctx, char *, g_count + 1); if (groups == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_array failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_array failed.\n"); ret = ENOMEM; goto done; } iter = new_hash_iter_context(group_hash); if (iter == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("new_hash_iter_context failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "new_hash_iter_context failed.\n"); ret = EINVAL; goto done; } @@ -283,7 +283,7 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, while ((entry = iter->next(iter)) != NULL) { groups[c] = talloc_strdup(groups, entry->key.str); if (groups[c] == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -292,7 +292,7 @@ static errno_t find_ipa_ext_memberships(TALLOC_CTX *mem_ctx, user_dn = ldb_dn_copy(mem_ctx, result->msgs[0]->dn); if (user_dn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ldb_dn_copy failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ldb_dn_copy failed.\n"); ret = ENOMEM; goto done; } @@ -325,7 +325,7 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } @@ -336,7 +336,7 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, subfilter = talloc_asprintf(tmp_ctx, "(%s=%s)", SYSDB_ORIG_DN, groups[c]); if (subfilter == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -345,12 +345,12 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, subfilter, NULL, &msgs_count, &msgs); if (ret != EOK) { if (ret == ENOENT) { - DEBUG(SSSDBG_TRACE_ALL, ("Group [%s] not in the cache.\n", - groups[c])); + DEBUG(SSSDBG_TRACE_ALL, "Group [%s] not in the cache.\n", + groups[c]); *missing_groups = true; continue; } else { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_search_entry failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_search_entry failed.\n"); goto done; } } @@ -361,13 +361,13 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, ret = sysdb_mod_group_member(group_dom->sysdb, user_dn, msgs[0]->dn, LDB_FLAG_MOD_ADD); if (ret != EOK && ret != EEXIST) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_mod_group_member failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_mod_group_member failed.\n"); goto done; } user_attrs = sysdb_new_attrs(tmp_ctx); if (user_attrs == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_new_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_new_attrs failed.\n"); ret = ENOMEM; goto done; } @@ -375,14 +375,14 @@ static errno_t add_ad_user_to_cached_groups(struct ldb_dn *user_dn, ret = sysdb_attrs_add_string(user_attrs, SYSDB_ORIG_MEMBEROF, groups[c]); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } ret = sysdb_set_entry_attr(user_dom->sysdb, user_dn, user_attrs, LDB_FLAG_MOD_ADD); if (ret != EOK && ret != EEXIST) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_set_entry_attr failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_set_entry_attr failed.\n"); goto done; } @@ -442,7 +442,7 @@ struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct get_ad_membership_state); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("tevent_req_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "tevent_req_create failed.\n"); return NULL; } @@ -455,14 +455,14 @@ struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx, if ((ar->entry_type & BE_REQ_TYPE_MASK) != BE_REQ_INITGROUPS || ar->filter_type != BE_FILTER_NAME) { - DEBUG(SSSDBG_OP_FAILURE, ("Unsupported request type.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unsupported request type.\n"); ret = EINVAL; goto done; } state->user_name = talloc_strdup(state, ar->filter_value); if (state->user_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_Strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_Strdup failed.\n"); ret = ENOMEM; goto done; } @@ -470,7 +470,7 @@ struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx, state->sdap_op = sdap_id_op_create(state, state->sdap_id_ctx->conn->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 done; } @@ -480,21 +480,21 @@ struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx, server_mode->ext_groups = talloc_zero(server_mode, struct ipa_ext_groups); if (server_mode->ext_groups == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_zero failed.\n"); ret = ENOMEM; goto done; } } if (server_mode->ext_groups->next_update > time(NULL)) { - DEBUG(SSSDBG_TRACE_FUNC, ("External group information still valid.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "External group information still valid.\n"); ret = ipa_add_ext_groups_step(req); if (ret == EOK) { goto done; } else if (ret == EAGAIN) { return req; } else { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_add_ext_groups_step failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_add_ext_groups_step failed.\n"); goto done; } @@ -502,8 +502,8 @@ struct tevent_req *ipa_get_ad_memberships_send(TALLOC_CTX *mem_ctx, 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 done; } @@ -538,11 +538,11 @@ static void ipa_get_ad_memberships_connect_done(struct tevent_req *subreq) if (ret != EOK) { if (state->dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No IPA server is available, going offline\n")); + "No IPA server is available, going offline\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to IPA server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to connect to IPA server: [%d](%s)\n", + ret, strerror(ret)); } goto fail; @@ -551,7 +551,7 @@ static void ipa_get_ad_memberships_connect_done(struct tevent_req *subreq) ret = domain_to_basedn(state, state->domain, &basedn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("domain_to_basedn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "domain_to_basedn failed.\n"); goto fail; } @@ -563,7 +563,7 @@ static void ipa_get_ad_memberships_connect_done(struct tevent_req *subreq) SDAP_ENUM_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 fail; } @@ -589,18 +589,18 @@ static void ipa_get_ext_groups_done(struct tevent_req *subreq) &state->reply_count, &state->reply); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_get_ext_groups request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_get_ext_groups request failed.\n"); tevent_req_error(req, ret); return; } - DEBUG(SSSDBG_TRACE_FUNC, ("[%zu] external groups found.\n", - state->reply_count)); + DEBUG(SSSDBG_TRACE_FUNC, "[%zu] external groups found.\n", + state->reply_count); ret = process_ext_groups(state->server_mode->ext_groups, state->reply_count, state->reply, &ext_group_hash); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("process_ext_groups failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "process_ext_groups failed.\n"); goto fail; } @@ -615,7 +615,7 @@ static void ipa_get_ext_groups_done(struct tevent_req *subreq) } else if (ret == EAGAIN) { return; } else { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_add_ext_groups_step failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_add_ext_groups_step failed.\n"); goto fail; } @@ -637,12 +637,12 @@ static errno_t ipa_add_ext_groups_step(struct tevent_req *req) state->server_mode->ext_groups->ext_groups, &user_dn, &groups); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("find_ipa_ext_memberships failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_ipa_ext_memberships failed.\n"); goto fail; } if (groups == NULL) { - DEBUG(SSSDBG_TRACE_ALL, ("No external groups memberships found.\n")); + DEBUG(SSSDBG_TRACE_ALL, "No external groups memberships found.\n"); state->dp_error = DP_ERR_OK; return EOK; } @@ -651,7 +651,7 @@ static errno_t ipa_add_ext_groups_step(struct tevent_req *req) user_dn, state->user_dom, groups, state->sdap_id_ctx->be->domain); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_add_ad_memberships_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_add_ad_memberships_send failed.\n"); ret = ENOMEM; goto fail; } @@ -675,7 +675,7 @@ static void ipa_add_ad_memberships_done(struct tevent_req *subreq) ret = ipa_add_ad_memberships_recv(subreq, &state->dp_error); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ipa_add_ad_memberships request failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ipa_add_ad_memberships request failed.\n"); tevent_req_error(req, ret); return; } @@ -731,7 +731,7 @@ static struct tevent_req *ipa_add_ad_memberships_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct add_ad_membership_state); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("tevent_req_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "tevent_req_create failed.\n"); return NULL; } @@ -752,12 +752,12 @@ static struct tevent_req *ipa_add_ad_memberships_send(TALLOC_CTX *mem_ctx, ret = add_ad_user_to_cached_groups(user_dn, user_dom, group_dom, groups, &missing_groups); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("add_ad_user_to_cached_groups failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "add_ad_user_to_cached_groups failed.\n"); goto done; } if (!missing_groups) { - DEBUG(SSSDBG_TRACE_ALL, ("All groups found in cache.\n")); + DEBUG(SSSDBG_TRACE_ALL, "All groups found in cache.\n"); ret = EOK; goto done; } @@ -765,15 +765,15 @@ static struct tevent_req *ipa_add_ad_memberships_send(TALLOC_CTX *mem_ctx, state->sdap_op = sdap_id_op_create(state, state->sdap_id_ctx->conn->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 done; } 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 done; } @@ -807,11 +807,11 @@ static void ipa_add_ad_memberships_connect_done(struct tevent_req *subreq) if (ret != EOK) { if (state->dp_error == DP_ERR_OFFLINE) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No IPA server is available, going offline\n")); + "No IPA server is available, going offline\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to IPA server: [%d](%s)\n", - ret, strerror(ret))); + "Failed to connect to IPA server: [%d](%s)\n", + ret, strerror(ret)); } tevent_req_error(req, ret); @@ -842,14 +842,14 @@ static void ipa_add_ad_memberships_get_next(struct tevent_req *req) state->group_dom, state->groups, &missing_groups); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("add_ad_user_to_cached_groups failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "add_ad_user_to_cached_groups failed.\n"); goto fail; } if (missing_groups) { - DEBUG(SSSDBG_CRIT_FAILURE, ("There are unresolved external group " \ + DEBUG(SSSDBG_CRIT_FAILURE, "There are unresolved external group " \ "memberships even after all groups have " \ - "been looked up on the LDAP server.")); + "been looked up on the LDAP server."); } tevent_req_done(req); return; @@ -858,7 +858,7 @@ static void ipa_add_ad_memberships_get_next(struct tevent_req *req) group_dn = ldb_dn_new(state, sysdb_ctx_get_ldb(state->group_dom->sysdb), state->groups[state->iter]); if (group_dn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("ldb_dn_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ldb_dn_new failed.\n"); ret = ENOMEM; goto fail; } @@ -874,7 +874,7 @@ static void ipa_add_ad_memberships_get_next(struct tevent_req *req) BE_FILTER_NAME, BE_ATTR_CORE, false); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("groups_get_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n"); ret = ENOMEM; goto fail; } @@ -897,8 +897,8 @@ static void ipa_add_ad_memberships_get_group_done(struct tevent_req *subreq) ret = groups_get_recv(subreq, &state->dp_error, NULL); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to read group [%s] from LDAP [%d](%s)\n", - state->groups[state->iter], ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to read group [%s] from LDAP [%d](%s)\n", + state->groups[state->iter], ret, strerror(ret)); tevent_req_error(req, ret); return; diff --git a/src/providers/ipa/ipa_subdomains_id.c b/src/providers/ipa/ipa_subdomains_id.c index 978ccc261..bf68554e6 100644 --- a/src/providers/ipa/ipa_subdomains_id.c +++ b/src/providers/ipa/ipa_subdomains_id.c @@ -70,7 +70,7 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->ctx->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -78,7 +78,7 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx, state->domain = find_subdomain_by_name(state->ctx->be->domain, ar->domain, true); if (state->domain == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_subdomain_by_name failed.\n"); ret = ENOMEM; goto fail; } @@ -97,14 +97,14 @@ struct tevent_req *ipa_get_subdom_acct_send(TALLOC_CTX *memctx, break; case BE_REQ_INITGROUPS: ret = ENOTSUP; - DEBUG(SSSDBG_TRACE_FUNC, ("Initgroups requests are not handled " \ + DEBUG(SSSDBG_TRACE_FUNC, "Initgroups requests are not handled " \ "by the IPA provider but are resolved " \ "by the responder directly from the " \ - "cache.\n")); + "cache.\n"); break; default: ret = EINVAL; - DEBUG(SSSDBG_OP_FAILURE, ("Invalid sub-domain request type.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Invalid sub-domain request type.\n"); } if (ret != EOK) goto fail; @@ -143,7 +143,7 @@ static void ipa_get_subdom_acct_connected(struct tevent_req *subreq) req_input = talloc(state, struct req_input); if (req_input == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc failed.\n"); tevent_req_error(req, ENOMEM); return; } @@ -153,7 +153,7 @@ static void ipa_get_subdom_acct_connected(struct tevent_req *subreq) req_input->type = REQ_INP_NAME; req_input->inp.name = talloc_strdup(req_input, state->filter); if (req_input->inp.name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); tevent_req_error(req, ENOMEM); return; } @@ -170,13 +170,13 @@ static void ipa_get_subdom_acct_connected(struct tevent_req *subreq) req_input->type = REQ_INP_SECID; req_input->inp.secid = talloc_strdup(req_input, state->filter); if (req_input->inp.secid == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); tevent_req_error(req, ENOMEM); return; } break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Invalid sub-domain filter type.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Invalid sub-domain filter type.\n"); state->dp_error = dp_error; tevent_req_error(req, EINVAL); return; @@ -394,7 +394,7 @@ get_subdomain_homedir_of_user(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, uid, NULL, dom->name, dom->flat_name); if (homedir == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("expand_homedir_template failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "expand_homedir_template failed\n"); ret = ENOMEM; goto done; } @@ -435,14 +435,14 @@ store_homedir_of_user(struct sss_domain_info *domain, ret = sysdb_attrs_add_string(attrs, SYSDB_HOMEDIR, homedir); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Error setting homedir: [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Error setting homedir: [%s]\n", + strerror(ret)); goto done; } ret = sysdb_transaction_start(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } @@ -451,15 +451,15 @@ store_homedir_of_user(struct sss_domain_info *domain, ret = sysdb_set_user_attr(sysdb, domain, fqname, attrs, SYSDB_MOD_REP); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to update homedir information!\n")); + "Failed to update homedir information!\n"); goto done; } ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot commit sysdb transaction [%d]: %s.\n", - ret, strerror(ret))); + "Cannot commit sysdb transaction [%d]: %s.\n", + ret, strerror(ret)); goto done; } @@ -469,7 +469,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(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); @@ -498,15 +498,15 @@ apply_subdomain_homedir(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, ret = sysdb_getpwuid(mem_ctx, dom->sysdb, dom, uid, &res); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Unsupported filter type: [%d].\n", filter_type)); + "Unsupported filter type: [%d].\n", filter_type); ret = EINVAL; goto done; } if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to make request to our cache: [%d]: [%s]\n", - ret, sss_strerror(ret))); + "Failed to make request to our cache: [%d]: [%s]\n", + ret, sss_strerror(ret)); goto done; } @@ -522,8 +522,8 @@ apply_subdomain_homedir(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, fqname = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_NAME, NULL); uid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_UIDNUM, 0); if (uid == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("UID for user [%s] is not known.\n", - filter_value)); + DEBUG(SSSDBG_OP_FAILURE, "UID for user [%s] is not known.\n", + filter_value); ret = ENOENT; goto done; } @@ -531,16 +531,16 @@ apply_subdomain_homedir(TALLOC_CTX *mem_ctx, struct sss_domain_info *dom, ret = get_subdomain_homedir_of_user(mem_ctx, dom, fqname, uid, &homedir); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("get_subdomain_homedir_of_user failed: [%d]: [%s]\n", - ret, sss_strerror(ret))); + "get_subdomain_homedir_of_user failed: [%d]: [%s]\n", + ret, sss_strerror(ret)); goto done; } ret = store_homedir_of_user(dom, fqname, homedir); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("store_homedir_of_user failed: [%d]: [%s]\n", - ret, sss_strerror(ret))); + "store_homedir_of_user failed: [%d]: [%s]\n", + ret, sss_strerror(ret)); goto done; } @@ -560,7 +560,7 @@ ipa_get_ad_acct_ad_part_done(struct tevent_req *subreq) ret = ad_handle_acct_info_recv(subreq, &state->dp_error, NULL); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("AD lookup failed: %d\n", ret)); + DEBUG(SSSDBG_OP_FAILURE, "AD lookup failed: %d\n", ret); tevent_req_error(req, ret); return; } @@ -570,8 +570,8 @@ ipa_get_ad_acct_ad_part_done(struct tevent_req *subreq) state->ar->filter_value); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_OP_FAILURE, - ("apply_subdomain_homedir failed: [%d]: [%s].\n", - ret, sss_strerror(ret))); + "apply_subdomain_homedir failed: [%d]: [%s].\n", + ret, sss_strerror(ret)); goto fail; } @@ -613,8 +613,8 @@ ipa_get_ad_acct_done(struct tevent_req *subreq) ret = ipa_get_ad_memberships_recv(subreq, &state->dp_error); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("IPA external groups lookup failed: %d\n", - ret)); + DEBUG(SSSDBG_OP_FAILURE, "IPA external groups lookup failed: %d\n", + ret); tevent_req_error(req, ret); return; } diff --git a/src/providers/ipa/ipa_sudo.c b/src/providers/ipa/ipa_sudo.c index 726b11685..4863aa559 100644 --- a/src/providers/ipa/ipa_sudo.c +++ b/src/providers/ipa/ipa_sudo.c @@ -34,7 +34,7 @@ int ipa_sudo_init(struct be_ctx *be_ctx, struct ipa_options *ipa_options; struct sdap_options *ldap_options; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing sudo IPA back end\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing sudo IPA back end\n"); /* * SDAP_SUDO_SEARCH_BASE has already been initialized in @@ -42,8 +42,8 @@ int ipa_sudo_init(struct be_ctx *be_ctx, */ ret = sdap_sudo_init(be_ctx, id_ctx->sdap_id_ctx, ops, pvt_data); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot initialize LDAP SUDO [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Cannot initialize LDAP SUDO [%d]: %s\n", + ret, strerror(ret)); return ret; } diff --git a/src/providers/krb5/krb5_access.c b/src/providers/krb5/krb5_access.c index 479d01517..d4dc464a8 100644 --- a/src/providers/krb5/krb5_access.c +++ b/src/providers/krb5/krb5_access.c @@ -54,7 +54,7 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct krb5_access_state); if (req == NULL) { - DEBUG(1, ("tevent_req_create failed.\n")); + DEBUG(1, "tevent_req_create failed.\n"); return NULL; } @@ -66,19 +66,19 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, ret = krb5_setup(state, pd, krb5_ctx, &state->kr); if (ret != EOK) { - DEBUG(1, ("krb5_setup failed.\n")); + DEBUG(1, "krb5_setup failed.\n"); goto done; } if (pd->cmd != SSS_PAM_ACCT_MGMT) { - DEBUG(1, ("Unexpected pam task.\n")); + DEBUG(1, "Unexpected pam task.\n"); ret = EINVAL; goto done; } attrs = talloc_array(state, const char *, 5); if (attrs == NULL) { - DEBUG(1, ("talloc_array failed.\n")); + DEBUG(1, "talloc_array failed.\n"); ret = ENOMEM; goto done; } @@ -92,13 +92,13 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, ret = sysdb_get_user_attr(state, be_ctx->domain->sysdb, be_ctx->domain, state->pd->user, attrs, &res); if (ret) { - DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); + DEBUG(5, "sysdb search for upn of user [%s] failed.\n", pd->user); goto done; } switch (res->count) { case 0: - DEBUG(5, ("No attributes for user [%s] found.\n", pd->user)); + DEBUG(5, "No attributes for user [%s] found.\n", pd->user); ret = ENOENT; goto done; break; @@ -107,14 +107,14 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, be_ctx->domain, pd->user, pd->domain, &state->kr->upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("find_or_guess_upn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_or_guess_upn failed.\n"); goto done; } state->kr->uid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_UIDNUM, 0); if (state->kr->uid == 0) { - DEBUG(4, ("UID for user [%s] not known.\n", pd->user)); + DEBUG(4, "UID for user [%s] not known.\n", pd->user); ret = ENOENT; goto done; } @@ -122,14 +122,14 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, state->kr->gid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_GIDNUM, 0); if (state->kr->gid == 0) { - DEBUG(4, ("GID for user [%s] not known.\n", pd->user)); + DEBUG(4, "GID for user [%s] not known.\n", pd->user); ret = ENOENT; goto done; } break; default: - DEBUG(1, ("User search for [%s] returned > 1 results!\n", pd->user)); + DEBUG(1, "User search for [%s] returned > 1 results!\n", pd->user); ret = EINVAL; goto done; break; @@ -137,7 +137,7 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, subreq = handle_child_send(state, state->ev, state->kr); if (subreq == NULL) { - DEBUG(1, ("handle_child_send failed.\n")); + DEBUG(1, "handle_child_send failed.\n"); ret = ENOMEM; goto done; } @@ -168,12 +168,12 @@ static void krb5_access_done(struct tevent_req *subreq) ret = handle_child_recv(subreq, state, &buf, &len); talloc_free(subreq); if (ret != EOK) { - DEBUG(1, ("child failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "child failed [%d][%s].\n", ret, strerror(ret)); goto fail; } if ((size_t) len != sizeof(int32_t)) { - DEBUG(1, ("message has the wrong size.\n")); + DEBUG(1, "message has the wrong size.\n"); ret = EINVAL; goto fail; } diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index 48c0746ef..0752431f8 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -47,8 +47,8 @@ static errno_t safe_remove_old_ccache_file(const char *old_ccache, if ((old_ccache == new_ccache) || (old_ccache && new_ccache && (strcmp(old_ccache, new_ccache) == 0))) { - DEBUG(SSSDBG_TRACE_FUNC, ("New and old ccache file are the same, " - "none will be deleted.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "New and old ccache file are the same, " + "none will be deleted.\n"); return EOK; } @@ -71,7 +71,7 @@ check_old_ccache(const char *old_ccache, struct krb5child_req *kr, case ERR_NOT_FOUND: case ENOENT: DEBUG(SSSDBG_TRACE_FUNC, - ("Saved ccache %s doesn't exist.\n", old_ccache)); + "Saved ccache %s doesn't exist.\n", old_ccache); return ENOENT; case EINVAL: /* cache found but no tgt or expired */ @@ -80,14 +80,14 @@ check_old_ccache(const char *old_ccache, struct krb5child_req *kr, break; default: DEBUG(SSSDBG_OP_FAILURE, - ("Cannot check if saved ccache %s is valid\n", - old_ccache)); + "Cannot check if saved ccache %s is valid\n", + old_ccache); return ret; } ret = check_if_uid_is_active(kr->uid, active); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("check_if_uid_is_active failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "check_if_uid_is_active failed.\n"); return ret; } @@ -108,17 +108,17 @@ static int krb5_mod_ccname(TALLOC_CTX *mem_ctx, bool in_transaction = false; if (name == NULL || ccname == NULL) { - DEBUG(1, ("Missing user or ccache name.\n")); + DEBUG(1, "Missing user or ccache name.\n"); return EINVAL; } if (mod_op != SYSDB_MOD_REP && mod_op != SYSDB_MOD_DEL) { - DEBUG(1, ("Unsupported operation [%d].\n", mod_op)); + DEBUG(1, "Unsupported operation [%d].\n", mod_op); return EINVAL; } - DEBUG(9, ("%s ccname [%s] for user [%s].\n", - mod_op == SYSDB_MOD_REP ? "Save" : "Delete", ccname, name)); + DEBUG(9, "%s ccname [%s] for user [%s].\n", + mod_op == SYSDB_MOD_REP ? "Save" : "Delete", ccname, name); tmpctx = talloc_new(mem_ctx); if (!tmpctx) { @@ -133,27 +133,27 @@ static int krb5_mod_ccname(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_add_string(attrs, SYSDB_CCACHE_FILE, ccname); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); goto done; } ret = sysdb_transaction_start(sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Error %d starting transaction (%s)\n", ret, strerror(ret))); + "Error %d starting transaction (%s)\n", ret, strerror(ret)); goto done; } in_transaction = true; ret = sysdb_set_user_attr(sysdb, domain, name, attrs, mod_op); if (ret != EOK) { - DEBUG(6, ("Error: %d (%s)\n", ret, strerror(ret))); + DEBUG(6, "Error: %d (%s)\n", ret, strerror(ret)); goto done; } ret = sysdb_transaction_commit(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; @@ -162,7 +162,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } talloc_zfree(tmpctx); @@ -212,7 +212,7 @@ static struct krb5_ctx *get_krb5_ctx(struct be_req *be_req) struct krb5_ctx); break; default: - DEBUG(1, ("Unsupported PAM task.\n")); + DEBUG(1, "Unsupported PAM task.\n"); return NULL; } } @@ -235,7 +235,7 @@ errno_t krb5_setup(TALLOC_CTX *mem_ctx, struct pam_data *pd, kr = talloc_zero(mem_ctx, struct krb5child_req); if (kr == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } kr->is_offline = false; @@ -264,7 +264,7 @@ static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx, ret = sss_authtok_get_password(pd->authtok, &password, NULL); if (ret != EOK) { - DEBUG(0, ("Failed to get password [%d] %s\n", ret, strerror(ret))); + DEBUG(0, "Failed to get password [%d] %s\n", ret, strerror(ret)); *pam_status = PAM_SYSTEM_ERR; *dp_err = DP_ERR_OK; return; @@ -273,7 +273,7 @@ static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx, ret = sysdb_cache_auth(sysdb, domain, pd->user, password, cdb, true, NULL, NULL); if (ret != EOK) { - DEBUG(1, ("Offline authentication failed\n")); + DEBUG(1, "Offline authentication failed\n"); *pam_status = cached_login_pam_status(ret); *dp_err = DP_ERR_OK; return; @@ -282,7 +282,7 @@ static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx, ret = add_user_to_delayed_online_authentication(krb5_ctx, pd, uid); if (ret != EOK) { /* This error is not fatal */ - DEBUG(1, ("add_user_to_delayed_online_authentication failed.\n")); + DEBUG(1, "add_user_to_delayed_online_authentication failed.\n"); } *pam_status = PAM_AUTHINFO_UNAVAIL; *dp_err = DP_ERR_OFFLINE; @@ -312,13 +312,13 @@ static errno_t krb5_auth_prepare_ccache_name(struct krb5child_req *kr, if (kr->ccname == NULL || (kr->is_offline && !kr->active_ccache && !kr->valid_tgt) || (!kr->is_offline && !kr->active_ccache && kr->pd->cmd != SSS_CMD_RENEW)) { - DEBUG(9, ("Recreating ccache file.\n")); + DEBUG(9, "Recreating ccache file.\n"); ccname_template = dp_opt_get_cstring(kr->krb5_ctx->opts, KRB5_CCNAME_TMPL); kr->ccname = expand_ccname_template(kr, kr, ccname_template, true, be_ctx->domain->case_sensitive); if (kr->ccname == NULL) { - DEBUG(1, ("expand_ccname_template failed.\n")); + DEBUG(1, "expand_ccname_template failed.\n"); return ENOMEM; } @@ -326,7 +326,7 @@ static errno_t krb5_auth_prepare_ccache_name(struct krb5child_req *kr, kr->krb5_ctx->illegal_path_re, kr->uid, kr->gid); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("ccache creation failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "ccache creation failed.\n"); return ret; } } @@ -356,18 +356,18 @@ static void krb5_auth_store_creds(struct sysdb_ctx *sysdb, ret = sss_authtok_get_password(pd->newauthtok, &password, NULL); break; default: - DEBUG(0, ("unsupported PAM command [%d].\n", pd->cmd)); + DEBUG(0, "unsupported PAM command [%d].\n", pd->cmd); } if (ret != EOK) { - DEBUG(0, ("Failed to get password [%d] %s\n", ret, strerror(ret))); + DEBUG(0, "Failed to get password [%d] %s\n", ret, strerror(ret)); /* password caching failures are not fatal errors */ return; } if (password == NULL) { if (pd->cmd != SSS_CMD_RENEW) { - DEBUG(0, ("password not available, offline auth may not work.\n")); + DEBUG(0, "password not available, offline auth may not work.\n"); /* password caching failures are not fatal errors */ } return; @@ -375,8 +375,8 @@ static void krb5_auth_store_creds(struct sysdb_ctx *sysdb, ret = sysdb_cache_password(sysdb, domain, pd->user, password); if (ret) { - DEBUG(2, ("Failed to cache password, offline auth may not work." - " (%d)[%s]!?\n", ret, strerror(ret))); + DEBUG(2, "Failed to cache password, offline auth may not work." + " (%d)[%s]!?\n", ret, strerror(ret)); /* password caching failures are not fatal errors */ } } @@ -420,7 +420,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct krb5_auth_state); if (req == NULL) { - DEBUG(1, ("tevent_req_create failed.\n")); + DEBUG(1, "tevent_req_create failed.\n"); return NULL; } @@ -434,7 +434,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, ret = get_domain_or_subdomain(be_ctx, pd->domain, &state->domain); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("get_domain_or_subdomain failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "get_domain_or_subdomain failed.\n"); goto done; } @@ -449,8 +449,8 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, /* handle empty password gracefully */ if (authtok_type == SSS_AUTHTOK_TYPE_EMPTY) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Illegal zero-length authtok for user [%s]\n", - pd->user)); + "Illegal zero-length authtok for user [%s]\n", + pd->user); state->pam_status = PAM_AUTH_ERR; state->dp_err = DP_ERR_OK; ret = EOK; @@ -458,10 +458,10 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_CRIT_FAILURE, - ("Wrong authtok type for user [%s]. " \ + "Wrong authtok type for user [%s]. " \ "Expected [%d], got [%d]\n", pd->user, SSS_AUTHTOK_TYPE_PASSWORD, - authtok_type)); + authtok_type); state->pam_status = PAM_SYSTEM_ERR; state->dp_err = DP_ERR_FATAL; ret = EINVAL; @@ -472,7 +472,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, if (pd->priv == 1 && authtok_type != SSS_AUTHTOK_TYPE_PASSWORD) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Password reset by root is not supported.\n")); + "Password reset by root is not supported.\n"); state->pam_status = PAM_PERM_DENIED; state->dp_err = DP_ERR_OK; ret = EOK; @@ -482,10 +482,10 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, case SSS_CMD_RENEW: if (authtok_type != SSS_AUTHTOK_TYPE_CCFILE) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Wrong authtok type for user [%s]. " \ + "Wrong authtok type for user [%s]. " \ "Expected [%d], got [%d]\n", pd->user, SSS_AUTHTOK_TYPE_CCFILE, - authtok_type)); + authtok_type); state->pam_status = PAM_SYSTEM_ERR; state->dp_err = DP_ERR_FATAL; ret = EINVAL; @@ -493,7 +493,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, } break; default: - DEBUG(4, ("Unexpected pam task %d.\n", pd->cmd)); + DEBUG(4, "Unexpected pam task %d.\n", pd->cmd); state->pam_status = PAM_SYSTEM_ERR; state->dp_err = DP_ERR_FATAL; ret = EINVAL; @@ -503,8 +503,8 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, if (be_is_offline(be_ctx) && (pd->cmd == SSS_PAM_CHAUTHTOK || pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM || pd->cmd == SSS_CMD_RENEW)) { - DEBUG(9, ("Password changes and ticket renewal are not possible " - "while offline.\n")); + DEBUG(9, "Password changes and ticket renewal are not possible " + "while offline.\n"); state->pam_status = PAM_AUTHINFO_UNAVAIL; state->dp_err = DP_ERR_OFFLINE; ret = EOK; @@ -527,7 +527,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, ret = krb5_setup(state, pd, krb5_ctx, &state->kr); if (ret != EOK) { - DEBUG(1, ("krb5_setup failed.\n")); + DEBUG(1, "krb5_setup failed.\n"); goto done; } kr = state->kr; @@ -535,7 +535,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, ret = sysdb_get_user_attr(state, state->sysdb, state->domain, state->pd->user, attrs, &res); if (ret) { - DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); + DEBUG(5, "sysdb search for upn of user [%s] failed.\n", pd->user); state->pam_status = PAM_SYSTEM_ERR; state->dp_err = DP_ERR_OK; goto done; @@ -543,14 +543,14 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); if (realm == NULL) { - DEBUG(1, ("Missing Kerberos realm.\n")); + DEBUG(1, "Missing Kerberos realm.\n"); ret = ENOENT; goto done; } switch (res->count) { case 0: - DEBUG(5, ("No attributes for user [%s] found.\n", pd->user)); + DEBUG(5, "No attributes for user [%s] found.\n", pd->user); ret = ENOENT; goto done; break; @@ -560,33 +560,33 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, be_ctx->domain, pd->user, pd->domain, &kr->upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("find_or_guess_upn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_or_guess_upn failed.\n"); goto done; } ret = compare_principal_realm(kr->upn, realm, &kr->upn_from_different_realm); if (ret != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("compare_principal_realm failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "compare_principal_realm failed.\n"); goto done; } kr->homedir = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_HOMEDIR, NULL); if (kr->homedir == NULL) { - DEBUG(4, ("Home directory for user [%s] not known.\n", pd->user)); + DEBUG(4, "Home directory for user [%s] not known.\n", pd->user); } kr->uid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_UIDNUM, 0); if (kr->uid == 0) { - DEBUG(4, ("UID for user [%s] not known.\n", pd->user)); + DEBUG(4, "UID for user [%s] not known.\n", pd->user); ret = ENOENT; goto done; } kr->gid = ldb_msg_find_attr_as_uint64(res->msgs[0], SYSDB_GIDNUM, 0); if (kr->gid == 0) { - DEBUG(4, ("GID for user [%s] not known.\n", pd->user)); + DEBUG(4, "GID for user [%s] not known.\n", pd->user); ret = ENOENT; goto done; } @@ -600,28 +600,28 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, &kr->valid_tgt); if (ret == ENOENT) { DEBUG(SSSDBG_FUNC_DATA, - ("Ignoring ccache attribute [%s], because it doesn't" - "exist.\n", ccache_file)); + "Ignoring ccache attribute [%s], because it doesn't" + "exist.\n", ccache_file); ccache_file = NULL; } else if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("check_if_ccache_file_is_used failed.\n")); + "check_if_ccache_file_is_used failed.\n"); ccache_file = NULL; } } else { kr->active_ccache = false; kr->valid_tgt = false; - DEBUG(4, ("No ccache file for user [%s] found.\n", pd->user)); + DEBUG(4, "No ccache file for user [%s] found.\n", pd->user); } - DEBUG(9, ("Ccache_file is [%s] and is %s active and TGT is %s valid.\n", + DEBUG(9, "Ccache_file is [%s] and is %s active and TGT is %s valid.\n", ccache_file ? ccache_file : "not set", kr->active_ccache ? "" : "not", - kr->valid_tgt ? "" : "not")); + kr->valid_tgt ? "" : "not"); if (ccache_file != NULL) { kr->ccname = ccache_file; kr->old_ccname = talloc_strdup(kr, ccache_file); if (kr->old_ccname == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -632,7 +632,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, break; default: - DEBUG(1, ("User search for (%s) returned > 1 results!\n", pd->user)); + DEBUG(1, "User search for (%s) returned > 1 results!\n", pd->user); ret = EINVAL; goto done; break; @@ -646,7 +646,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, state->krb5_ctx->service->name, state->kr->srv == NULL ? true : false); if (!subreq) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed resolver request.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed resolver request.\n"); ret = EIO; goto done; } @@ -704,7 +704,7 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq) if (kr->pd->cmd == SSS_PAM_CHAUTHTOK || kr->pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) { DEBUG(SSSDBG_TRACE_FUNC, - ("No KDC suitable for password change is available\n")); + "No KDC suitable for password change is available\n"); state->pam_status = PAM_AUTHTOK_LOCK_BUSY; state->dp_err = DP_ERR_OK; ret = EOK; @@ -718,7 +718,7 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq) state->krb5_ctx->kpasswd_service->name, kr->kpasswd_srv == NULL ? true : false); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Resolver request failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Resolver request failed.\n"); ret = EIO; goto done; } @@ -734,21 +734,21 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq) } if (kr->is_offline) { - DEBUG(9, ("Preparing for offline operation.\n")); + DEBUG(9, "Preparing for offline operation.\n"); if (kr->valid_tgt || kr->active_ccache) { - DEBUG(9, ("Valid TGT available or " - "ccache file is already in use.\n")); + DEBUG(9, "Valid TGT available or " + "ccache file is already in use.\n"); kr->ccname = kr->old_ccname; msg = talloc_asprintf(kr->pd, "%s=%s", CCACHE_ENV_NAME, kr->ccname); if (msg == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); } else { ret = pam_add_response(kr->pd, SSS_PAM_ENV_ITEM, strlen(msg) + 1, (uint8_t *) msg); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } } @@ -785,7 +785,7 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq) subreq = handle_child_send(state, state->ev, kr); if (subreq == NULL) { - DEBUG(1, ("handle_child_send failed.\n")); + DEBUG(1, "handle_child_send failed.\n"); ret = ENOMEM; goto done; } @@ -821,7 +821,7 @@ static void krb5_auth_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret == ETIMEDOUT) { - DEBUG(1, ("child timed out!\n")); + DEBUG(1, "child timed out!\n"); switch (pd->cmd) { case SSS_PAM_AUTHENTICATE: @@ -841,7 +841,7 @@ static void krb5_auth_done(struct tevent_req *subreq) break; } default: - DEBUG(1, ("Unexpected PAM task\n")); + DEBUG(1, "Unexpected PAM task\n"); ret = EINVAL; goto done; } @@ -852,7 +852,7 @@ static void krb5_auth_done(struct tevent_req *subreq) state->krb5_ctx->service->name, search_srv == NULL ? true : false); if (subreq == NULL) { - DEBUG(1, ("Failed resolved request.\n")); + DEBUG(1, "Failed resolved request.\n"); ret = ENOMEM; goto done; } @@ -861,7 +861,7 @@ static void krb5_auth_done(struct tevent_req *subreq) } else if (ret != EOK) { - DEBUG(1, ("child failed (%d [%s])\n", ret, strerror(ret))); + DEBUG(1, "child failed (%d [%s])\n", ret, strerror(ret)); goto done; } @@ -871,8 +871,8 @@ static void krb5_auth_done(struct tevent_req *subreq) state->be_ctx->domain->pwd_expiration_warning, &res); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not parse child response [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not parse child response [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -897,7 +897,7 @@ static void krb5_auth_done(struct tevent_req *subreq) talloc_free(kr->upn); kr->upn = talloc_strdup(kr, res->correct_upn); if (kr->upn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -906,14 +906,14 @@ static void krb5_auth_done(struct tevent_req *subreq) pd->user, res->correct_upn); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("check_if_cached_upn_needs_update failed.\n")); + "check_if_cached_upn_needs_update failed.\n"); goto done; } } else { - DEBUG(SSSDBG_CRIT_FAILURE, ("UPN used in the request [%s] and " \ + DEBUG(SSSDBG_CRIT_FAILURE, "UPN used in the request [%s] and " \ "returned UPN [%s] differ by more " \ "than just the case.\n", - kr->upn, res->correct_upn)); + kr->upn, res->correct_upn); ret = EINVAL; goto done; } @@ -948,7 +948,7 @@ static void krb5_auth_done(struct tevent_req *subreq) state->krb5_ctx->kpasswd_service->name, state->kr->kpasswd_srv == NULL ? true : false); if (subreq == NULL) { - DEBUG(1, ("Resolver request failed.\n")); + DEBUG(1, "Resolver request failed.\n"); ret = ENOMEM; goto done; } @@ -965,7 +965,7 @@ static void krb5_auth_done(struct tevent_req *subreq) state->krb5_ctx->service->name, kr->srv == NULL ? true : false); if (subreq == NULL) { - DEBUG(1, ("Resolver request failed.\n")); + DEBUG(1, "Resolver request failed.\n"); ret = ENOMEM; goto done; } @@ -984,14 +984,14 @@ static void krb5_auth_done(struct tevent_req *subreq) ret = safe_remove_old_ccache_file(kr->old_ccname, NULL, kr->uid, kr->gid); if (ret != EOK) { - DEBUG(1, ("Failed to remove old ccache file [%s], " - "please remove it manually.\n", kr->old_ccname)); + DEBUG(1, "Failed to remove old ccache file [%s], " + "please remove it manually.\n", kr->old_ccname); } ret = krb5_delete_ccname(state, state->sysdb, state->domain, pd->user, kr->old_ccname); if (ret != EOK) { - DEBUG(1, ("krb5_delete_ccname failed.\n")); + DEBUG(1, "krb5_delete_ccname failed.\n"); } } } @@ -1056,7 +1056,7 @@ static void krb5_auth_done(struct tevent_req *subreq) * We expect that one of the messages in the received buffer contains * the name of the credential cache file. */ if (kr->ccname == NULL) { - DEBUG(1, ("Missing ccache name in child response.\n")); + DEBUG(1, "Missing ccache name in child response.\n"); ret = EINVAL; goto done; } @@ -1065,19 +1065,19 @@ static void krb5_auth_done(struct tevent_req *subreq) if (ret) { if (res->otp == true && pd->cmd == SSS_PAM_CHAUTHTOK) { DEBUG(SSSDBG_IMPORTANT_INFO, - ("Password change succeeded but currently " - "post-chpass kinit is not implemented\n")); + "Password change succeeded but currently " + "post-chpass kinit is not implemented\n"); user_info_type = SSS_PAM_USER_INFO_OTP_CHPASS; ret = pam_add_response(pd, SSS_PAM_USER_INFO, sizeof(uint32_t), (const uint8_t *) &user_info_type); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("pam_add_response failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "pam_add_response failed.\n"); /* Not fatal */ } } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("No ccache for %s in %s?\n", kr->upn, kr->ccname)); + "No ccache for %s in %s?\n", kr->upn, kr->ccname); goto done; } } @@ -1087,15 +1087,15 @@ static void krb5_auth_done(struct tevent_req *subreq) kr->uid, kr->gid); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to remove old ccache file [%s], " - "please remove it manually.\n", kr->old_ccname)); + "Failed to remove old ccache file [%s], " + "please remove it manually.\n", kr->old_ccname); } } ret = krb5_save_ccname(state, state->sysdb, state->domain, pd->user, kr->ccname); if (ret) { - DEBUG(1, ("krb5_save_ccname failed.\n")); + DEBUG(1, "krb5_save_ccname failed.\n"); goto done; } renew_interval_str = dp_opt_get_string(kr->krb5_ctx->opts, @@ -1104,7 +1104,7 @@ static void krb5_auth_done(struct tevent_req *subreq) ret = krb5_string_to_deltat(renew_interval_str, &renew_interval_delta); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Reading krb5_renew_interval failed.\n")); + "Reading krb5_renew_interval failed.\n"); renew_interval_delta = 0; } renew_interval_time = renew_interval_delta; @@ -1115,12 +1115,12 @@ static void krb5_auth_done(struct tevent_req *subreq) pd->cmd == SSS_PAM_CHAUTHTOK) && (res->tgtt.renew_till > res->tgtt.endtime) && (kr->ccname != NULL)) { - DEBUG(7, ("Adding [%s] for automatic renewal.\n", kr->ccname)); + DEBUG(7, "Adding [%s] for automatic renewal.\n", kr->ccname); ret = add_tgt_to_renew_table(kr->krb5_ctx, kr->ccname, &(res->tgtt), pd, kr->upn); if (ret != EOK) { - DEBUG(1, ("add_tgt_to_renew_table failed, " - "automatic renewal not possible.\n")); + DEBUG(1, "add_tgt_to_renew_table failed, " + "automatic renewal not possible.\n"); } } @@ -1134,7 +1134,7 @@ static void krb5_auth_done(struct tevent_req *subreq) state->pd, state->kr->uid, &state->pam_status, &state->dp_err); } else { - DEBUG(4, ("Backend is marked offline, retry later!\n")); + DEBUG(4, "Backend is marked offline, retry later!\n"); state->pam_status = PAM_AUTHINFO_UNAVAIL; state->dp_err = DP_ERR_OFFLINE; } @@ -1187,7 +1187,7 @@ void krb5_pam_handler(struct be_req *be_req) krb5_ctx = get_krb5_ctx(be_req); if (krb5_ctx == NULL) { - DEBUG(1, ("Kerberos context not available.\n")); + DEBUG(1, "Kerberos context not available.\n"); goto done; } @@ -1198,20 +1198,20 @@ void krb5_pam_handler(struct be_req *be_req) case SSS_PAM_CHAUTHTOK: ret = add_to_wait_queue(be_req, pd, krb5_ctx); if (ret == EOK) { - DEBUG(7, ("Request successfully added to wait queue " - "of user [%s].\n", pd->user)); + DEBUG(7, "Request successfully added to wait queue " + "of user [%s].\n", pd->user); return; } else if (ret == ENOENT) { - DEBUG(7, ("Wait queue of user [%s] is empty, " - "running request immediately.\n", pd->user)); + DEBUG(7, "Wait queue of user [%s] is empty, " + "running request immediately.\n", pd->user); } else { - DEBUG(7, ("Failed to add request to wait queue of user [%s], " - "running request immediately.\n", pd->user)); + DEBUG(7, "Failed to add request to wait queue of user [%s], " + "running request immediately.\n", pd->user); } req = krb5_auth_send(be_req, be_ctx->ev, be_ctx, pd, krb5_ctx); if (req == NULL) { - DEBUG(1, ("krb5_auth_send failed.\n")); + DEBUG(1, "krb5_auth_send failed.\n"); goto done; } @@ -1220,7 +1220,7 @@ void krb5_pam_handler(struct be_req *be_req) case SSS_PAM_ACCT_MGMT: req = krb5_access_send(be_req, be_ctx->ev, be_ctx, pd, krb5_ctx); if (req == NULL) { - DEBUG(1, ("krb5_access_send failed.\n")); + DEBUG(1, "krb5_access_send failed.\n"); goto done; } @@ -1234,7 +1234,7 @@ void krb5_pam_handler(struct be_req *be_req) goto done; break; default: - DEBUG(4, ("krb5 does not handles pam task %d.\n", pd->cmd)); + DEBUG(4, "krb5 does not handles pam task %d.\n", pd->cmd); pd->pam_status = PAM_MODULE_UNKNOWN; dp_err = DP_ERR_OK; goto done; @@ -1270,7 +1270,7 @@ void krb5_pam_handler_auth_done(struct tevent_req *req) if (krb5_ctx != NULL) { check_wait_queue(krb5_ctx, pd->user); } else { - DEBUG(1, ("Kerberos context not available.\n")); + DEBUG(1, "Kerberos context not available.\n"); } be_req_terminate(be_req, dp_err, pd->pam_status, NULL); @@ -1290,12 +1290,12 @@ static void krb5_pam_handler_access_done(struct tevent_req *req) ret = krb5_access_recv(req, &access_allowed); talloc_zfree(req); if (ret != EOK) { - DEBUG(1, ("krb5_access request failed [%d][%s]\n", ret, strerror(ret))); + DEBUG(1, "krb5_access request failed [%d][%s]\n", ret, strerror(ret)); goto done; } - DEBUG(7, ("Access %s for user [%s].\n", - access_allowed ? "allowed" : "denied", pd->user)); + DEBUG(7, "Access %s for user [%s].\n", + access_allowed ? "allowed" : "denied", pd->user); pd->pam_status = access_allowed ? PAM_SUCCESS : PAM_PERM_DENIED; dp_err = DP_ERR_OK; diff --git a/src/providers/krb5/krb5_become_user.c b/src/providers/krb5/krb5_become_user.c index 8cbeb1ce7..b5f94f993 100644 --- a/src/providers/krb5/krb5_become_user.c +++ b/src/providers/krb5/krb5_become_user.c @@ -31,12 +31,12 @@ errno_t become_user(uid_t uid, gid_t gid) int ret; DEBUG(SSSDBG_FUNC_DATA, - ("Trying to become user [%"SPRIuid"][%"SPRIgid"].\n", uid, gid)); + "Trying to become user [%"SPRIuid"][%"SPRIgid"].\n", uid, gid); /* skip call if we already are the requested user */ cuid = geteuid(); if (uid == cuid) { - DEBUG(SSSDBG_FUNC_DATA, ("Already user [%"SPRIuid"].\n", uid)); + DEBUG(SSSDBG_FUNC_DATA, "Already user [%"SPRIuid"].\n", uid); return EOK; } @@ -45,7 +45,7 @@ errno_t become_user(uid_t uid, gid_t gid) if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setgroups failed [%d][%s].\n", ret, strerror(ret))); + "setgroups failed [%d][%s].\n", ret, strerror(ret)); return ret; } @@ -54,7 +54,7 @@ errno_t become_user(uid_t uid, gid_t gid) if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setresgid failed [%d][%s].\n", ret, strerror(ret))); + "setresgid failed [%d][%s].\n", ret, strerror(ret)); return ret; } @@ -64,7 +64,7 @@ errno_t become_user(uid_t uid, gid_t gid) if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setresuid failed [%d][%s].\n", ret, strerror(ret))); + "setresuid failed [%d][%s].\n", ret, strerror(ret)); return ret; } @@ -91,22 +91,22 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, int size; int ret; - DEBUG(SSSDBG_FUNC_DATA, ("Switch user to [%d][%d].\n", uid, gid)); + DEBUG(SSSDBG_FUNC_DATA, "Switch user to [%d][%d].\n", uid, gid); if (saved_creds) { /* save current user credentials */ size = getgroups(0, NULL); if (size == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Getgroups failed! (%d, %s)\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Getgroups failed! (%d, %s)\n", + ret, strerror(ret)); goto done; } ssc = talloc_size(mem_ctx, (sizeof(struct sss_creds) + size * sizeof(gid_t))); if (!ssc) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Allocation failed!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Allocation failed!\n"); ret = ENOMEM; goto done; } @@ -115,8 +115,8 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, size = getgroups(ssc->num_gids, ssc->gids); if (size == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Getgroups failed! (%d, %s)\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Getgroups failed! (%d, %s)\n", + ret, strerror(ret)); /* free ssc immediately otherwise the code will try to restore * wrong creds */ talloc_zfree(ssc); @@ -136,7 +136,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setresuid failed [%d][%s].\n", ret, strerror(ret))); + "setresuid failed [%d][%s].\n", ret, strerror(ret)); goto done; } } @@ -150,7 +150,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_TRACE_FUNC, - ("setgroups failed [%d][%s].\n", ret, strerror(ret))); + "setgroups failed [%d][%s].\n", ret, strerror(ret)); } /* change gid now, (leaves saved gid to current, so we can restore) */ @@ -158,7 +158,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setresgid failed [%d][%s].\n", ret, strerror(ret))); + "setresgid failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -168,7 +168,7 @@ errno_t switch_creds(TALLOC_CTX *mem_ctx, if (ret == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("setresuid failed [%d][%s].\n", ret, strerror(ret))); + "setresuid failed [%d][%s].\n", ret, strerror(ret)); goto done; } } diff --git a/src/providers/krb5/krb5_child.c b/src/providers/krb5/krb5_child.c index 3ee49e467..c3849f1db 100644 --- a/src/providers/krb5/krb5_child.c +++ b/src/providers/krb5/krb5_child.c @@ -74,8 +74,8 @@ static krb5_error_code set_lifetime_options(krb5_get_init_creds_opt *options) lifetime_str = getenv(SSSD_KRB5_RENEWABLE_LIFETIME); if (lifetime_str == NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Cannot read [%s] from environment.\n", - SSSD_KRB5_RENEWABLE_LIFETIME)); + DEBUG(SSSDBG_CONF_SETTINGS, "Cannot read [%s] from environment.\n", + SSSD_KRB5_RENEWABLE_LIFETIME); /* Unset option flag to make sure defaults from krb5.conf are used. */ options->flags &= ~(KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE); @@ -83,20 +83,20 @@ static krb5_error_code set_lifetime_options(krb5_get_init_creds_opt *options) kerr = krb5_string_to_deltat(lifetime_str, &lifetime); if (kerr != 0) { DEBUG(SSSDBG_CRIT_FAILURE, - ("krb5_string_to_deltat failed for [%s].\n", - lifetime_str)); + "krb5_string_to_deltat failed for [%s].\n", + lifetime_str); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); return kerr; } - DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n", - SSSD_KRB5_RENEWABLE_LIFETIME, lifetime_str)); + DEBUG(SSSDBG_CONF_SETTINGS, "%s is set to [%s]\n", + SSSD_KRB5_RENEWABLE_LIFETIME, lifetime_str); krb5_get_init_creds_opt_set_renew_life(options, lifetime); } lifetime_str = getenv(SSSD_KRB5_LIFETIME); if (lifetime_str == NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Cannot read [%s] from environment.\n", - SSSD_KRB5_LIFETIME)); + DEBUG(SSSDBG_CONF_SETTINGS, "Cannot read [%s] from environment.\n", + SSSD_KRB5_LIFETIME); /* Unset option flag to make sure defaults from krb5.conf are used. */ options->flags &= ~(KRB5_GET_INIT_CREDS_OPT_TKT_LIFE); @@ -104,13 +104,13 @@ static krb5_error_code set_lifetime_options(krb5_get_init_creds_opt *options) kerr = krb5_string_to_deltat(lifetime_str, &lifetime); if (kerr != 0) { DEBUG(SSSDBG_CRIT_FAILURE, - ("krb5_string_to_deltat failed for [%s].\n", - lifetime_str)); + "krb5_string_to_deltat failed for [%s].\n", + lifetime_str); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); return kerr; } DEBUG(SSSDBG_CONF_SETTINGS, - ("%s is set to [%s]\n", SSSD_KRB5_LIFETIME, lifetime_str)); + "%s is set to [%s]\n", SSSD_KRB5_LIFETIME, lifetime_str); krb5_get_init_creds_opt_set_tkt_life(options, lifetime); } @@ -126,8 +126,8 @@ static void set_canonicalize_option(krb5_get_init_creds_opt *opts) if (tmp_str != NULL && strcasecmp(tmp_str, "true") == 0) { canonicalize = 1; } - DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n", - SSSD_KRB5_CANONICALIZE, tmp_str ? tmp_str : "not set")); + DEBUG(SSSDBG_CONF_SETTINGS, "%s is set to [%s]\n", + SSSD_KRB5_CANONICALIZE, tmp_str ? tmp_str : "not set"); sss_krb5_get_init_creds_opt_set_canonicalize(opts, canonicalize); } @@ -154,7 +154,7 @@ static void revert_changepw_options(krb5_get_init_creds_opt *options) kerr = set_lifetime_options(options); if (kerr != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("set_lifetime_options failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "set_lifetime_options failed.\n"); } } @@ -171,8 +171,8 @@ static errno_t sss_send_pac(krb5_authdata **pac_authdata) ret = sss_pac_make_request(SSS_PAC_ADD_PAC_USER, &sss_data, NULL, NULL, &errnop); if (ret != NSS_STATUS_SUCCESS || errnop != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_pac_make_request failed [%d][%d].\n", - ret, errnop)); + DEBUG(SSSDBG_OP_FAILURE, "sss_pac_make_request failed [%d][%d].\n", + ret, errnop); return EIO; } @@ -195,14 +195,14 @@ static void sss_krb5_expire_callback_func(krb5_context context, void *data, exp_time = password_expiration - time(NULL); if (exp_time < 0 || exp_time > UINT32_MAX) { - DEBUG(1, ("Time to expire out of range.\n")); + DEBUG(1, "Time to expire out of range.\n"); return; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("exp_time: [%ld]\n", exp_time)); + DEBUG(SSSDBG_TRACE_INTERNAL, "exp_time: [%ld]\n", exp_time); blob = talloc_array(kr->pd, uint32_t, 2); if (blob == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); return; } @@ -212,7 +212,7 @@ static void sss_krb5_expire_callback_func(krb5_context context, void *data, ret = pam_add_response(kr->pd, SSS_PAM_USER_INFO, 2 * sizeof(uint32_t), (uint8_t *) blob); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return; @@ -397,7 +397,7 @@ static krb5_error_code answer_otp(krb5_context ctx, } if (chl->tokeninfo[i] == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("No tokeninfos found which match our credentials.\n")); + "No tokeninfos found which match our credentials.\n"); ret = EOK; goto done; } @@ -406,7 +406,7 @@ static krb5_error_code answer_otp(krb5_context ctx, /* Don't let SSSD cache the OTP authtok since it is single-use. */ ret = pam_add_response(kr->pd, SSS_OTP, 0, NULL); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); goto done; } } @@ -442,21 +442,21 @@ static krb5_error_code sss_krb5_prompter(krb5_context context, void *data, struct krb5_req *kr = talloc_get_type(data, struct krb5_req); if (num_prompts != 0) { - DEBUG(1, ("Cannot handle password prompts.\n")); + DEBUG(1, "Cannot handle password prompts.\n"); return KRB5_LIBOS_CANTREADPWD; } if (banner == NULL || *banner == '\0') { - DEBUG(5, ("Prompter called with empty banner, nothing to do.\n")); + DEBUG(5, "Prompter called with empty banner, nothing to do.\n"); return EOK; } - DEBUG(SSSDBG_FUNC_DATA, ("Prompter called with [%s].\n", banner)); + DEBUG(SSSDBG_FUNC_DATA, "Prompter called with [%s].\n", banner); ret = pam_add_response(kr->pd, SSS_PAM_TEXT_MSG, strlen(banner)+1, (const uint8_t *) banner); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return EOK; @@ -472,13 +472,13 @@ static krb5_error_code create_empty_cred(krb5_context ctx, krb5_principal princ, cred = calloc(sizeof(krb5_creds), 1); if (cred == NULL) { - DEBUG(1, ("calloc failed.\n")); + DEBUG(1, "calloc failed.\n"); return ENOMEM; } kerr = krb5_copy_principal(ctx, princ, &cred->client); if (kerr != 0) { - DEBUG(1, ("krb5_copy_principal failed.\n")); + DEBUG(1, "krb5_copy_principal failed.\n"); goto done; } @@ -489,11 +489,11 @@ static krb5_error_code create_empty_cred(krb5_context ctx, krb5_principal princ, KRB5_TGS_NAME_SIZE, KRB5_TGS_NAME, krb5_realm->length, krb5_realm->data, 0); if (kerr != 0) { - DEBUG(1, ("krb5_build_principal_ext failed.\n")); + DEBUG(1, "krb5_build_principal_ext failed.\n"); goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Created empty krb5_creds.\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Created empty krb5_creds.\n"); done: if (kerr != 0) { @@ -540,7 +540,7 @@ static errno_t handle_randomized(char *in) umask(old_umask); if (fd == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("mkstemp(\"%s\") failed!\n", ccname)); + DEBUG(SSSDBG_CRIT_FAILURE, "mkstemp(\"%s\") failed!\n", ccname); return ret; } } @@ -582,7 +582,7 @@ static krb5_error_code create_ccache(char *ccname, krb5_creds *creds) if (kerr) goto done; type = krb5_cc_get_type(kctx, kcc); - DEBUG(SSSDBG_TRACE_ALL, ("Initializing ccache of type [%s]\n", type)); + DEBUG(SSSDBG_TRACE_ALL, "Initializing ccache of type [%s]\n", type); #ifdef HAVE_KRB5_CC_COLLECTION if (krb5_cc_support_switch(kctx, type)) { @@ -648,7 +648,7 @@ static errno_t pack_response_packet(TALLOC_CTX *mem_ctx, errno_t error, buf = talloc_array(mem_ctx, uint8_t, size); if (!buf) { - DEBUG(1, ("Insufficient memory to create message.\n")); + DEBUG(1, "Insufficient memory to create message.\n"); return ENOMEM; } @@ -660,7 +660,7 @@ static errno_t pack_response_packet(TALLOC_CTX *mem_ctx, errno_t error, safealign_memcpy(&buf[p], pdr->data, pdr->len, &p); } - DEBUG(SSSDBG_TRACE_INTERNAL, ("response packet size: [%zu]\n", p)); + DEBUG(SSSDBG_TRACE_INTERNAL, "response packet size: [%zu]\n", p); *_buf = buf; *_len = p; @@ -673,13 +673,13 @@ static errno_t k5c_attach_ccname_msg(struct krb5_req *kr) int ret; if (kr->ccname == NULL) { - DEBUG(1, ("Error obtaining ccname.\n")); + DEBUG(1, "Error obtaining ccname.\n"); return ERR_INTERNAL; } msg = talloc_asprintf(kr, "%s=%s",CCACHE_ENV_NAME, kr->ccname); if (msg == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } @@ -697,11 +697,11 @@ static errno_t k5c_send_data(struct krb5_req *kr, int fd, errno_t error) size_t len; int ret; - DEBUG(SSSDBG_FUNC_DATA, ("Received error code %d\n", error)); + DEBUG(SSSDBG_FUNC_DATA, "Received error code %d\n", error); ret = pack_response_packet(kr, error, kr->pd->resp_list, &buf, &len); if (ret != EOK) { - DEBUG(1, ("pack_response_packet failed.\n")); + DEBUG(1, "pack_response_packet failed.\n"); return ret; } @@ -710,18 +710,18 @@ static errno_t k5c_send_data(struct krb5_req *kr, int fd, errno_t error) if (written == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("write failed [%d][%s].\n", ret, strerror(ret))); + "write failed [%d][%s].\n", ret, strerror(ret)); return ret; } if (written != len) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Write error, wrote [%zu] bytes, expected [%zu]\n", - written, len)); + "Write error, wrote [%zu] bytes, expected [%zu]\n", + written, len); return EOK; } - DEBUG(SSSDBG_TRACE_ALL, ("Response sent.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Response sent.\n"); return EOK; } @@ -742,13 +742,13 @@ static errno_t add_ticket_times_and_upn_to_response(struct krb5_req *kr) ret = pam_add_response(kr->pd, SSS_KRB5_INFO_TGT_LIFETIME, 4*sizeof(int64_t), (uint8_t *) t); if (ret != EOK) { - DEBUG(1, ("pack_response_packet failed.\n")); + DEBUG(1, "pack_response_packet failed.\n"); goto done; } kerr = krb5_unparse_name_ext(kr->ctx, kr->creds->client, &upn, &upn_len); if (kerr != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_unparse_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_unparse_name failed.\n"); goto done; } @@ -756,7 +756,7 @@ static errno_t add_ticket_times_and_upn_to_response(struct krb5_req *kr) (uint8_t *) upn); krb5_free_unparsed_name(kr->ctx, upn); if (ret != EOK) { - DEBUG(1, ("pack_response_packet failed.\n")); + DEBUG(1, "pack_response_packet failed.\n"); goto done; } @@ -781,16 +781,16 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) memset(&keytab, 0, sizeof(keytab)); kerr = krb5_kt_resolve(kr->ctx, kr->keytab, &keytab); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("error resolving keytab [%s], " \ - "not verifying TGT.\n", kr->keytab)); + DEBUG(SSSDBG_CRIT_FAILURE, "error resolving keytab [%s], " \ + "not verifying TGT.\n", kr->keytab); return kerr; } memset(&cursor, 0, sizeof(cursor)); kerr = krb5_kt_start_seq_get(kr->ctx, keytab, &cursor); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("error reading keytab [%s], " \ - "not verifying TGT.\n", kr->keytab)); + DEBUG(SSSDBG_CRIT_FAILURE, "error reading keytab [%s], " \ + "not verifying TGT.\n", kr->keytab); return kerr; } @@ -804,19 +804,19 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) kerr = krb5_copy_principal(kr->ctx, entry.principal, &validation_princ); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_copy_principal failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_copy_principal failed.\n"); goto done; } kerr = sss_krb5_free_keytab_entry_contents(kr->ctx, &entry); if (kerr != 0) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to free keytab entry.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to free keytab entry.\n"); } memset(&entry, 0, sizeof(entry)); if (krb5_realm_compare(kr->ctx, validation_princ, kr->creds->client)) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Found keytab entry with the realm of the credential.\n")); + "Found keytab entry with the realm of the credential.\n"); realm_entry_found = true; break; } @@ -824,8 +824,8 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) if (!realm_entry_found) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Keytab entry with the realm of the credential not found " - "in keytab. Using the last entry.\n")); + "Keytab entry with the realm of the credential not found " + "in keytab. Using the last entry.\n"); } /* Close the keytab here. Even though we're using cursors, the file @@ -834,15 +834,15 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) * cursor, creating a leak. */ kerr = krb5_kt_end_seq_get(kr->ctx, keytab, &cursor); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_kt_end_seq_get failed, " \ - "not verifying TGT.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_kt_end_seq_get failed, " \ + "not verifying TGT.\n"); goto done; } /* check if we got any errors from krb5_kt_next_entry */ if (kt_err != 0 && kt_err != KRB5_KT_END) { - DEBUG(SSSDBG_CRIT_FAILURE, ("error reading keytab [%s], " \ - "not verifying TGT.\n", kr->keytab)); + DEBUG(SSSDBG_CRIT_FAILURE, "error reading keytab [%s], " \ + "not verifying TGT.\n", kr->keytab); goto done; } @@ -850,8 +850,8 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) principal = NULL; kerr = krb5_unparse_name(kr->ctx, validation_princ, &principal); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("internal error parsing principal name, " - "not verifying TGT.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "internal error parsing principal name, " + "not verifying TGT.\n"); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); goto done; } @@ -862,11 +862,11 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) &validation_ccache, &opt); if (kerr == 0) { - DEBUG(SSSDBG_TRACE_FUNC, ("TGT verified using key for [%s].\n", - principal)); + DEBUG(SSSDBG_TRACE_FUNC, "TGT verified using key for [%s].\n", + principal); } else { - DEBUG(SSSDBG_CRIT_FAILURE ,("TGT failed verification using key " \ - "for [%s].\n", principal)); + DEBUG(SSSDBG_CRIT_FAILURE ,"TGT failed verification using key " \ + "for [%s].\n", principal); goto done; } @@ -876,9 +876,9 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) kerr = sss_extract_pac(kr->ctx, validation_ccache, validation_princ, kr->creds->client, keytab, &pac_authdata); if (kerr != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_extract_and_send_pac failed, group " \ + DEBUG(SSSDBG_OP_FAILURE, "sss_extract_and_send_pac failed, group " \ "membership for user with principal [%s] " \ - "might not be correct.\n", kr->name)); + "might not be correct.\n", kr->name); kerr = 0; goto done; } @@ -886,9 +886,9 @@ static krb5_error_code validate_tgt(struct krb5_req *kr) kerr = sss_send_pac(pac_authdata); krb5_free_authdata(kr->ctx, pac_authdata); if (kerr != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_send_pac failed, group " \ + DEBUG(SSSDBG_OP_FAILURE, "sss_send_pac failed, group " \ "membership for user with principal [%s] " \ - "might not be correct.\n", kr->name)); + "might not be correct.\n", kr->name); kerr = 0; } } @@ -899,7 +899,7 @@ done: } if (krb5_kt_close(kr->ctx, keytab) != 0) { - DEBUG(SSSDBG_MINOR_FAILURE, ("krb5_kt_close failed")); + DEBUG(SSSDBG_MINOR_FAILURE, "krb5_kt_close failed"); } if (validation_princ != NULL) { krb5_free_principal(kr->ctx, validation_princ); @@ -964,13 +964,13 @@ static krb5_error_code get_and_save_tgt(struct krb5_req *kr, kr); if (kerr != 0) { KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); - DEBUG(1, ("Failed to set expire callback, continue without.\n")); + DEBUG(1, "Failed to set expire callback, continue without.\n"); } sss_krb5_princ_realm(kr->ctx, kr->princ, &realm_name, &realm_length); DEBUG(SSSDBG_TRACE_FUNC, - ("Attempting kinit for realm [%s]\n",realm_name)); + "Attempting kinit for realm [%s]\n",realm_name); kerr = krb5_get_init_creds_password(kr->ctx, kr->creds, kr->princ, discard_const(password), sss_krb5_prompter, kr, 0, @@ -988,7 +988,7 @@ static krb5_error_code get_and_save_tgt(struct krb5_req *kr, } } else { - DEBUG(SSSDBG_CONF_SETTINGS, ("TGT validation is disabled.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "TGT validation is disabled.\n"); } if (kr->validate || kr->fast_ccname != NULL) { @@ -997,7 +997,7 @@ static krb5_error_code get_and_save_tgt(struct krb5_req *kr, * ccache I/O operations with user privileges. */ kerr = become_user(kr->uid, kr->gid); if (kerr != 0) { - DEBUG(1, ("become_user failed.\n")); + DEBUG(1, "become_user failed.\n"); return kerr; } } @@ -1022,7 +1022,7 @@ static krb5_error_code get_and_save_tgt(struct krb5_req *kr, kerr = add_ticket_times_and_upn_to_response(kr); if (kerr != 0) { - DEBUG(1, ("add_ticket_times_and_upn_to_response failed.\n")); + DEBUG(1, "add_ticket_times_and_upn_to_response failed.\n"); } kerr = 0; @@ -1091,12 +1091,12 @@ static errno_t changepw_child(struct krb5_req *kr, bool prelim) size_t msg_len; uint8_t *msg; - DEBUG(SSSDBG_TRACE_LIBS, ("Password change operation\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Password change operation\n"); ret = sss_authtok_get_password(kr->pd->authtok, &password, NULL); if (ret != EOK) { - DEBUG(1, ("Failed to fetch current password [%d] %s.\n", - ret, strerror(ret))); + DEBUG(1, "Failed to fetch current password [%d] %s.\n", + ret, strerror(ret)); return ERR_NO_CREDS; } @@ -1109,26 +1109,26 @@ static errno_t changepw_child(struct krb5_req *kr, bool prelim) sss_krb5_princ_realm(kr->ctx, kr->princ, &realm_name, &realm_length); DEBUG(SSSDBG_TRACE_FUNC, - ("Attempting kinit for realm [%s]\n",realm_name)); + "Attempting kinit for realm [%s]\n",realm_name); kerr = krb5_get_init_creds_password(kr->ctx, kr->creds, kr->princ, discard_const(password), prompter, kr, 0, SSSD_KRB5_CHANGEPW_PRINCIPAL, kr->options); DEBUG(SSSDBG_TRACE_INTERNAL, - ("chpass is%s using OTP\n", kr->otp ? "" : " not")); + "chpass is%s using OTP\n", kr->otp ? "" : " not"); if (kerr != 0) { ret = pack_user_info_chpass_error(kr->pd, "Old password not accepted.", &msg_len, &msg); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("pack_user_info_chpass_error failed.\n")); + "pack_user_info_chpass_error failed.\n"); } else { ret = pam_add_response(kr->pd, SSS_PAM_USER_INFO, msg_len, msg); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("pam_add_response failed.\n")); + "pam_add_response failed.\n"); } } return kerr; @@ -1138,16 +1138,16 @@ static errno_t changepw_child(struct krb5_req *kr, bool prelim) if (prelim) { DEBUG(SSSDBG_TRACE_LIBS, - ("Initial authentication for change password operation " - "successful.\n")); + "Initial authentication for change password operation " + "successful.\n"); krb5_free_cred_contents(kr->ctx, kr->creds); return EOK; } ret = sss_authtok_get_password(kr->pd->newauthtok, &newpassword, NULL); if (ret != EOK) { - DEBUG(1, ("Failed to fetch new password [%d] %s.\n", - ret, strerror(ret))); + DEBUG(1, "Failed to fetch new password [%d] %s.\n", + ret, strerror(ret)); return ERR_NO_CREDS; } @@ -1167,29 +1167,29 @@ static errno_t changepw_child(struct krb5_req *kr, bool prelim) } if (result_code_string.length > 0) { - DEBUG(1, ("krb5_change_password failed [%d][%.*s].\n", result_code, - result_code_string.length, result_code_string.data)); + DEBUG(1, "krb5_change_password failed [%d][%.*s].\n", result_code, + result_code_string.length, result_code_string.data); user_error_message = talloc_strndup(kr->pd, result_code_string.data, result_code_string.length); if (user_error_message == NULL) { - DEBUG(1, ("talloc_strndup failed.\n")); + DEBUG(1, "talloc_strndup failed.\n"); } } if (result_string.length > 0 && result_string.data[0] != '\0') { - DEBUG(1, ("krb5_change_password failed [%d][%.*s].\n", result_code, - result_string.length, result_string.data)); + DEBUG(1, "krb5_change_password failed [%d][%.*s].\n", result_code, + result_string.length, result_string.data); talloc_free(user_error_message); user_error_message = talloc_strndup(kr->pd, result_string.data, result_string.length); if (user_error_message == NULL) { - DEBUG(1, ("talloc_strndup failed.\n")); + DEBUG(1, "talloc_strndup failed.\n"); } } else if (result_code == KRB5_KPASSWD_SOFTERROR) { user_error_message = talloc_strdup(kr->pd, "Please make sure the " "password meets the complexity constraints."); if (user_error_message == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strndup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strndup failed.\n"); } } @@ -1197,12 +1197,12 @@ static errno_t changepw_child(struct krb5_req *kr, bool prelim) ret = pack_user_info_chpass_error(kr->pd, user_error_message, &user_resp_len, &user_resp); if (ret != EOK) { - DEBUG(1, ("pack_user_info_chpass_error failed.\n")); + DEBUG(1, "pack_user_info_chpass_error failed.\n"); } else { ret = pam_add_response(kr->pd, SSS_PAM_USER_INFO, user_resp_len, user_resp); if (ret != EOK) { - DEBUG(1, ("pack_response_packet failed.\n")); + DEBUG(1, "pack_response_packet failed.\n"); } } } @@ -1237,7 +1237,7 @@ static errno_t tgt_req_child(struct krb5_req *kr) krb5_error_code kerr; int ret; - DEBUG(SSSDBG_TRACE_LIBS, ("Attempting to get a TGT\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Attempting to get a TGT\n"); ret = sss_authtok_get_password(kr->pd->authtok, &password, NULL); switch (ret) { @@ -1245,12 +1245,12 @@ static errno_t tgt_req_child(struct krb5_req *kr) break; case EACCES: - DEBUG(SSSDBG_OP_FAILURE, ("Invalid authtok type\n")); + DEBUG(SSSDBG_OP_FAILURE, "Invalid authtok type\n"); return ERR_INVALID_CRED_TYPE; break; default: - DEBUG(SSSDBG_OP_FAILURE, ("No credentials available\n")); + DEBUG(SSSDBG_OP_FAILURE, "No credentials available\n"); return ERR_NO_CREDS; break; } @@ -1269,13 +1269,13 @@ static errno_t tgt_req_child(struct krb5_req *kr) KRB5KDC_ERR_KEY_EXP regardless if the supplied password is correct or not. In general the password can still be used to get a changepw ticket. So we validate the password by trying to get a changepw ticket. */ - DEBUG(SSSDBG_TRACE_LIBS, ("Password was expired\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Password was expired\n"); kerr = sss_krb5_get_init_creds_opt_set_expire_callback(kr->ctx, kr->options, NULL, NULL); if (kerr != 0) { KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); - DEBUG(1, ("Failed to unset expire callback, continue ...\n")); + DEBUG(1, "Failed to unset expire callback, continue ...\n"); } set_changepw_options(kr->ctx, kr->options); @@ -1302,24 +1302,24 @@ static errno_t kuserok_child(struct krb5_req *kr) krb5_boolean access_allowed; krb5_error_code kerr; - DEBUG(SSSDBG_TRACE_LIBS, ("Verifying if principal can log in as user\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Verifying if principal can log in as user\n"); /* krb5_kuserok tries to verify that kr->pd->user is a locally known * account, so we have to unset _SSS_LOOPS to make getpwnam() work. */ if (unsetenv("_SSS_LOOPS") != 0) { - DEBUG(1, ("Failed to unset _SSS_LOOPS, " - "krb5_kuserok will most certainly fail.\n")); + DEBUG(1, "Failed to unset _SSS_LOOPS, " + "krb5_kuserok will most certainly fail.\n"); } kerr = krb5_set_default_realm(kr->ctx, kr->realm); if (kerr != 0) { - DEBUG(1, ("krb5_set_default_realm failed, " - "krb5_kuserok may fail.\n")); + DEBUG(1, "krb5_set_default_realm failed, " + "krb5_kuserok may fail.\n"); } access_allowed = krb5_kuserok(kr->ctx, kr->princ, kr->pd->user); DEBUG(SSSDBG_TRACE_LIBS, - ("Access was %s\n", access_allowed ? "allowed" : "denied")); + "Access was %s\n", access_allowed ? "allowed" : "denied"); if (access_allowed) { return EOK; @@ -1335,13 +1335,13 @@ static errno_t renew_tgt_child(struct krb5_req *kr) krb5_error_code kerr; int ret; - DEBUG(SSSDBG_TRACE_LIBS, ("Renewing a ticket\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Renewing a ticket\n"); ret = sss_authtok_get_ccfile(kr->pd->authtok, &ccname, NULL); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Unsupported authtok type for TGT renewal [%d].\n", - sss_authtok_get_type(kr->pd->authtok))); + "Unsupported authtok type for TGT renewal [%d].\n", + sss_authtok_get_type(kr->pd->authtok)); return ERR_INVALID_CRED_TYPE; } @@ -1364,7 +1364,7 @@ static errno_t renew_tgt_child(struct krb5_req *kr) } } else { - DEBUG(SSSDBG_CONF_SETTINGS, ("TGT validation is disabled.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "TGT validation is disabled.\n"); } if (kr->validate || kr->fast_ccname != NULL) { @@ -1373,7 +1373,7 @@ static errno_t renew_tgt_child(struct krb5_req *kr) * ccache I/O operations with user privileges. */ kerr = become_user(kr->uid, kr->gid); if (kerr != 0) { - DEBUG(1, ("become_user failed.\n")); + DEBUG(1, "become_user failed.\n"); goto done; } } @@ -1392,7 +1392,7 @@ static errno_t renew_tgt_child(struct krb5_req *kr) kerr = add_ticket_times_and_upn_to_response(kr); if (kerr != 0) { - DEBUG(1, ("add_ticket_times_and_upn_to_response failed.\n")); + DEBUG(1, "add_ticket_times_and_upn_to_response failed.\n"); } kerr = k5c_attach_ccname_msg(kr); @@ -1412,7 +1412,7 @@ static errno_t create_empty_ccache(struct krb5_req *kr) krb5_creds *creds = NULL; krb5_error_code kerr; - DEBUG(SSSDBG_TRACE_LIBS, ("Creating empty ccache\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Creating empty ccache\n"); kerr = create_empty_cred(kr->ctx, kr->princ, &creds); if (kerr == 0) { @@ -1472,13 +1472,13 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, struct pam_data *pd; errno_t ret; - DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: [%zu]\n", size)); + DEBUG(SSSDBG_TRACE_LIBS, "total buffer size: [%zu]\n", size); if (!offline || !kr) return EINVAL; pd = create_pam_data(kr); if (pd == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } kr->pd = pd; @@ -1500,12 +1500,12 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, p += len; DEBUG(SSSDBG_CONF_SETTINGS, - ("cmd [%d] uid [%llu] gid [%llu] validate [%s] " + "cmd [%d] uid [%llu] gid [%llu] validate [%s] " "enterprise principal [%s] offline [%s] UPN [%s]\n", pd->cmd, (unsigned long long) kr->uid, (unsigned long long) kr->gid, kr->validate ? "true" : "false", kr->use_enterprise_princ ? "true" : "false", - *offline ? "true" : "false", kr->upn ? kr->upn : "none")); + *offline ? "true" : "false", kr->upn ? kr->upn : "none"); if (pd->cmd == SSS_PAM_AUTHENTICATE || pd->cmd == SSS_CMD_RENEW || @@ -1527,8 +1527,8 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, return ret; } - DEBUG(SSSDBG_CONF_SETTINGS, ("ccname: [%s] keytab: [%s]\n", - kr->ccname, kr->keytab)); + DEBUG(SSSDBG_CONF_SETTINGS, "ccname: [%s] keytab: [%s]\n", + kr->ccname, kr->keytab); } else { kr->ccname = NULL; kr->keytab = NULL; @@ -1550,7 +1550,7 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, pd->user = talloc_strndup(pd, (char *)(buf + p), len); if (pd->user == NULL) return ENOMEM; p += len; - DEBUG(SSSDBG_CONF_SETTINGS, ("user: [%s]\n", pd->user)); + DEBUG(SSSDBG_CONF_SETTINGS, "user: [%s]\n", pd->user); } else { pd->user = NULL; } @@ -1594,7 +1594,7 @@ static krb5_error_code get_tgt_times(krb5_context ctx, const char *ccname, krberr = krb5_cc_resolve(ctx, ccname, &ccache); if (krberr != 0) { - DEBUG(1, ("krb5_cc_resolve failed.\n")); + DEBUG(1, "krb5_cc_resolve failed.\n"); goto done; } @@ -1606,7 +1606,7 @@ static krb5_error_code get_tgt_times(krb5_context ctx, const char *ccname, krberr = krb5_cc_retrieve_cred(ctx, ccache, 0, &mcred, &cred); if (krberr != 0) { - DEBUG(1, ("krb5_cc_retrieve_cred failed.\n")); + DEBUG(1, "krb5_cc_retrieve_cred failed.\n"); krberr = 0; goto done; } @@ -1646,13 +1646,13 @@ static krb5_error_code check_fast_ccache(TALLOC_CTX *mem_ctx, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed.\n")); + DEBUG(1, "talloc_new failed.\n"); return ENOMEM; } ccname = talloc_asprintf(tmp_ctx, "FILE:%s/fast_ccache_%s", DB_PATH, realm); if (ccname == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); kerr = ENOMEM; goto done; } @@ -1664,30 +1664,30 @@ static krb5_error_code check_fast_ccache(TALLOC_CTX *mem_ctx, } if (kerr) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to read keytab file [%s]: %s\n", + "Failed to read keytab file [%s]: %s\n", KEYTAB_CLEAN_NAME, - sss_krb5_get_error_message(ctx, kerr))); + sss_krb5_get_error_message(ctx, kerr)); goto done; } kerr = find_principal_in_keytab(ctx, keytab, primary, realm, &client_princ); if (kerr != 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("find_principal_in_keytab failed for principal %s@%s.\n", - primary, realm)); + "find_principal_in_keytab failed for principal %s@%s.\n", + primary, realm); goto done; } server_name = talloc_asprintf(tmp_ctx, "krbtgt/%s@%s", realm, realm); if (server_name == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); kerr = ENOMEM; goto done; } kerr = krb5_parse_name(ctx, server_name, &server_princ); if (kerr != 0) { - DEBUG(1, ("krb5_parse_name failed.\n")); + DEBUG(1, "krb5_parse_name failed.\n"); goto done; } @@ -1695,14 +1695,14 @@ static krb5_error_code check_fast_ccache(TALLOC_CTX *mem_ctx, kerr = get_tgt_times(ctx, ccname, server_princ, client_princ, &tgtt); if (kerr == 0) { if (tgtt.endtime > time(NULL)) { - DEBUG(5, ("FAST TGT is still valid.\n")); + DEBUG(5, "FAST TGT is still valid.\n"); goto done; } } kerr = get_and_save_tgt_with_keytab(ctx, client_princ, keytab, ccname); if (kerr != 0) { - DEBUG(1, ("get_and_save_tgt_with_keytab failed.\n")); + DEBUG(1, "get_and_save_tgt_with_keytab failed.\n"); goto done; } @@ -1740,13 +1740,13 @@ static errno_t k5c_recv_data(struct krb5_req *kr, int fd, uint32_t *offline) ret = errno; ret = (ret == 0) ? EINVAL: ret; DEBUG(SSSDBG_CRIT_FAILURE, - ("read failed [%d][%s].\n", ret, strerror(ret))); + "read failed [%d][%s].\n", ret, strerror(ret)); return ret; } ret = unpack_buffer(buf, len, kr, offline); if (ret != EOK) { - DEBUG(1, ("unpack_buffer failed.\n")); + DEBUG(1, "unpack_buffer failed.\n"); } return ret; @@ -1763,30 +1763,30 @@ static int k5c_setup_fast(struct krb5_req *kr, bool demand) tmp_str = getenv(SSSD_KRB5_FAST_PRINCIPAL); if (tmp_str) { - DEBUG(SSSDBG_CONF_SETTINGS, ("%s is set to [%s]\n", - SSSD_KRB5_FAST_PRINCIPAL, tmp_str)); + DEBUG(SSSDBG_CONF_SETTINGS, "%s is set to [%s]\n", + SSSD_KRB5_FAST_PRINCIPAL, tmp_str); kerr = krb5_parse_name(kr->ctx, tmp_str, &fast_princ_struct); if (kerr) { - DEBUG(1, ("krb5_parse_name failed.\n")); + DEBUG(1, "krb5_parse_name failed.\n"); return kerr; } kerr = sss_krb5_unparse_name_flags(kr->ctx, fast_princ_struct, KRB5_PRINCIPAL_UNPARSE_NO_REALM, &tmp_str); if (kerr) { - DEBUG(1, ("sss_krb5_unparse_name_flags failed.\n")); + DEBUG(1, "sss_krb5_unparse_name_flags failed.\n"); return kerr; } fast_principal = talloc_strdup(kr, tmp_str); if (!fast_principal) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); return KRB5KRB_ERR_GENERIC; } free(tmp_str); realm_data = krb5_princ_realm(kr->ctx, fast_princ_struct); fast_principal_realm = talloc_asprintf(kr, "%.*s", realm_data->length, realm_data->data); if (!fast_principal_realm) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } } else { @@ -1797,7 +1797,7 @@ static int k5c_setup_fast(struct krb5_req *kr, bool demand) kerr = check_fast_ccache(kr, kr->ctx, fast_principal, fast_principal_realm, kr->keytab, &kr->fast_ccname); if (kerr != 0) { - DEBUG(1, ("check_fast_ccache failed.\n")); + DEBUG(1, "check_fast_ccache failed.\n"); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); return kerr; } @@ -1806,8 +1806,8 @@ static int k5c_setup_fast(struct krb5_req *kr, bool demand) kr->options, kr->fast_ccname); if (kerr != 0) { - DEBUG(1, ("sss_krb5_get_init_creds_opt_set_fast_ccache_name " - "failed.\n")); + DEBUG(1, "sss_krb5_get_init_creds_opt_set_fast_ccache_name " + "failed.\n"); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); return kerr; } @@ -1817,8 +1817,8 @@ static int k5c_setup_fast(struct krb5_req *kr, bool demand) kr->options, SSS_KRB5_FAST_REQUIRED); if (kerr != 0) { - DEBUG(1, ("sss_krb5_get_init_creds_opt_set_fast_flags " - "failed.\n")); + DEBUG(1, "sss_krb5_get_init_creds_opt_set_fast_flags " + "failed.\n"); KRB5_CHILD_DEBUG(SSSDBG_CRIT_FAILURE, kerr); return kerr; } @@ -1836,7 +1836,7 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline) kr->realm = getenv(SSSD_KRB5_REALM); if (kr->realm == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot read [%s] from environment.\n", SSSD_KRB5_REALM)); + "Cannot read [%s] from environment.\n", SSSD_KRB5_REALM); } kerr = krb5_init_context(&kr->ctx); @@ -1864,7 +1864,7 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline) if (kr->use_enterprise_princ) { kerr = krb5_set_default_realm(kr->ctx, kr->realm); if (kerr != 0) { - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_set_default_realm failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_set_default_realm failed.\n"); } } @@ -1883,7 +1883,7 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline) kr->creds = calloc(1, sizeof(krb5_creds)); if (kr->creds == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } @@ -1911,7 +1911,7 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline) kerr = set_lifetime_options(kr->options); if (kerr != 0) { - DEBUG(SSSDBG_OP_FAILURE, ("set_lifetime_options failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "set_lifetime_options failed.\n"); return kerr; } @@ -1920,15 +1920,15 @@ static int k5c_setup(struct krb5_req *kr, uint32_t offline) use_fast_str = getenv(SSSD_KRB5_USE_FAST); if (use_fast_str == NULL || strcasecmp(use_fast_str, "never") == 0) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Not using FAST.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Not using FAST.\n"); } else if (strcasecmp(use_fast_str, "try") == 0) { kerr = k5c_setup_fast(kr, false); } else if (strcasecmp(use_fast_str, "demand") == 0) { kerr = k5c_setup_fast(kr, true); } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unsupported value [%s] for krb5_use_fast.\n", - use_fast_str)); + "Unsupported value [%s] for krb5_use_fast.\n", + use_fast_str); return EINVAL; } } @@ -1989,13 +1989,13 @@ int main(int argc, const char *argv[]) kr = talloc_zero(NULL, struct krb5_req); if (kr == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); exit(-1); } debug_prg_name = talloc_asprintf(kr, "[sssd[krb5_child[%d]]]", getpid()); if (!debug_prg_name) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -2003,11 +2003,11 @@ int main(int argc, const char *argv[]) if (debug_fd != -1) { ret = set_debug_file_from_fd(debug_fd); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("set_debug_file_from_fd failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "set_debug_file_from_fd failed.\n"); } } - DEBUG(SSSDBG_TRACE_FUNC, ("krb5_child started.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "krb5_child started.\n"); ret = k5c_recv_data(kr, STDIN_FILENO, &offline); if (ret != EOK) { @@ -2018,7 +2018,7 @@ int main(int argc, const char *argv[]) ret = k5c_setup(kr, offline); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_child_setup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_child_setup failed.\n"); goto done; } @@ -2026,53 +2026,53 @@ int main(int argc, const char *argv[]) case SSS_PAM_AUTHENTICATE: /* If we are offline, we need to create an empty ccache file */ if (offline) { - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform offline auth\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform offline auth\n"); ret = create_empty_ccache(kr); } else { - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform online auth\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform online auth\n"); ret = tgt_req_child(kr); } break; case SSS_PAM_CHAUTHTOK: - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform password change\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform password change\n"); ret = changepw_child(kr, false); break; case SSS_PAM_CHAUTHTOK_PRELIM: - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform password change checks\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform password change checks\n"); ret = changepw_child(kr, true); break; case SSS_PAM_ACCT_MGMT: - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform account management\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform account management\n"); ret = kuserok_child(kr); break; case SSS_CMD_RENEW: if (offline) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot renew TGT while offline\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot renew TGT while offline\n"); ret = KRB5_KDC_UNREACH; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Will perform ticket renewal\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Will perform ticket renewal\n"); ret = renew_tgt_child(kr); break; default: - DEBUG(1, ("PAM command [%d] not supported.\n", kr->pd->cmd)); + DEBUG(1, "PAM command [%d] not supported.\n", kr->pd->cmd); ret = EINVAL; goto done; } ret = k5c_send_data(kr, STDOUT_FILENO, ret); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to send reply\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to send reply\n"); } done: krb5_cleanup(kr); talloc_free(kr); if (ret == EOK) { - DEBUG(SSSDBG_TRACE_FUNC, ("krb5_child completed successfully\n")); + DEBUG(SSSDBG_TRACE_FUNC, "krb5_child completed successfully\n"); exit(0); } else { - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_child failed!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_child failed!\n"); exit(-1); } } diff --git a/src/providers/krb5/krb5_child_handler.c b/src/providers/krb5/krb5_child_handler.c index a0e8f610b..655a908f7 100644 --- a/src/providers/krb5/krb5_child_handler.c +++ b/src/providers/krb5/krb5_child_handler.c @@ -69,7 +69,7 @@ static int child_io_destructor(void *ptr) io->write_to_child_fd = -1; if (ret != EOK) { ret = errno; - DEBUG(1, ("close failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "close failed [%d][%s].\n", ret, strerror(ret)); } } @@ -78,7 +78,7 @@ static int child_io_destructor(void *ptr) io->read_from_child_fd = -1; if (ret != EOK) { ret = errno; - DEBUG(1, ("close failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "close failed [%d][%s].\n", ret, strerror(ret)); } } @@ -136,7 +136,7 @@ static errno_t create_send_buffer(struct krb5child_req *kr, keytab = dp_opt_get_cstring(kr->krb5_ctx->opts, KRB5_KEYTAB); if (keytab == NULL) { - DEBUG(1, ("Missing keytab option.\n")); + DEBUG(1, "Missing keytab option.\n"); return EINVAL; } @@ -164,7 +164,7 @@ static errno_t create_send_buffer(struct krb5child_req *kr, buf = talloc(kr, struct io_buffer); if (buf == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } @@ -190,7 +190,7 @@ static errno_t create_send_buffer(struct krb5child_req *kr, buf->data = talloc_size(kr, buf->size); if (buf->data == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); talloc_free(buf); return ENOMEM; } @@ -255,13 +255,13 @@ static void krb5_child_timeout(struct tevent_context *ev, } DEBUG(SSSDBG_IMPORTANT_INFO, - ("Timeout for child [%d] reached. In case KDC is distant or network " + "Timeout for child [%d] reached. In case KDC is distant or network " "is slow you may consider increasing value of krb5_auth_timeout.\n", - state->child_pid)); + state->child_pid); ret = kill(state->child_pid, SIGKILL); if (ret == -1) { - DEBUG(1, ("kill failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "kill failed [%d][%s].\n", errno, strerror(errno)); } tevent_req_error(req, ETIMEDOUT); @@ -280,7 +280,7 @@ static errno_t activate_child_timeout_handler(struct tevent_req *req, state->timeout_handler = tevent_add_timer(ev, state, tv, krb5_child_timeout, req); if (state->timeout_handler == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); return ENOMEM; } @@ -300,13 +300,13 @@ static errno_t fork_child(struct tevent_req *req) ret = pipe(pipefd_from_child); if (ret == -1) { err = errno; - DEBUG(1, ("pipe failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "pipe failed [%d][%s].\n", errno, strerror(errno)); return err; } ret = pipe(pipefd_to_child); if (ret == -1) { err = errno; - DEBUG(1, ("pipe failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "pipe failed [%d][%s].\n", errno, strerror(errno)); return err; } @@ -316,7 +316,7 @@ static errno_t fork_child(struct tevent_req *req) if (state->kr->run_as_user) { ret = become_user(state->kr->uid, state->kr->gid); if (ret != EOK) { - DEBUG(1, ("become_user failed.\n")); + DEBUG(1, "become_user failed.\n"); return ret; } } @@ -325,8 +325,8 @@ static errno_t fork_child(struct tevent_req *req) pipefd_to_child, pipefd_from_child, KRB5_CHILD, state->kr->krb5_ctx->child_debug_fd); if (err != EOK) { - DEBUG(1, ("Could not exec KRB5 child: [%d][%s].\n", - err, strerror(err))); + DEBUG(1, "Could not exec KRB5 child: [%d][%s].\n", + err, strerror(err)); return err; } } else if (pid > 0) { /* parent */ @@ -340,19 +340,19 @@ static errno_t fork_child(struct tevent_req *req) ret = child_handler_setup(state->ev, pid, NULL, NULL, NULL); if (ret != EOK) { - DEBUG(1, ("Could not set up child signal handler\n")); + DEBUG(1, "Could not set up child signal handler\n"); return ret; } err = activate_child_timeout_handler(req, state->ev, dp_opt_get_int(state->kr->krb5_ctx->opts, KRB5_AUTH_TIMEOUT)); if (err != EOK) { - DEBUG(1, ("activate_child_timeout_handler failed.\n")); + DEBUG(1, "activate_child_timeout_handler failed.\n"); } } else { /* error */ err = errno; - DEBUG(1, ("fork failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "fork failed [%d][%s].\n", errno, strerror(errno)); return err; } @@ -385,7 +385,7 @@ struct tevent_req *handle_child_send(TALLOC_CTX *mem_ctx, state->io = talloc(state, struct io); if (state->io == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); ret = ENOMEM; goto fail; } @@ -395,13 +395,13 @@ struct tevent_req *handle_child_send(TALLOC_CTX *mem_ctx, ret = create_send_buffer(kr, &buf); if (ret != EOK) { - DEBUG(1, ("create_send_buffer failed.\n")); + DEBUG(1, "create_send_buffer failed.\n"); goto fail; } ret = fork_child(req); if (ret != EOK) { - DEBUG(1, ("fork_child failed.\n")); + DEBUG(1, "fork_child failed.\n"); goto fail; } @@ -509,7 +509,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, bool otp = false; if ((size_t) len < sizeof(int32_t)) { - DEBUG(SSSDBG_CRIT_FAILURE, ("message too short.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "message too short.\n"); return EINVAL; } @@ -537,12 +537,12 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, SAFEALIGN_COPY_INT32(&msg_type, buf+p, &p); SAFEALIGN_COPY_INT32(&msg_len, buf+p, &p); - DEBUG(SSSDBG_TRACE_LIBS, ("child response [%d][%d][%d].\n", - msg_status, msg_type, msg_len)); + DEBUG(SSSDBG_TRACE_LIBS, "child response [%d][%d][%d].\n", + msg_status, msg_type, msg_len); if ((p + msg_len) > len) { - DEBUG(SSSDBG_CRIT_FAILURE, ("message format error [%zu] > [%zd].\n", - p+msg_len, len)); + DEBUG(SSSDBG_CRIT_FAILURE, "message format error [%zu] > [%zd].\n", + p+msg_len, len); return EINVAL; } @@ -568,8 +568,8 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, tgtt.endtime = int64_to_time_t(time_data); SAFEALIGN_COPY_INT64(&time_data, buf+p+3*sizeof(int64_t), NULL); tgtt.renew_till = int64_to_time_t(time_data); - DEBUG(SSSDBG_TRACE_LIBS, ("TGT times are [%ld][%ld][%ld][%ld].\n", - tgtt.authtime, tgtt.starttime, tgtt.endtime, tgtt.renew_till)); + DEBUG(SSSDBG_TRACE_LIBS, "TGT times are [%ld][%ld][%ld][%ld].\n", + tgtt.authtime, tgtt.starttime, tgtt.endtime, tgtt.renew_till); } if (msg_type == SSS_KRB5_INFO_UPN) { @@ -598,7 +598,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, ret = pam_add_response(pd, msg_type, msg_len, &buf[p]); if (ret != EOK) { /* This is not a fatal error */ - DEBUG(SSSDBG_CRIT_FAILURE, ("pam_add_response failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "pam_add_response failed.\n"); } } @@ -606,7 +606,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, if ((p < len) && (p + 2*sizeof(int32_t) > len)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("The remainder of the message is too short.\n")); + "The remainder of the message is too short.\n"); return EINVAL; } } @@ -621,7 +621,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, if (ccname) { res->ccname = talloc_strndup(res, ccname, ccname_len); if (res->ccname == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strndup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strndup failed.\n"); talloc_free(res); return ENOMEM; } @@ -630,7 +630,7 @@ parse_krb5_child_response(TALLOC_CTX *mem_ctx, uint8_t *buf, ssize_t len, if (upn != NULL) { res->correct_upn = talloc_strndup(res, upn, upn_len); if (res->correct_upn == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strndup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strndup failed.\n"); talloc_free(res); return ENOMEM; } diff --git a/src/providers/krb5/krb5_common.c b/src/providers/krb5/krb5_common.c index c40f0dd49..308a4d137 100644 --- a/src/providers/krb5/krb5_common.c +++ b/src/providers/krb5/krb5_common.c @@ -48,28 +48,28 @@ errno_t check_and_export_lifetime(struct dp_option *opts, const int opt_id, str = dp_opt_get_string(opts, opt_id); if (str == NULL || *str == '\0') { - DEBUG(5, ("No lifetime configured.\n")); + DEBUG(5, "No lifetime configured.\n"); return EOK; } if (isdigit(str[strlen(str)-1])) { str = talloc_asprintf(opts, "%ss", str); if (str == NULL) { - DEBUG(1, ("talloc_asprintf failed\n")); + DEBUG(1, "talloc_asprintf failed\n"); return ENOMEM; } free_str = true; ret = dp_opt_set_string(opts, opt_id, str); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed\n")); + DEBUG(1, "dp_opt_set_string failed\n"); goto done; } } ret = krb5_string_to_deltat(str, &lifetime); if (ret != 0) { - DEBUG(1, ("Invalid value [%s] for a lifetime.\n", str)); + DEBUG(1, "Invalid value [%s] for a lifetime.\n", str); ret = EINVAL; goto done; } @@ -77,7 +77,7 @@ errno_t check_and_export_lifetime(struct dp_option *opts, const int opt_id, ret = setenv(env_name, str, 1); if (ret != EOK) { ret = errno; - DEBUG(2, ("setenv [%s] failed.\n", env_name)); + DEBUG(2, "setenv [%s] failed.\n", env_name); goto done; } @@ -136,9 +136,9 @@ static errno_t sss_get_system_ccname_template(TALLOC_CTX *mem_ctx, char **ccname) { DEBUG(SSSDBG_CONF_SETTINGS, - ("Your kerberos library does not support the default_ccache_name " + "Your kerberos library does not support the default_ccache_name " "option or the profile library. Please use krb5_ccname_template " - "in sssd.conf if you want to change the default\n")); + "in sssd.conf if you want to change the default\n"); *ccname = NULL; return ERR_NOT_FOUND; } @@ -151,9 +151,9 @@ static void sss_check_cc_template(const char *cc_template) template_len = strlen(cc_template); if (template_len >= 6 && strcmp(cc_template + (template_len - 6), "XXXXXX") != 0) { - DEBUG(SSSDBG_CONF_SETTINGS, ("ccache file name template [%s] doesn't " + DEBUG(SSSDBG_CONF_SETTINGS, "ccache file name template [%s] doesn't " "contain randomizing characters (XXXXXX), file might not " - "be rewritable\n", cc_template)); + "be rewritable\n", cc_template); } } @@ -179,7 +179,7 @@ errno_t check_and_export_options(struct dp_option *opts, if (realm == NULL) { ret = dp_opt_set_string(opts, KRB5_REALM, dom->name); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed.\n")); + DEBUG(1, "dp_opt_set_string failed.\n"); goto done; } realm = dom->name; @@ -187,23 +187,23 @@ errno_t check_and_export_options(struct dp_option *opts, ret = setenv(SSSD_KRB5_REALM, realm, 1); if (ret != EOK) { - DEBUG(2, ("setenv %s failed, authentication might fail.\n", - SSSD_KRB5_REALM)); + DEBUG(2, "setenv %s failed, authentication might fail.\n", + SSSD_KRB5_REALM); } ret = check_and_export_lifetime(opts, KRB5_RENEWABLE_LIFETIME, SSSD_KRB5_RENEWABLE_LIFETIME); if (ret != EOK) { - DEBUG(1, ("Failed to check value of krb5_renewable_lifetime. [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Failed to check value of krb5_renewable_lifetime. [%d][%s]\n", + ret, strerror(ret)); goto done; } ret = check_and_export_lifetime(opts, KRB5_LIFETIME, SSSD_KRB5_LIFETIME); if (ret != EOK) { - DEBUG(1, ("Failed to check value of krb5_lifetime. [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Failed to check value of krb5_lifetime. [%d][%s]\n", + ret, strerror(ret)); goto done; } @@ -212,20 +212,20 @@ errno_t check_and_export_options(struct dp_option *opts, if (use_fast_str != NULL) { ret = check_fast(use_fast_str, &krb5_ctx->use_fast); if (ret != EOK) { - DEBUG(1, ("check_fast failed.\n")); + DEBUG(1, "check_fast failed.\n"); goto done; } if (krb5_ctx->use_fast) { ret = setenv(SSSD_KRB5_USE_FAST, use_fast_str, 1); if (ret != EOK) { - DEBUG(2, ("setenv [%s] failed.\n", SSSD_KRB5_USE_FAST)); + DEBUG(2, "setenv [%s] failed.\n", SSSD_KRB5_USE_FAST); } else { fast_principal = dp_opt_get_string(opts, KRB5_FAST_PRINCIPAL); if (fast_principal != NULL) { ret = setenv(SSSD_KRB5_FAST_PRINCIPAL, fast_principal, 1); if (ret != EOK) { - DEBUG(2, ("setenv [%s] failed.\n", SSSD_KRB5_FAST_PRINCIPAL)); + DEBUG(2, "setenv [%s] failed.\n", SSSD_KRB5_FAST_PRINCIPAL); } } } @@ -243,26 +243,26 @@ errno_t check_and_export_options(struct dp_option *opts, ret = setenv(SSSD_KRB5_CANONICALIZE, "false", 1); } if (ret != EOK) { - DEBUG(2, ("setenv [%s] failed.\n", SSSD_KRB5_CANONICALIZE)); + DEBUG(2, "setenv [%s] failed.\n", SSSD_KRB5_CANONICALIZE); } dummy = dp_opt_get_cstring(opts, KRB5_KDC); if (dummy == NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("No KDC explicitly configured, using defaults.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "No KDC explicitly configured, using defaults.\n"); } dummy = dp_opt_get_cstring(opts, KRB5_KPASSWD); if (dummy == NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("No kpasswd server explicitly configured, " - "using the KDC or defaults.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "No kpasswd server explicitly configured, " + "using the KDC or defaults.\n"); } ccname = dp_opt_get_string(opts, KRB5_CCNAME_TMPL); if (ccname != NULL) { DEBUG(SSSDBG_CONF_SETTINGS, - ("The credential ccache name template has been explicitly set " + "The credential ccache name template has been explicitly set " "in sssd.conf, it is recommended to set default_ccache_name " - "in krb5.conf instead so that a system default is used\n")); + "in krb5.conf instead so that a system default is used\n"); ccname = talloc_strdup(tmp_ctx, ccname); if (!ccname) { ret = ENOMEM; @@ -285,22 +285,22 @@ errno_t check_and_export_options(struct dp_option *opts, /* set back in opts */ ret = dp_opt_set_string(opts, KRB5_CCNAME_TMPL, ccname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("dp_opt_set_string failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "dp_opt_set_string failed.\n"); goto done; } } if ((ccname[0] == '/') || (strncmp(ccname, "FILE:", 5) == 0)) { - DEBUG(SSSDBG_CONF_SETTINGS, ("ccache is of type FILE\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "ccache is of type FILE\n"); /* warn if the file type (which is usally created in a sticky bit * laden directory) does not have randomizing chracters */ sss_check_cc_template(ccname); if (ccname[0] == '/') { /* /path/to/cc prepend FILE: */ - DEBUG(SSSDBG_CONF_SETTINGS, ("The ccname template was " + DEBUG(SSSDBG_CONF_SETTINGS, "The ccname template was " "missing an explicit type, but is an absolute " - "path specifier. Assuming FILE:\n")); + "path specifier. Assuming FILE:\n"); ccname = talloc_asprintf(tmp_ctx, "FILE:%s", ccname); if (!ccname) { @@ -310,7 +310,7 @@ errno_t check_and_export_options(struct dp_option *opts, ret = dp_opt_set_string(opts, KRB5_CCNAME_TMPL, ccname); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("dp_opt_set_string failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "dp_opt_set_string failed.\n"); goto done; } } @@ -331,11 +331,11 @@ errno_t krb5_try_kdcip(struct confdb_ctx *cdb, const char *conf_path, krb5_servers = dp_opt_get_string(opts, opt_id); if (krb5_servers == NULL) { - DEBUG(4, ("No KDC found in configuration, trying legacy option\n")); + DEBUG(4, "No KDC found in configuration, trying legacy option\n"); ret = confdb_get_string(cdb, NULL, conf_path, "krb5_kdcip", NULL, &krb5_servers); if (ret != EOK) { - DEBUG(1, ("confdb_get_string failed.\n")); + DEBUG(1, "confdb_get_string failed.\n"); return ret; } @@ -343,19 +343,19 @@ errno_t krb5_try_kdcip(struct confdb_ctx *cdb, const char *conf_path, { ret = dp_opt_set_string(opts, opt_id, krb5_servers); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed.\n")); + DEBUG(1, "dp_opt_set_string failed.\n"); talloc_free(krb5_servers); return ret; } DEBUG(SSSDBG_CONF_SETTINGS, - ("Set krb5 server [%s] based on legacy krb5_kdcip option\n", - krb5_servers)); + "Set krb5 server [%s] based on legacy krb5_kdcip option\n", + krb5_servers); DEBUG(SSSDBG_FATAL_FAILURE, - ("Your configuration uses the deprecated option " + "Your configuration uses the deprecated option " "'krb5_kdcip' to specify the KDC. Please change the " "configuration to use the 'krb5_server' option " - "instead.\n")); + "instead.\n"); talloc_free(krb5_servers); } } @@ -371,14 +371,14 @@ errno_t krb5_get_options(TALLOC_CTX *memctx, struct confdb_ctx *cdb, opts = talloc_zero(memctx, struct dp_option); if (opts == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } ret = dp_get_options(opts, cdb, conf_path, default_krb5_opts, KRB5_OPTS, &opts); if (ret != EOK) { - DEBUG(1, ("dp_get_options failed.\n")); + DEBUG(1, "dp_get_options failed.\n"); goto done; } @@ -386,7 +386,7 @@ errno_t krb5_get_options(TALLOC_CTX *memctx, struct confdb_ctx *cdb, /* FIXME - this can be removed in a future version */ ret = krb5_try_kdcip(cdb, conf_path, opts, KRB5_KDC); if (ret != EOK) { - DEBUG(1, ("sss_krb5_try_kdcip failed.\n")); + DEBUG(1, "sss_krb5_try_kdcip failed.\n"); goto done; } @@ -416,7 +416,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, if (realm == NULL || *realm == '\0' || server == NULL || *server == '\0' || service == NULL || service == '\0') { - DEBUG(1, ("Missing or empty realm, server or service.\n")); + DEBUG(1, "Missing or empty realm, server or service.\n"); return EINVAL; } @@ -425,7 +425,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, } else if (strcmp(service, SSS_KRB5KPASSWD_FO_SRV) == 0) { name_tmpl = KPASSWDINFO_TMPL; } else { - DEBUG(1, ("Unsupported service [%s]\n.", service)); + DEBUG(1, "Unsupported service [%s]\n.", service); return EINVAL; } @@ -433,20 +433,20 @@ errno_t write_krb5info_file(const char *realm, const char *server, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed.\n")); + DEBUG(1, "talloc_new failed.\n"); return ENOMEM; } tmp_name = talloc_asprintf(tmp_ctx, PUBCONF_PATH"/.krb5info_dummy_XXXXXX"); if (tmp_name == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } krb5info_name = talloc_asprintf(tmp_ctx, name_tmpl, realm); if (krb5info_name == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -456,7 +456,7 @@ errno_t write_krb5info_file(const char *realm, const char *server, umask(old_umask); if (fd == -1) { ret = errno; - DEBUG(1, ("mkstemp failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "mkstemp failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -465,14 +465,14 @@ errno_t write_krb5info_file(const char *realm, const char *server, if (written == -1) { ret = errno; DEBUG(SSSDBG_CRIT_FAILURE, - ("write failed [%d][%s].\n", ret, strerror(ret))); + "write failed [%d][%s].\n", ret, strerror(ret)); goto done; } if (written != server_len) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Write error, wrote [%zd] bytes, expected [%zu]\n", - written, server_len)); + "Write error, wrote [%zd] bytes, expected [%zu]\n", + written, server_len); ret = EIO; goto done; } @@ -480,21 +480,21 @@ errno_t write_krb5info_file(const char *realm, const char *server, ret = fchmod(fd, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); if (ret == -1) { ret = errno; - DEBUG(1, ("fchmod failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "fchmod failed [%d][%s].\n", ret, strerror(ret)); goto done; } ret = close(fd); if (ret == -1) { ret = errno; - DEBUG(1, ("close failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "close failed [%d][%s].\n", ret, strerror(ret)); goto done; } ret = rename(tmp_name, krb5info_name); if (ret == -1) { ret = errno; - DEBUG(1, ("rename failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "rename failed [%d][%s].\n", ret, strerror(ret)); goto done; } @@ -514,28 +514,28 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed\n")); + DEBUG(1, "talloc_new failed\n"); return; } krb5_service = talloc_get_type(private_data, struct krb5_service); if (!krb5_service) { - DEBUG(1, ("FATAL: Bad private_data\n")); + DEBUG(1, "FATAL: Bad private_data\n"); talloc_free(tmp_ctx); return; } srvaddr = fo_get_server_hostent(server); if (!srvaddr) { - DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_str_name(server))); + DEBUG(1, "FATAL: No hostent available for server (%s)\n", + fo_get_server_str_name(server)); talloc_free(tmp_ctx); return; } address = resolv_get_string_address(tmp_ctx, srvaddr); if (address == NULL) { - DEBUG(1, ("resolv_get_string_address failed.\n")); + DEBUG(1, "resolv_get_string_address failed.\n"); talloc_free(tmp_ctx); return; } @@ -544,7 +544,7 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) srvaddr->family, address); if (safe_address == NULL) { - DEBUG(1, ("sss_escape_ip_address failed.\n")); + DEBUG(1, "sss_escape_ip_address failed.\n"); talloc_free(tmp_ctx); return; } @@ -553,7 +553,7 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) safe_address = talloc_asprintf_append(safe_address, ":%d", fo_get_server_port(server)); if (safe_address == NULL) { - DEBUG(1, ("talloc_asprintf_append failed.\n")); + DEBUG(1, "talloc_asprintf_append failed.\n"); talloc_free(tmp_ctx); return; } @@ -561,7 +561,7 @@ static void krb5_resolve_callback(void *private_data, struct fo_server *server) ret = write_krb5info_file(krb5_service->realm, safe_address, krb5_service->name); if (ret != EOK) { - DEBUG(2, ("write_krb5info_file failed, authentication might fail.\n")); + DEBUG(2, "write_krb5info_file failed, authentication might fail.\n"); } } @@ -592,7 +592,7 @@ static errno_t _krb5_servers_init(struct be_ctx *ctx, 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; } @@ -607,20 +607,20 @@ static errno_t _krb5_servers_init(struct be_ctx *ctx, if (be_fo_is_srv_identifier(server_spec)) { 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; } ret = be_fo_add_srv_server(ctx, service_name, service_name, NULL, BE_FO_PROTO_UDP, true, NULL); if (ret) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Failed to add server\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "Failed to add server\n"); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Added service lookup\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Added service lookup\n"); continue; } @@ -641,34 +641,34 @@ static errno_t _krb5_servers_init(struct be_ctx *ctx, port = strtol(port_str, &endptr, 10); if (errno != 0) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("strtol failed on [%s]: [%d][%s].\n", port_str, - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "strtol failed on [%s]: [%d][%s].\n", port_str, + ret, strerror(ret)); goto done; } if (*endptr != '\0') { - DEBUG(SSSDBG_CRIT_FAILURE, ("Found additional characters [%s] in port number " - "[%s].\n", endptr, port_str)); + DEBUG(SSSDBG_CRIT_FAILURE, "Found additional characters [%s] in port number " + "[%s].\n", endptr, port_str); ret = EINVAL; goto done; } if (port < 1 || port > 65535) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Illegal port number [%ld].\n", port)); + DEBUG(SSSDBG_CRIT_FAILURE, "Illegal port number [%ld].\n", port); ret = EINVAL; goto done; } } else if (isalpha(*port_str)) { servent = getservbyname(port_str, NULL); if (servent == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("getservbyname cannot find service [%s].\n", - port_str)); + DEBUG(SSSDBG_CRIT_FAILURE, "getservbyname cannot find service [%s].\n", + port_str); ret = EINVAL; goto done; } port = servent->s_port; } else { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unsupported port specifier in [%s].\n", list[i])); + DEBUG(SSSDBG_CRIT_FAILURE, "Unsupported port specifier in [%s].\n", list[i]); ret = EINVAL; goto done; } @@ -684,11 +684,11 @@ static errno_t _krb5_servers_init(struct be_ctx *ctx, ret = be_fo_add_server(ctx, service_name, server_spec, (int) port, list[i], 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_TRACE_FUNC, ("Added Server %s\n", list[i])); + DEBUG(SSSDBG_TRACE_FUNC, "Added Server %s\n", list[i]); } done: @@ -740,7 +740,7 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_add_service(ctx, service_name, krb5_user_data_cmp); if (ret != EOK) { - DEBUG(1, ("Failed to create failover service!\n")); + DEBUG(1, "Failed to create failover service!\n"); goto done; } @@ -760,7 +760,7 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, 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; } @@ -780,7 +780,7 @@ int krb5_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_service_add_callback(memctx, ctx, service_name, krb5_resolve_callback, service); if (ret != EOK) { - DEBUG(1, ("Failed to add failover callback!\n")); + DEBUG(1, "Failed to add failover callback!\n"); goto done; } @@ -803,7 +803,7 @@ errno_t remove_krb5_info_files(TALLOC_CTX *mem_ctx, const char *realm) file = talloc_asprintf(mem_ctx, KDCINFO_TMPL, realm); if(file == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } @@ -811,13 +811,13 @@ errno_t remove_krb5_info_files(TALLOC_CTX *mem_ctx, const char *realm) ret = unlink(file); if (ret == -1) { err = errno; - DEBUG(5, ("Could not remove [%s], [%d][%s]\n", file, - err, strerror(err))); + DEBUG(5, "Could not remove [%s], [%d][%s]\n", file, + err, strerror(err)); } file = talloc_asprintf(mem_ctx, KPASSWDINFO_TMPL, realm); if(file == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } @@ -825,8 +825,8 @@ errno_t remove_krb5_info_files(TALLOC_CTX *mem_ctx, const char *realm) ret = unlink(file); if (ret == -1) { err = errno; - DEBUG(5, ("Could not remove [%s], [%d][%s]\n", file, - err, strerror(err))); + DEBUG(5, "Could not remove [%s], [%d][%s]\n", file, + err, strerror(err)); } return EOK; @@ -842,31 +842,31 @@ void remove_krb5_info_files_callback(void *pvt) ret = be_fo_run_callbacks_at_next_request(ctx->be_ctx, ctx->kdc_service_name); if (ret != EOK) { - DEBUG(1, ("be_fo_run_callbacks_at_next_request failed, " + DEBUG(1, "be_fo_run_callbacks_at_next_request failed, " "krb5 info files will not be removed, because " - "it is unclear if they will be recreated properly.\n")); + "it is unclear if they will be recreated properly.\n"); return; } if (ctx->kpasswd_service_name != NULL) { ret = be_fo_run_callbacks_at_next_request(ctx->be_ctx, ctx->kpasswd_service_name); if (ret != EOK) { - DEBUG(1, ("be_fo_run_callbacks_at_next_request failed, " + DEBUG(1, "be_fo_run_callbacks_at_next_request failed, " "krb5 info files will not be removed, because " - "it is unclear if they will be recreated properly.\n")); + "it is unclear if they will be recreated properly.\n"); return; } } tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed, cannot remove krb5 info files.\n")); + DEBUG(1, "talloc_new failed, cannot remove krb5 info files.\n"); return; } ret = remove_krb5_info_files(tmp_ctx, ctx->realm); if (ret != EOK) { - DEBUG(1, ("remove_krb5_info_files failed.\n")); + DEBUG(1, "remove_krb5_info_files failed.\n"); } talloc_zfree(tmp_ctx); @@ -884,7 +884,7 @@ void krb5_finalize(struct tevent_context *ev, ret = remove_krb5_info_files(se, realm); if (ret != EOK) { - DEBUG(1, ("remove_krb5_info_files failed.\n")); + DEBUG(1, "remove_krb5_info_files failed.\n"); } sig_term(signum); @@ -898,26 +898,26 @@ errno_t krb5_install_offline_callback(struct be_ctx *be_ctx, const char *krb5_realm; if (krb5_ctx->service == NULL || krb5_ctx->service->name == NULL) { - DEBUG(1, ("Missing KDC service name!\n")); + DEBUG(1, "Missing KDC service name!\n"); return EINVAL; } ctx = talloc_zero(krb5_ctx, struct remove_info_files_ctx); if (ctx == NULL) { - DEBUG(1, ("talloc_zfree failed.\n")); + DEBUG(1, "talloc_zfree failed.\n"); return ENOMEM; } krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); if (krb5_realm == NULL) { - DEBUG(1, ("Missing krb5_realm option!\n")); + DEBUG(1, "Missing krb5_realm option!\n"); ret = EINVAL; goto done; } ctx->realm = talloc_strdup(ctx, krb5_realm); if (ctx->realm == NULL) { - DEBUG(1, ("talloc_strdup failed!\n")); + DEBUG(1, "talloc_strdup failed!\n"); ret = ENOMEM; goto done; } @@ -933,7 +933,7 @@ errno_t krb5_install_offline_callback(struct be_ctx *be_ctx, ret = be_add_offline_cb(ctx, be_ctx, remove_krb5_info_files_callback, ctx, NULL); if (ret != EOK) { - DEBUG(1, ("be_add_offline_cb failed.\n")); + DEBUG(1, "be_add_offline_cb failed.\n"); goto done; } @@ -958,20 +958,20 @@ errno_t krb5_install_sigterm_handler(struct tevent_context *ev, krb5_realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); if (krb5_realm == NULL) { - DEBUG(1, ("Missing krb5_realm option!\n")); + DEBUG(1, "Missing krb5_realm option!\n"); return EINVAL; } sig_realm = talloc_strdup(krb5_ctx, krb5_realm); if (sig_realm == NULL) { - DEBUG(1, ("talloc_strdup failed!\n")); + DEBUG(1, "talloc_strdup failed!\n"); return ENOMEM; } sige = tevent_add_signal(ev, krb5_ctx, SIGTERM, SA_SIGINFO, krb5_finalize, sig_realm); if (sige == NULL) { - DEBUG(1, ("tevent_add_signal failed.\n")); + DEBUG(1, "tevent_add_signal failed.\n"); talloc_free(sig_realm); return ENOMEM; } @@ -994,7 +994,7 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_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; } @@ -1002,14 +1002,14 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, strcasecmp(dom->name, user_dom) != 0) { uc_dom = get_uppercase_realm(tmp_ctx, user_dom); if (uc_dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("get_uppercase_realm failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "get_uppercase_realm failed.\n"); ret = ENOMEM; goto done; } } else { realm = dp_opt_get_cstring(krb5_ctx->opts, KRB5_REALM); if (realm == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Missing Kerberos realm.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Missing Kerberos realm.\n"); ret = ENOMEM; goto done; } @@ -1021,8 +1021,8 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, ret = sss_parse_name(tmp_ctx, dom->names, username, &domname, &name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not parse [%s] into name and " - "domain components, login might fail\n", username)); + "Could not parse [%s] into name and " + "domain components, login might fail\n", username); name = discard_const(username); } @@ -1030,12 +1030,12 @@ errno_t krb5_get_simple_upn(TALLOC_CTX *mem_ctx, struct krb5_ctx *krb5_ctx, upn = talloc_asprintf(tmp_ctx, "%s@%s", name, realm != NULL ? realm : uc_dom); if (upn == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } - DEBUG(9, ("Using simple UPN [%s].\n", upn)); + DEBUG(9, "Using simple UPN [%s].\n", upn); *_upn = talloc_steal(mem_ctx, upn); ret = EOK; diff --git a/src/providers/krb5/krb5_delayed_online_authentication.c b/src/providers/krb5/krb5_delayed_online_authentication.c index 46ed6f65c..05d80af56 100644 --- a/src/providers/krb5/krb5_delayed_online_authentication.c +++ b/src/providers/krb5/krb5_delayed_online_authentication.c @@ -80,7 +80,7 @@ static void authenticate_user(struct tevent_context *ev, keysize = keyctl_read_alloc(pd->key_serial, (void **)&password); if (keysize == -1) { ret = errno; - DEBUG(1, ("keyctl_read failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "keyctl_read failed [%d][%s].\n", ret, strerror(ret)); return; } @@ -88,22 +88,22 @@ static void authenticate_user(struct tevent_context *ev, safezero(password, keysize); free(password); if (ret) { - DEBUG(1, ("failed to set password in auth token [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "failed to set password in auth token [%d][%s].\n", + ret, strerror(ret)); return; } keyrevoke = keyctl_revoke(pd->key_serial); if (keyrevoke == -1) { ret = errno; - DEBUG(1, ("keyctl_revoke failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "keyctl_revoke failed [%d][%s].\n", ret, strerror(ret)); } #endif req = krb5_auth_send(auth_data, ev, auth_data->be_ctx, auth_data->pd, auth_data->krb5_ctx); if (req == NULL) { - DEBUG(1, ("krb5_auth_send failed.\n")); + DEBUG(1, "krb5_auth_send failed.\n"); talloc_free(auth_data); return; } @@ -121,14 +121,14 @@ static void authenticate_user_done(struct tevent_req *req) { ret = krb5_auth_recv(req, &pam_status, &dp_err); talloc_free(req); if (ret) { - DEBUG(1, ("krb5_auth request failed.\n")); + DEBUG(1, "krb5_auth request failed.\n"); } else { if (pam_status == PAM_SUCCESS) { - DEBUG(4, ("Successfully authenticated user [%s].\n", - auth_data->pd->user)); + DEBUG(4, "Successfully authenticated user [%s].\n", + auth_data->pd->user); } else { - DEBUG(1, ("Failed to authenticate user [%s].\n", - auth_data->pd->user)); + DEBUG(1, "Failed to authenticate user [%s].\n", + auth_data->pd->user); } } @@ -150,13 +150,13 @@ static errno_t authenticate_stored_users( ret = get_uid_table(deferred_auth_ctx, &uid_table); if (ret != HASH_SUCCESS) { - DEBUG(1, ("get_uid_table failed.\n")); + DEBUG(1, "get_uid_table failed.\n"); return ret; } iter = new_hash_iter_context(deferred_auth_ctx->user_table); if (iter == NULL) { - DEBUG(1, ("new_hash_iter_context failed.\n")); + DEBUG(1, "new_hash_iter_context failed.\n"); return EINVAL; } @@ -168,13 +168,13 @@ static errno_t authenticate_stored_users( ret = hash_lookup(uid_table, &key, &value); if (ret == HASH_SUCCESS) { - DEBUG(1, ("User [%s] is still logged in, " - "trying online authentication.\n", pd->user)); + DEBUG(1, "User [%s] is still logged in, " + "trying online authentication.\n", pd->user); auth_data = talloc_zero(deferred_auth_ctx->be_ctx, struct auth_data); if (auth_data == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); } else { auth_data->pd = talloc_steal(auth_data, pd); auth_data->krb5_ctx = deferred_auth_ctx->krb5_ctx; @@ -184,20 +184,20 @@ static errno_t authenticate_stored_users( auth_data, tevent_timeval_current(), authenticate_user, auth_data); if (te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); } } } else { - DEBUG(1, ("User [%s] is not logged in anymore, " - "discarding online authentication.\n", pd->user)); + DEBUG(1, "User [%s] is not logged in anymore, " + "discarding online authentication.\n", pd->user); talloc_free(pd); } ret = hash_delete(deferred_auth_ctx->user_table, &entry->key); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_delete failed [%s].\n", - hash_error_string(ret))); + DEBUG(1, "hash_delete failed [%s].\n", + hash_error_string(ret)); } } @@ -213,15 +213,15 @@ static void delayed_online_authentication_callback(void *private_data) int ret; if (deferred_auth_ctx->user_table == NULL) { - DEBUG(1, ("Delayed online authentication activated, " - "but user table does not exists.\n")); + DEBUG(1, "Delayed online authentication activated, " + "but user table does not exists.\n"); return; } - DEBUG(5, ("Backend is online, starting delayed online authentication.\n")); + DEBUG(5, "Backend is online, starting delayed online authentication.\n"); ret = authenticate_stored_users(deferred_auth_ctx); if (ret != EOK) { - DEBUG(1, ("authenticate_stored_users failed.\n")); + DEBUG(1, "authenticate_stored_users failed.\n"); } return; @@ -237,23 +237,23 @@ errno_t add_user_to_delayed_online_authentication(struct krb5_ctx *krb5_ctx, struct pam_data *new_pd; if (krb5_ctx->deferred_auth_ctx == NULL) { - DEBUG(1, ("Missing context for delayed online authentication.\n")); + DEBUG(1, "Missing context for delayed online authentication.\n"); return EINVAL; } if (krb5_ctx->deferred_auth_ctx->user_table == NULL) { - DEBUG(1, ("user_table not available.\n")); + DEBUG(1, "user_table not available.\n"); return EINVAL; } if (sss_authtok_get_type(pd->authtok) != SSS_AUTHTOK_TYPE_PASSWORD) { - DEBUG(1, ("Invalid authtok for user [%s].\n", pd->user)); + DEBUG(1, "Invalid authtok for user [%s].\n", pd->user); return EINVAL; } ret = copy_pam_data(krb5_ctx->deferred_auth_ctx, pd, &new_pd); if (ret != EOK) { - DEBUG(1, ("copy_pam_data failed\n")); + DEBUG(1, "copy_pam_data failed\n"); return ENOMEM; } @@ -264,7 +264,7 @@ errno_t add_user_to_delayed_online_authentication(struct krb5_ctx *krb5_ctx, ret = sss_authtok_get_password(new_pd->authtok, &password, &len); if (ret) { - DEBUG(1, ("Failed to get password [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "Failed to get password [%d][%s].\n", ret, strerror(ret)); sss_authtok_set_empty(new_pd->authtok); talloc_free(new_pd); return ret; @@ -274,14 +274,14 @@ errno_t add_user_to_delayed_online_authentication(struct krb5_ctx *krb5_ctx, KEY_SPEC_SESSION_KEYRING); if (new_pd->key_serial == -1) { ret = errno; - DEBUG(1, ("add_key failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "add_key failed [%d][%s].\n", ret, strerror(ret)); sss_authtok_set_empty(new_pd->authtok); talloc_free(new_pd); return ret; } DEBUG(SSSDBG_TRACE_ALL, - ("Saved authtok of user [%s] with serial [%"SPRIkey_ser"].\n", - new_pd->user, new_pd->key_serial)); + "Saved authtok of user [%s] with serial [%"SPRIkey_ser"].\n", + new_pd->user, new_pd->key_serial); sss_authtok_set_empty(new_pd->authtok); #endif @@ -293,15 +293,15 @@ errno_t add_user_to_delayed_online_authentication(struct krb5_ctx *krb5_ctx, ret = hash_enter(krb5_ctx->deferred_auth_ctx->user_table, &key, &value); if (ret != HASH_SUCCESS) { - DEBUG(1, ("Cannot add user [%s] to table [%s], " + DEBUG(1, "Cannot add user [%s] to table [%s], " "delayed online authentication not possible.\n", - pd->user, hash_error_string(ret))); + pd->user, hash_error_string(ret)); talloc_free(new_pd); return ENOMEM; } - DEBUG(9, ("Added user [%s] successfully to " - "delayed online authentication.\n", pd->user)); + DEBUG(9, "Added user [%s] successfully to " + "delayed online authentication.\n", pd->user); return EOK; } @@ -316,24 +316,24 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx, ret = get_uid_table(krb5_ctx, &tmp_table); if (ret != EOK) { if (ret == ENOSYS) { - DEBUG(0, ("Delayed online auth was requested " - "on an unsupported system.\n")); + DEBUG(0, "Delayed online auth was requested " + "on an unsupported system.\n"); } else { - DEBUG(0, ("Delayed online auth was requested " - "but initialisation failed.\n")); + DEBUG(0, "Delayed online auth was requested " + "but initialisation failed.\n"); } return ret; } ret = hash_destroy(tmp_table); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_destroy failed [%s].\n", hash_error_string(ret))); + DEBUG(1, "hash_destroy failed [%s].\n", hash_error_string(ret)); return EFAULT; } krb5_ctx->deferred_auth_ctx = talloc_zero(krb5_ctx, struct deferred_auth_ctx); if (krb5_ctx->deferred_auth_ctx == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } @@ -343,7 +343,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx, krb5_ctx->deferred_auth_ctx, NULL, NULL); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_create_ex failed [%s]\n", hash_error_string(ret))); + DEBUG(1, "hash_create_ex failed [%s]\n", hash_error_string(ret)); ret = ENOMEM; goto fail; } @@ -356,7 +356,7 @@ errno_t init_delayed_online_authentication(struct krb5_ctx *krb5_ctx, delayed_online_authentication_callback, krb5_ctx->deferred_auth_ctx, NULL); if (ret != EOK) { - DEBUG(1, ("be_add_online_cb failed.\n")); + DEBUG(1, "be_add_online_cb failed.\n"); goto fail; } diff --git a/src/providers/krb5/krb5_init.c b/src/providers/krb5/krb5_init.c index 91f701a18..71a97c10c 100644 --- a/src/providers/krb5/krb5_init.c +++ b/src/providers/krb5/krb5_init.c @@ -72,13 +72,13 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, if (krb5_options == NULL) { krb5_options = talloc_zero(bectx, struct krb5_options); if (krb5_options == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } ret = krb5_get_options(krb5_options, bectx->cdb, bectx->conf_path, &krb5_options->opts); if (ret != EOK) { - DEBUG(1, ("krb5_get_options failed.\n")); + DEBUG(1, "krb5_get_options failed.\n"); return ret; } } @@ -91,7 +91,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, ctx = talloc_zero(bectx, struct krb5_ctx); if (!ctx) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } krb5_options->auth_ctx = ctx; @@ -105,7 +105,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, krb5_realm = dp_opt_get_string(ctx->opts, KRB5_REALM); if (krb5_realm == NULL) { - DEBUG(0, ("Missing krb5_realm option!\n")); + DEBUG(0, "Missing krb5_realm option!\n"); return EINVAL; } @@ -116,7 +116,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, KRB5_USE_KDCINFO), &ctx->service); if (ret != EOK) { - DEBUG(0, ("Failed to init KRB5 failover service!\n")); + DEBUG(0, "Failed to init KRB5 failover service!\n"); return ret; } @@ -124,15 +124,15 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, krb5_backup_kpasswd_servers = dp_opt_get_string(ctx->opts, KRB5_BACKUP_KPASSWD); if (krb5_kpasswd_servers == NULL && krb5_backup_kpasswd_servers != NULL) { - DEBUG(SSSDBG_CONF_SETTINGS, ("kpasswd server wasn't specified but " - "backup kpasswd given. Using it as primary\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "kpasswd server wasn't specified but " + "backup kpasswd given. Using it as primary\n"); krb5_kpasswd_servers = krb5_backup_kpasswd_servers; krb5_backup_kpasswd_servers = NULL; } if (krb5_kpasswd_servers == NULL && krb5_servers != NULL) { - DEBUG(0, ("Missing krb5_kpasswd option and KDC set explicitly, " - "will use KDC for pasword change operations!\n")); + DEBUG(0, "Missing krb5_kpasswd option and KDC set explicitly, " + "will use KDC for pasword change operations!\n"); ctx->kpasswd_service = NULL; } else { ret = krb5_service_init(ctx, bectx, @@ -142,7 +142,7 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, KRB5_USE_KDCINFO), &ctx->kpasswd_service); if (ret != EOK) { - DEBUG(0, ("Failed to init KRB5KPASSWD failover service!\n")); + DEBUG(0, "Failed to init KRB5KPASSWD failover service!\n"); return ret; } } @@ -151,16 +151,16 @@ int sssm_krb5_auth_init(struct be_ctx *bectx, ret = krb5_child_init(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 fail; } ctx->illegal_path_re = pcre_compile2(ILLEGAL_PATH_PATTERN, 0, &errval, &errstr, &errpos, NULL); if (ctx->illegal_path_re == NULL) { - DEBUG(1, ("Invalid Regular Expression pattern at position %d. " - "(Error: %d [%s])\n", errpos, errval, errstr)); + DEBUG(1, "Invalid Regular Expression pattern at position %d. " + "(Error: %d [%s])\n", errpos, errval, errstr); ret = EFAULT; goto fail; } diff --git a/src/providers/krb5/krb5_init_shared.c b/src/providers/krb5/krb5_init_shared.c index c9eec2f87..ce677ddf0 100644 --- a/src/providers/krb5/krb5_init_shared.c +++ b/src/providers/krb5/krb5_init_shared.c @@ -38,7 +38,7 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, ret = init_delayed_online_authentication(krb5_auth_ctx, bectx, bectx->ev); if (ret != EOK) { - DEBUG(1, ("init_delayed_online_authentication failed.\n")); + DEBUG(1, "init_delayed_online_authentication failed.\n"); goto done; } } @@ -48,7 +48,7 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, ret = krb5_string_to_deltat(renew_interval_str, &renew_interval_delta); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Reading krb5_renew_interval failed.\n")); + "Reading krb5_renew_interval failed.\n"); renew_interval_delta = 0; } renew_intv = renew_interval_delta; @@ -57,7 +57,7 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, if (renew_intv > 0) { ret = init_renew_tgt(krb5_auth_ctx, bectx, bectx->ev, renew_intv); if (ret != EOK) { - DEBUG(1, ("init_renew_tgt failed.\n")); + DEBUG(1, "init_renew_tgt failed.\n"); goto done; } } @@ -65,33 +65,33 @@ errno_t krb5_child_init(struct krb5_ctx *krb5_auth_ctx, ret = check_and_export_options(krb5_auth_ctx->opts, bectx->domain, krb5_auth_ctx); if (ret != EOK) { - DEBUG(1, ("check_and_export_opts failed.\n")); + DEBUG(1, "check_and_export_opts failed.\n"); goto done; } ret = krb5_install_offline_callback(bectx, krb5_auth_ctx); if (ret != EOK) { - DEBUG(1, ("krb5_install_offline_callback failed.\n")); + DEBUG(1, "krb5_install_offline_callback failed.\n"); goto done; } ret = krb5_install_sigterm_handler(bectx->ev, krb5_auth_ctx); if (ret != EOK) { - DEBUG(1, ("krb5_install_sigterm_handler failed.\n")); + DEBUG(1, "krb5_install_sigterm_handler failed.\n"); goto done; } if (debug_to_file != 0) { ret = open_debug_file_ex(KRB5_CHILD_LOG_FILE, &debug_filep, false); if (ret != EOK) { - DEBUG(0, ("Error setting up logging (%d) [%s]\n", - ret, strerror(ret))); + DEBUG(0, "Error setting up logging (%d) [%s]\n", + ret, strerror(ret)); goto done; } krb5_auth_ctx->child_debug_fd = fileno(debug_filep); if (krb5_auth_ctx->child_debug_fd == -1) { - DEBUG(0, ("fileno failed [%d][%s]\n", errno, strerror(errno))); + DEBUG(0, "fileno failed [%d][%s]\n", errno, strerror(errno)); ret = errno; goto done; } diff --git a/src/providers/krb5/krb5_renew_tgt.c b/src/providers/krb5/krb5_renew_tgt.c index 5d5a25b87..2577d98ca 100644 --- a/src/providers/krb5/krb5_renew_tgt.c +++ b/src/providers/krb5/krb5_renew_tgt.c @@ -68,7 +68,7 @@ static void renew_tgt(struct tevent_context *ev, struct tevent_timer *te, req = krb5_auth_send(auth_data, ev, auth_data->be_ctx, auth_data->pd, auth_data->krb5_ctx); if (req == NULL) { - DEBUG(1, ("krb5_auth_send failed.\n")); + DEBUG(1, "krb5_auth_send failed.\n"); /* Give back the pam data to the renewal item to be able to retry at the next * time the renewals re run. */ auth_data->renew_data->pd = talloc_steal(auth_data->renew_data, @@ -92,17 +92,17 @@ static void renew_tgt_done(struct tevent_req *req) ret = krb5_auth_recv(req, &pam_status, &dp_err); talloc_free(req); if (ret) { - DEBUG(1, ("krb5_auth request failed.\n")); + DEBUG(1, "krb5_auth request failed.\n"); if (auth_data->renew_data != NULL) { - DEBUG(5, ("Giving back pam data.\n")); + DEBUG(5, "Giving back pam data.\n"); auth_data->renew_data->pd = talloc_steal(auth_data->renew_data, auth_data->pd); } } else { switch (pam_status) { case PAM_SUCCESS: - DEBUG(4, ("Successfully renewed TGT for user [%s].\n", - auth_data->pd->user)); + DEBUG(4, "Successfully renewed TGT for user [%s].\n", + auth_data->pd->user); /* In general a successful renewal will update the renewal item and free the * old data. But if the TGT has reached the end of his renewable lifetime it * will not be put into the list of renewable tickets again. In this case the @@ -114,33 +114,33 @@ static void renew_tgt_done(struct tevent_req *req) if (value.type == HASH_VALUE_PTR && auth_data->renew_data == talloc_get_type(value.ptr, struct renew_data)) { - DEBUG(5, ("New TGT was not added for renewal, " + DEBUG(5, "New TGT was not added for renewal, " "removing list entry for user [%s].\n", - auth_data->pd->user)); + auth_data->pd->user); ret = hash_delete(auth_data->table, &auth_data->key); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_delete failed.\n")); + DEBUG(1, "hash_delete failed.\n"); } } } break; case PAM_AUTHINFO_UNAVAIL: case PAM_AUTHTOK_LOCK_BUSY: - DEBUG(4, ("Cannot renewed TGT for user [%s] while offline, " + DEBUG(4, "Cannot renewed TGT for user [%s] while offline, " "will retry later.\n", - auth_data->pd->user)); + auth_data->pd->user); if (auth_data->renew_data != NULL) { - DEBUG(5, ("Giving back pam data.\n")); + DEBUG(5, "Giving back pam data.\n"); auth_data->renew_data->pd = talloc_steal(auth_data->renew_data, auth_data->pd); } break; default: - DEBUG(1, ("Failed to renew TGT for user [%s].\n", - auth_data->pd->user)); + DEBUG(1, "Failed to renew TGT for user [%s].\n", + auth_data->pd->user); ret = hash_delete(auth_data->table, &auth_data->key); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_delete failed.\n")); + DEBUG(1, "hash_delete failed.\n"); } } } @@ -161,7 +161,7 @@ static errno_t renew_all_tgts(struct renew_tgt_ctx *renew_tgt_ctx) ret = hash_entries(renew_tgt_ctx->tgt_table, &count, &entries); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_entries failed.\n")); + DEBUG(1, "hash_entries failed.\n"); return ENOMEM; } @@ -169,14 +169,14 @@ static errno_t renew_all_tgts(struct renew_tgt_ctx *renew_tgt_ctx) for (c = 0; c < count; c++) { renew_data = talloc_get_type(entries[c].value.ptr, struct renew_data); - DEBUG(9, ("Checking [%s] for renewal at [%.24s].\n", renew_data->ccfile, - ctime(&renew_data->start_renew_at))); + DEBUG(9, "Checking [%s] for renewal at [%.24s].\n", renew_data->ccfile, + ctime(&renew_data->start_renew_at)); /* If renew_data->pd == NULL a renewal request for this data is * currently running so we skip it. */ if (renew_data->start_renew_at < now && renew_data->pd != NULL) { auth_data = talloc_zero(renew_tgt_ctx, struct auth_data); if (auth_data == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); } else { /* We need to steal the pam_data here, because a successful renewal of the * ticket might add a new renewal item to the list with the same key (upn). @@ -196,22 +196,22 @@ static errno_t renew_all_tgts(struct renew_tgt_ctx *renew_tgt_ctx) auth_data->key.str = talloc_strdup(auth_data, entries[c].key.str); if (auth_data->key.str == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); } else { te = tevent_add_timer(renew_tgt_ctx->ev, auth_data, tevent_timeval_current(), renew_tgt, auth_data); if (te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); } } } if (auth_data == NULL || te == NULL) { - DEBUG(1, ("Failed to renew TGT in [%s].\n", renew_data->ccfile)); + DEBUG(1, "Failed to renew TGT in [%s].\n", renew_data->ccfile); ret = hash_delete(renew_tgt_ctx->tgt_table, &entries[c].key); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_delete failed.\n")); + DEBUG(1, "hash_delete failed.\n"); } } } @@ -259,25 +259,25 @@ static void renew_handler(struct renew_tgt_ctx *renew_tgt_ctx) int ret; if (be_is_offline(renew_tgt_ctx->be_ctx)) { - DEBUG(4, ("Offline, disable renew timer.\n")); + DEBUG(4, "Offline, disable renew timer.\n"); return; } ret = renew_all_tgts(renew_tgt_ctx); if (ret != EOK) { - DEBUG(1, ("renew_all_tgts failed. " - "Disabling automatic TGT renewal\n")); + DEBUG(1, "renew_all_tgts failed. " + "Disabling automatic TGT renewal\n"); sss_log(SSS_LOG_ERR, "Disabling automatic TGT renewal."); talloc_zfree(renew_tgt_ctx); return; } if (renew_tgt_ctx->te != NULL) { - DEBUG(7, ("There is an active renewal timer, doing nothing.\n")); + DEBUG(7, "There is an active renewal timer, doing nothing.\n"); return; } - DEBUG(7, ("Adding new renew timer.\n")); + DEBUG(7, "Adding new renew timer.\n"); next = tevent_timeval_current_ofs(renew_tgt_ctx->timer_interval, 0); @@ -285,7 +285,7 @@ static void renew_handler(struct renew_tgt_ctx *renew_tgt_ctx) next, renew_tgt_timer_handler, renew_tgt_ctx); if (renew_tgt_ctx->te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); sss_log(SSS_LOG_ERR, "Disabling automatic TGT renewal."); talloc_zfree(renew_tgt_ctx); } @@ -303,7 +303,7 @@ static void renew_del_cb(hash_entry_t *entry, hash_destroy_enum type, void *pvt) return; } - DEBUG(1, ("Unexpected value type [%d].\n", entry->value.type)); + DEBUG(1, "Unexpected value type [%d].\n", entry->value.type); } static errno_t check_ccache_file(struct renew_tgt_ctx *renew_tgt_ctx, @@ -318,10 +318,10 @@ static errno_t check_ccache_file(struct renew_tgt_ctx *renew_tgt_ctx, const char *filename; if (ccache_file == NULL || upn == NULL || user_name == NULL) { - DEBUG(6, ("Missing one of the needed attributes: [%s][%s][%s].\n", + DEBUG(6, "Missing one of the needed attributes: [%s][%s][%s].\n", ccache_file == NULL ? "cache file missing" : ccache_file, upn == NULL ? "principal missing" : upn, - user_name == NULL ? "user name missing" : user_name)); + user_name == NULL ? "user name missing" : user_name); return EINVAL; } @@ -339,12 +339,12 @@ static errno_t check_ccache_file(struct renew_tgt_ctx *renew_tgt_ctx, return ret; } - DEBUG(9, ("Found ccache file [%s].\n", ccache_file)); + DEBUG(9, "Found ccache file [%s].\n", ccache_file); memset(&tgtt, 0, sizeof(tgtt)); ret = get_ccache_file_data(ccache_file, upn, &tgtt); if (ret != EOK) { - DEBUG(1, ("get_ccache_file_data failed.\n")); + DEBUG(1, "get_ccache_file_data failed.\n"); return ret; } @@ -354,15 +354,15 @@ static errno_t check_ccache_file(struct renew_tgt_ctx *renew_tgt_ctx, now = time(NULL); if (tgtt.renew_till > tgtt.endtime && tgtt.renew_till > now && tgtt.endtime > now) { - DEBUG(7, ("Adding [%s] for automatic renewal.\n", ccache_file)); + DEBUG(7, "Adding [%s] for automatic renewal.\n", ccache_file); ret = add_tgt_to_renew_table(renew_tgt_ctx->krb5_ctx, ccache_file, &tgtt, &pd, upn); if (ret != EOK) { - DEBUG(1, ("add_tgt_to_renew_table failed, " - "automatic renewal not possible.\n")); + DEBUG(1, "add_tgt_to_renew_table failed, " + "automatic renewal not possible.\n"); } } else { - DEBUG(9, ("TGT in [%s] for [%s] is too old.\n", ccache_file, upn)); + DEBUG(9, "TGT in [%s] for [%s] is too old.\n", ccache_file, upn); } return EOK; @@ -388,13 +388,13 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed.\n")); + DEBUG(1, "talloc_new failed.\n"); return ENOMEM; } base_dn = sysdb_base_dn(renew_tgt_ctx->be_ctx->domain->sysdb, tmp_ctx); if (base_dn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_base_dn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_base_dn failed.\n"); ret = ENOMEM; goto done; } @@ -403,23 +403,23 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) LDB_SCOPE_SUBTREE, ccache_filter, ccache_attrs, &msgs_count, &msgs); if (ret != EOK) { - DEBUG(1, ("sysdb_search_entry failed.\n")); + DEBUG(1, "sysdb_search_entry failed.\n"); goto done; } if (msgs_count == 0) { - DEBUG(9, ("No entries with ccache file found in cache.\n")); + DEBUG(9, "No entries with ccache file found in cache.\n"); ret = EOK; goto done; } DEBUG(SSSDBG_TRACE_ALL, - ("Found [%zu] entries with ccache file in cache.\n", msgs_count)); + "Found [%zu] entries with ccache file in cache.\n", msgs_count); for (c = 0; c < msgs_count; c++) { user_name = ldb_msg_find_attr_as_string(msgs[c], SYSDB_NAME, NULL); if (user_name == NULL) { - DEBUG(1, ("No user name found, this is a severe error, " - "but we ignore it here.\n")); + DEBUG(1, "No user name found, this is a severe error, " + "but we ignore it here.\n"); continue; } @@ -429,15 +429,15 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) user_dom_val = ldb_dn_get_component_val(msgs[c]->dn, 2); if (user_dom_val == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Invalid user DN [%s].\n", - ldb_dn_get_linearized(msgs[c]->dn))); + DEBUG(SSSDBG_OP_FAILURE, "Invalid user DN [%s].\n", + ldb_dn_get_linearized(msgs[c]->dn)); ret = EINVAL; goto done; } user_dom = talloc_strndup(tmp_ctx, (char *) user_dom_val->data, user_dom_val->length); if (user_dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strndup failed,\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strndup failed,\n"); ret = ENOMEM; goto done; } @@ -446,7 +446,7 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) renew_tgt_ctx->be_ctx->domain, user_name, user_dom, &upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("find_or_guess_upn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_or_guess_upn failed.\n"); goto done; } @@ -455,7 +455,7 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) ret = check_ccache_file(renew_tgt_ctx, ccache_file, upn, user_name); if (ret != EOK) { - DEBUG(5, ("Failed to check ccache file [%s].\n", ccache_file)); + DEBUG(5, "Failed to check ccache file [%s].\n", ccache_file); } } @@ -475,7 +475,7 @@ errno_t init_renew_tgt(struct krb5_ctx *krb5_ctx, struct be_ctx *be_ctx, krb5_ctx->renew_tgt_ctx = talloc_zero(krb5_ctx, struct renew_tgt_ctx); if (krb5_ctx->renew_tgt_ctx == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } @@ -483,7 +483,7 @@ errno_t init_renew_tgt(struct krb5_ctx *krb5_ctx, struct be_ctx *be_ctx, &krb5_ctx->renew_tgt_ctx->tgt_table, 0, 0, 0, 0, renew_del_cb, NULL); if (ret != EOK) { - DEBUG(1, ("sss_hash_create failed.\n")); + DEBUG(1, "sss_hash_create failed.\n"); goto fail; } @@ -494,7 +494,7 @@ errno_t init_renew_tgt(struct krb5_ctx *krb5_ctx, struct be_ctx *be_ctx, ret = check_ccache_files(krb5_ctx->renew_tgt_ctx); if (ret != EOK) { - DEBUG(1, ("Failed to read ccache files, continuing ...\n")); + DEBUG(1, "Failed to read ccache files, continuing ...\n"); } next = tevent_timeval_current_ofs(krb5_ctx->renew_tgt_ctx->timer_interval, @@ -503,26 +503,26 @@ errno_t init_renew_tgt(struct krb5_ctx *krb5_ctx, struct be_ctx *be_ctx, next, renew_tgt_timer_handler, krb5_ctx->renew_tgt_ctx); if (krb5_ctx->renew_tgt_ctx->te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); ret = ENOMEM; goto fail; } - DEBUG(7, ("Adding offline callback to remove renewal timer.\n")); + DEBUG(7, "Adding offline callback to remove renewal timer.\n"); ret = be_add_offline_cb(krb5_ctx->renew_tgt_ctx, be_ctx, renew_tgt_offline_callback, krb5_ctx->renew_tgt_ctx, NULL); if (ret != EOK) { - DEBUG(1, ("Failed to add offline callback.\n")); + DEBUG(1, "Failed to add offline callback.\n"); goto fail; } - DEBUG(7, ("Adding renewal task to online callbacks.\n")); + DEBUG(7, "Adding renewal task to online callbacks.\n"); ret = be_add_online_cb(krb5_ctx->renew_tgt_ctx, be_ctx, renew_tgt_online_callback, krb5_ctx->renew_tgt_ctx, NULL); if (ret != EOK) { - DEBUG(1, ("Failed to add renewal task to online callbacks.\n")); + DEBUG(1, "Failed to add renewal task to online callbacks.\n"); goto fail; } @@ -543,19 +543,19 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, struct renew_data *renew_data = NULL; if (krb5_ctx->renew_tgt_ctx == NULL) { - DEBUG(7 ,("Renew context not initialized, " - "automatic renewal not available.\n")); + DEBUG(7 ,"Renew context not initialized, " + "automatic renewal not available.\n"); return EOK; } if (pd->cmd != SSS_PAM_AUTHENTICATE && pd->cmd != SSS_CMD_RENEW && pd->cmd != SSS_PAM_CHAUTHTOK) { - DEBUG(1, ("Unexpected pam task [%d].\n", pd->cmd)); + DEBUG(1, "Unexpected pam task [%d].\n", pd->cmd); return EINVAL; } if (upn == NULL) { - DEBUG(1, ("Missing user principal name.\n")); + DEBUG(1, "Missing user principal name.\n"); return EINVAL; } @@ -566,7 +566,7 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, renew_data = talloc_zero(krb5_ctx->renew_tgt_ctx, struct renew_data); if (renew_data == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = ENOMEM; goto done; } @@ -574,7 +574,7 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, if (ccfile[0] == '/') { renew_data->ccfile = talloc_asprintf(renew_data, "FILE:%s", ccfile); if (renew_data->ccfile == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -589,7 +589,7 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, ret = copy_pam_data(renew_data, pd, &renew_data->pd); if (ret != EOK) { - DEBUG(1, ("copy_pam_data failed.\n")); + DEBUG(1, "copy_pam_data failed.\n"); goto done; } @@ -597,7 +597,7 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, ret = sss_authtok_set_ccfile(renew_data->pd->authtok, renew_data->ccfile, 0); if (ret) { - DEBUG(1, ("Failed to store ccfile in auth token.\n")); + DEBUG(1, "Failed to store ccfile in auth token.\n"); goto done; } @@ -608,13 +608,13 @@ errno_t add_tgt_to_renew_table(struct krb5_ctx *krb5_ctx, const char *ccfile, ret = hash_enter(krb5_ctx->renew_tgt_ctx->tgt_table, &key, &value); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_enter failed.\n")); + DEBUG(1, "hash_enter failed.\n"); ret = EFAULT; goto done; } - DEBUG(7, ("Added [%s] for renewal at [%.24s].\n", renew_data->ccfile, - ctime(&renew_data->start_renew_at))); + DEBUG(7, "Added [%s] for renewal at [%.24s].\n", renew_data->ccfile, + ctime(&renew_data->start_renew_at)); ret = EOK; diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c index cf6d72ad2..bbb4a31ba 100644 --- a/src/providers/krb5/krb5_utils.c +++ b/src/providers/krb5/krb5_utils.c @@ -59,7 +59,7 @@ errno_t find_or_guess_upn(TALLOC_CTX *mem_ctx, struct ldb_message *msg, ret = krb5_get_simple_upn(mem_ctx, krb5_ctx, dom, user, user_dom, _upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("krb5_get_simple_upn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "krb5_get_simple_upn failed.\n"); return ret; } @@ -67,7 +67,7 @@ done: if (ret == EOK && upn != NULL) { *_upn = talloc_strdup(mem_ctx, upn); if (*_upn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strdup failed.\n"); return ENOMEM; } } @@ -96,19 +96,19 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } ret = sysdb_get_user_attr(tmp_ctx, sysdb, domain, user, attrs, &res); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_get_user_attr failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_get_user_attr failed.\n"); goto done; } if (res->count != 1) { - DEBUG(SSSDBG_OP_FAILURE, ("[%d] user objects for name [%s] found, " \ - "expected 1.\n", res->count, user)); + DEBUG(SSSDBG_OP_FAILURE, "[%d] user objects for name [%s] found, " \ + "expected 1.\n", res->count, user); ret = EINVAL; goto done; } @@ -116,8 +116,8 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb, cached_upn = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_UPN, NULL); if (cached_upn != NULL && strcmp(cached_upn, upn) == 0) { - DEBUG(SSSDBG_TRACE_ALL, ("Cached UPN and new one match, " - "nothing to do.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Cached UPN and new one match, " + "nothing to do.\n"); ret = EOK; goto done; } @@ -128,35 +128,35 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb, if (cached_canonical_upn != NULL && strcmp(cached_canonical_upn, upn) == 0) { - DEBUG(SSSDBG_TRACE_ALL, ("Cached canonical UPN and new one match, " - "nothing to do.\n")); + DEBUG(SSSDBG_TRACE_ALL, "Cached canonical UPN and new one match, " + "nothing to do.\n"); ret = EOK; goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Replacing canonical UPN [%s] with [%s] " \ + DEBUG(SSSDBG_TRACE_LIBS, "Replacing canonical UPN [%s] with [%s] " \ "for user [%s].\n", cached_canonical_upn == NULL ? "empty" : cached_canonical_upn, - upn, user)); + upn, user); new_attrs = sysdb_new_attrs(tmp_ctx); if (new_attrs == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_new_attrs failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_new_attrs failed.\n"); ret = ENOMEM; goto done; } ret = sysdb_attrs_add_string(new_attrs, SYSDB_CANONICAL_UPN, upn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_string failed.\n"); goto done; } ret = sysdb_transaction_start(sysdb); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Error %d starting transaction (%s)\n", ret, strerror(ret))); + "Error %d starting transaction (%s)\n", ret, strerror(ret)); goto done; } in_transaction = true; @@ -165,14 +165,14 @@ errno_t check_if_cached_upn_needs_update(struct sysdb_ctx *sysdb, cached_canonical_upn == NULL ? SYSDB_MOD_ADD : SYSDB_MOD_REP); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_set_entry_attr failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_set_entry_attr failed [%d][%s].\n", + ret, strerror(ret)); goto done; } ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to commit transaction!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -183,7 +183,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } @@ -218,7 +218,7 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, bool rerun; if (template == NULL) { - DEBUG(1, ("Missing template.\n")); + DEBUG(1, "Missing template.\n"); return NULL; } @@ -227,13 +227,13 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, copy = talloc_strdup(tmp_ctx, template); if (copy == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); goto done; } result = talloc_strdup(tmp_ctx, ""); if (result == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); goto done; } @@ -242,7 +242,7 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, *n = '\0'; n++; if ( *n == '\0' ) { - DEBUG(1, ("format error, single %% at the end of the template.\n")); + DEBUG(1, "format error, single %% at the end of the template.\n"); goto done; } @@ -253,15 +253,15 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, switch (action) { case 'u': if (kr->pd->user == NULL) { - DEBUG(1, ("Cannot expand user name template " - "because user name is empty.\n")); + DEBUG(1, "Cannot expand user name template " + "because user name is empty.\n"); goto done; } name = sss_get_cased_name(tmp_ctx, kr->pd->user, case_sensitive); if (!name) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sss_get_cased_name failed\n")); + "sss_get_cased_name failed\n"); goto done; } @@ -270,8 +270,8 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, break; case 'U': if (kr->uid <= 0) { - DEBUG(1, ("Cannot expand uid template " - "because uid is invalid.\n")); + DEBUG(1, "Cannot expand uid template " + "because uid is invalid.\n"); goto done; } result = talloc_asprintf_append(result, "%s%"SPRIuid, p, @@ -279,8 +279,8 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, break; case 'p': if (kr->upn == NULL) { - DEBUG(1, ("Cannot expand user principal name template " - "because upn is empty.\n")); + DEBUG(1, "Cannot expand user principal name template " + "because upn is empty.\n"); goto done; } result = talloc_asprintf_append(result, "%s%s", p, kr->upn); @@ -291,15 +291,15 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, case 'r': dummy = dp_opt_get_string(kr->krb5_ctx->opts, KRB5_REALM); if (dummy == NULL) { - DEBUG(1, ("Missing kerberos realm.\n")); + DEBUG(1, "Missing kerberos realm.\n"); goto done; } result = talloc_asprintf_append(result, "%s%s", p, dummy); break; case 'h': if (kr->homedir == NULL) { - DEBUG(1, ("Cannot expand home directory template " - "because the path is not available.\n")); + DEBUG(1, "Cannot expand home directory template " + "because the path is not available.\n"); goto done; } result = talloc_asprintf_append(result, "%s%s", p, kr->homedir); @@ -309,32 +309,32 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, cache_dir_tmpl = dp_opt_get_string(kr->krb5_ctx->opts, KRB5_CCACHEDIR); if (cache_dir_tmpl == NULL) { - DEBUG(1, ("Missing credential cache directory.\n")); + DEBUG(1, "Missing credential cache directory.\n"); goto done; } dummy = expand_ccname_template(tmp_ctx, kr, cache_dir_tmpl, false, case_sensitive); if (dummy == NULL) { - DEBUG(1, ("Expanding credential cache directory " - "template failed.\n")); + DEBUG(1, "Expanding credential cache directory " + "template failed.\n"); goto done; } result = talloc_asprintf_append(result, "%s%s", p, dummy); talloc_zfree(dummy); } else { - DEBUG(1, ("'%%d' is not allowed in this template.\n")); + DEBUG(1, "'%%d' is not allowed in this template.\n"); goto done; } break; case 'P': if (!file_mode) { - DEBUG(1, ("'%%P' is not allowed in this template.\n")); + DEBUG(1, "'%%P' is not allowed in this template.\n"); goto done; } if (kr->pd->cli_pid == 0) { - DEBUG(1, ("Cannot expand PID template " - "because PID is not available.\n")); + DEBUG(1, "Cannot expand PID template " + "because PID is not available.\n"); goto done; } result = talloc_asprintf_append(result, "%s%d", p, @@ -371,10 +371,10 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, name = n; n = strchr(name, '}'); if (!n) { - DEBUG(SSSDBG_CRIT_FAILURE, ( + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid substitution sequence in cache " "template. Missing closing '}' in [%s].\n", - template)); + template); goto done; } result = talloc_asprintf_append(result, "%s%%%.*s", p, @@ -382,13 +382,13 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, } break; default: - DEBUG(1, ("format error, unknown template [%%%c].\n", *n)); + DEBUG(1, "format error, unknown template [%%%c].\n", *n); goto done; } } if (result == NULL) { - DEBUG(1, ("talloc_asprintf_append failed.\n")); + DEBUG(1, "talloc_asprintf_append failed.\n"); goto done; } @@ -397,7 +397,7 @@ char *expand_ccname_template(TALLOC_CTX *mem_ctx, struct krb5child_req *kr, result = talloc_asprintf_append(result, "%s", p); if (result == NULL) { - DEBUG(1, ("talloc_asprintf_append failed.\n")); + DEBUG(1, "talloc_asprintf_append failed.\n"); goto done; } @@ -413,24 +413,24 @@ static errno_t check_parent_stat(struct stat *parent_stat, if (!((parent_stat->st_uid == 0 && parent_stat->st_gid == 0) || parent_stat->st_uid == uid)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Private directory can only be created below a directory " + "Private directory can only be created below a directory " "belonging to root or to [%"SPRIuid"][%"SPRIgid"].\n", - uid, gid)); + uid, gid); return EINVAL; } if (parent_stat->st_uid == uid) { if (!(parent_stat->st_mode & S_IXUSR)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Parent directory does not have the search bit set for " - "the owner.\n")); + "Parent directory does not have the search bit set for " + "the owner.\n"); return EINVAL; } } else { if (!(parent_stat->st_mode & S_IXOTH)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Parent directory does not have the search bit set for " - "others.\n")); + "Parent directory does not have the search bit set for " + "others.\n"); return EINVAL; } } @@ -458,7 +458,7 @@ static errno_t find_ccdir_parent_data(TALLOC_CTX *mem_ctx, if (ret == EOK) { if ( !S_ISDIR(parent_stat->st_mode) ) { DEBUG(SSSDBG_MINOR_FAILURE, - ("[%s] is not a directory.\n", ccdirname)); + "[%s] is not a directory.\n", ccdirname); return EINVAL; } return EOK; @@ -466,8 +466,8 @@ static errno_t find_ccdir_parent_data(TALLOC_CTX *mem_ctx, if (errno != ENOENT) { ret = errno; DEBUG(SSSDBG_MINOR_FAILURE, - ("stat for [%s] failed: [%d][%s].\n", ccdirname, ret, - strerror(ret))); + "stat for [%s] failed: [%d][%s].\n", ccdirname, ret, + strerror(ret)); return ret; } } @@ -475,14 +475,14 @@ static errno_t find_ccdir_parent_data(TALLOC_CTX *mem_ctx, li = talloc_zero(mem_ctx, struct string_list); if (li == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("talloc_zero failed.\n")); + "talloc_zero failed.\n"); return ENOMEM; } li->s = talloc_strdup(li, ccdirname); if (li->s == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("talloc_strdup failed.\n")); + "talloc_strdup failed.\n"); return ENOMEM; } @@ -491,7 +491,7 @@ static errno_t find_ccdir_parent_data(TALLOC_CTX *mem_ctx, parent = talloc_strdup(mem_ctx, ccdirname); if (parent == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("talloc_strdup failed.\n")); + "talloc_strdup failed.\n"); return ENOMEM; } @@ -502,8 +502,8 @@ static errno_t find_ccdir_parent_data(TALLOC_CTX *mem_ctx, end = strrchr(parent, '/'); if (end == NULL || end == parent) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot find parent directory of [%s], / is not allowed.\n", - ccdirname)); + "Cannot find parent directory of [%s], / is not allowed.\n", + ccdirname); ret = EINVAL; goto done; } @@ -526,16 +526,16 @@ check_ccache_re(const char *filename, pcre *illegal_re) 0, 0, NULL, 0); if (ret == 0) { DEBUG(SSSDBG_OP_FAILURE, - ("Illegal pattern in ccache directory name [%s].\n", filename)); + "Illegal pattern in ccache directory name [%s].\n", filename); return EINVAL; } else if (ret == PCRE_ERROR_NOMATCH) { DEBUG(SSSDBG_TRACE_LIBS, - ("Ccache directory name [%s] does not contain " - "illegal patterns.\n", filename)); + "Ccache directory name [%s] does not contain " + "illegal patterns.\n", filename); return EOK; } - DEBUG(SSSDBG_CRIT_FAILURE, ("pcre_exec failed [%d].\n", ret)); + DEBUG(SSSDBG_CRIT_FAILURE, "pcre_exec failed [%d].\n", ret); return EFAULT; } @@ -554,13 +554,13 @@ create_ccache_dir(const char *ccdirname, pcre *illegal_re, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("talloc_new failed.\n")); + "talloc_new failed.\n"); return ENOMEM; } if (*ccdirname != '/') { DEBUG(SSSDBG_MINOR_FAILURE, - ("Only absolute paths are allowed, not [%s] .\n", ccdirname)); + "Only absolute paths are allowed, not [%s] .\n", ccdirname); ret = EINVAL; goto done; } @@ -576,20 +576,20 @@ create_ccache_dir(const char *ccdirname, pcre *illegal_re, &missing_parents); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("find_ccdir_parent_data failed.\n")); + "find_ccdir_parent_data failed.\n"); goto done; } ret = check_parent_stat(&parent_stat, uid, gid); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("check_parent_stat failed for directory [%s].\n", ccdirname)); + "check_parent_stat failed for directory [%s].\n", ccdirname); goto done; } DLIST_FOR_EACH(li, missing_parents) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Creating directory [%s].\n", li->s)); + "Creating directory [%s].\n", li->s); new_dir_mode = 0700; old_umask = umask(0000); @@ -598,15 +598,15 @@ create_ccache_dir(const char *ccdirname, pcre *illegal_re, if (ret != EOK) { ret = errno; DEBUG(SSSDBG_MINOR_FAILURE, - ("mkdir [%s] failed: [%d][%s].\n", li->s, ret, - strerror(ret))); + "mkdir [%s] failed: [%d][%s].\n", li->s, ret, + strerror(ret)); goto done; } ret = chown(li->s, uid, gid); if (ret != EOK) { ret = errno; DEBUG(SSSDBG_MINOR_FAILURE, - ("chown failed [%d][%s].\n", ret, strerror(ret))); + "chown failed [%d][%s].\n", ret, strerror(ret)); goto done; } } @@ -634,14 +634,14 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name, kerr = krb5_init_context(&ctx); if (kerr != 0) { - DEBUG(1, ("krb5_init_context failed.\n")); + DEBUG(1, "krb5_init_context failed.\n"); goto done; } kerr = krb5_parse_name(ctx, client_name, &client_princ); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, ctx, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_parse_name failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_parse_name failed.\n"); goto done; } @@ -652,7 +652,7 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name, realm_length, realm_name); if (server_name == NULL) { kerr = KRB5_CC_NOMEM; - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); goto done; } @@ -660,14 +660,14 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name, talloc_free(server_name); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, ctx, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_parse_name failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_parse_name failed.\n"); goto done; } kerr = krb5_cc_resolve(ctx, ccache_file, &cc); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, ctx, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_resolve failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_resolve failed.\n"); goto done; } @@ -680,7 +680,7 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name, kerr = krb5_cc_retrieve_cred(ctx, cc, 0, &mcred, &cred); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, ctx, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_retrieve_cred failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_retrieve_cred failed.\n"); goto done; } @@ -694,7 +694,7 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name, kerr = krb5_cc_close(ctx, cc); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, ctx, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_close failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_close failed.\n"); goto done; } cc = NULL; @@ -751,7 +751,7 @@ errno_t sss_krb5_precreate_ccache(const char *ccname, pcre *illegal_re, ccdirname = talloc_strdup(tmp_ctx, filename); if (ccdirname == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -762,8 +762,8 @@ errno_t sss_krb5_precreate_ccache(const char *ccname, pcre *illegal_re, do { end = strrchr(ccdirname, '/'); if (end == NULL || end == ccdirname) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot find parent directory of [%s], " - "/ is not allowed.\n", ccdirname)); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot find parent directory of [%s], " + "/ is not allowed.\n", ccdirname); ret = EINVAL; goto done; } @@ -823,12 +823,12 @@ static errno_t sss_open_ccache_as_user(TALLOC_CTX *mem_ctx, kerr = krb5_cc_resolve(cc->context, ccname, &cc->ccache); if (kerr == KRB5_FCC_NOFILE || cc->ccache == NULL) { - DEBUG(SSSDBG_TRACE_FUNC, ("ccache %s is missing or empty\n", ccname)); + DEBUG(SSSDBG_TRACE_FUNC, "ccache %s is missing or empty\n", ccname); ret = ERR_NOT_FOUND; goto done; } else if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, cc->context, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_resolve failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_resolve failed.\n"); ret = ERR_INTERNAL; goto done; } @@ -852,7 +852,7 @@ static errno_t sss_destroy_ccache(struct sss_krb5_ccache *cc) kerr = krb5_cc_destroy(cc->context, cc->ccache); if (kerr) { KRB5_DEBUG(SSSDBG_OP_FAILURE, cc->context, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_destroy failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_destroy failed.\n"); ret = EIO; } else { ret = EOK; @@ -872,7 +872,7 @@ errno_t sss_krb5_cc_destroy(const char *ccname, uid_t uid, gid_t gid) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } @@ -904,7 +904,7 @@ errno_t sss_krb5_check_ccache_princ(uid_t uid, gid_t gid, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return ENOMEM; } @@ -916,12 +916,12 @@ errno_t sss_krb5_check_ccache_princ(uid_t uid, gid_t gid, cc_type = krb5_cc_get_type(cc->context, cc->ccache); DEBUG(SSSDBG_TRACE_INTERNAL, - ("Searching for [%s] in cache of type [%s]\n", principal, cc_type)); + "Searching for [%s] in cache of type [%s]\n", principal, cc_type); kerr = krb5_parse_name(cc->context, principal, &kprinc); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, cc->context, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_parse_name failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_parse_name failed.\n"); ret = ERR_INTERNAL; goto done; } @@ -929,7 +929,7 @@ errno_t sss_krb5_check_ccache_princ(uid_t uid, gid_t gid, kerr = krb5_cc_get_principal(cc->context, cc->ccache, &ccprinc); if (kerr != 0) { KRB5_DEBUG(SSSDBG_OP_FAILURE, cc->context, kerr); - DEBUG(SSSDBG_CRIT_FAILURE, ("krb5_cc_get_principal failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "krb5_cc_get_principal failed.\n"); } if (ccprinc) { @@ -1021,7 +1021,7 @@ errno_t sss_krb5_cc_verify_ccache(const char *ccname, uid_t uid, gid_t gid, 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; } @@ -1032,7 +1032,7 @@ errno_t sss_krb5_cc_verify_ccache(const char *ccname, uid_t uid, gid_t gid, tgt_name = talloc_asprintf(tmp_ctx, "krbtgt/%s@%s", realm, realm); if (!tgt_name) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_new failed.\n"); ret = ENOMEM; goto done; } @@ -1061,7 +1061,7 @@ errno_t sss_krb5_cc_verify_ccache(const char *ccname, uid_t uid, gid_t gid, KRB5_TC_MATCH_TIMES, &mcred, &cred); if (kerr) { if (kerr == KRB5_CC_NOTFOUND || kerr == KRB5_FCC_NOFILE) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("TGT not found or expired.\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "TGT not found or expired.\n"); ret = EINVAL; } else { KRB5_DEBUG(SSSDBG_CRIT_FAILURE, cc->context, kerr); @@ -1087,7 +1087,7 @@ errno_t get_domain_or_subdomain(struct be_ctx *be_ctx, strcasecmp(domain_name, be_ctx->domain->name) != 0) { *dom = find_subdomain_by_name(be_ctx->domain, domain_name, true); if (*dom == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("find_subdomain_by_name failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "find_subdomain_by_name failed.\n"); return ENOMEM; } } else { diff --git a/src/providers/krb5/krb5_wait_queue.c b/src/providers/krb5/krb5_wait_queue.c index 8b7b9a376..23a6081b8 100644 --- a/src/providers/krb5/krb5_wait_queue.c +++ b/src/providers/krb5/krb5_wait_queue.c @@ -47,7 +47,7 @@ static void wait_queue_auth(struct tevent_context *ev, struct tevent_timer *te, req = krb5_auth_send(qe->be_req, be_ctx->ev, be_ctx, qe->pd, qe->krb5_ctx); if (req == NULL) { - DEBUG(1, ("krb5_auth_send failed.\n")); + DEBUG(1, "krb5_auth_send failed.\n"); } else { tevent_req_set_callback(req, krb5_pam_handler_auth_done, qe->be_req); } @@ -66,7 +66,7 @@ static void wait_queue_del_cb(hash_entry_t *entry, hash_destroy_enum type, return; } - DEBUG(1, ("Unexpected value type [%d].\n", entry->value.type)); + DEBUG(1, "Unexpected value type [%d].\n", entry->value.type); } errno_t add_to_wait_queue(struct be_req *be_req, struct pam_data *pd, @@ -83,7 +83,7 @@ errno_t add_to_wait_queue(struct be_req *be_req, struct pam_data *pd, &krb5_ctx->wait_queue_hash, 0, 0, 0, 0, wait_queue_del_cb, NULL); if (ret != EOK) { - DEBUG(1, ("sss_hash_create failed")); + DEBUG(1, "sss_hash_create failed"); return ret; } } @@ -95,7 +95,7 @@ errno_t add_to_wait_queue(struct be_req *be_req, struct pam_data *pd, switch (ret) { case HASH_SUCCESS: if (value.type != HASH_VALUE_PTR) { - DEBUG(1, ("Unexpected hash value type.\n")); + DEBUG(1, "Unexpected hash value type.\n"); return EINVAL; } @@ -103,7 +103,7 @@ errno_t add_to_wait_queue(struct be_req *be_req, struct pam_data *pd, queue_entry = talloc_zero(head, struct queue_entry); if (queue_entry == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } @@ -118,21 +118,21 @@ errno_t add_to_wait_queue(struct be_req *be_req, struct pam_data *pd, value.type = HASH_VALUE_PTR; head = talloc_zero(krb5_ctx->wait_queue_hash, struct queue_entry); if (head == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } value.ptr = head; ret = hash_enter(krb5_ctx->wait_queue_hash, &key, &value); if (ret != HASH_SUCCESS) { - DEBUG(1, ("hash_enter failed.\n")); + DEBUG(1, "hash_enter failed.\n"); talloc_free(head); return EIO; } break; default: - DEBUG(1, ("hash_lookup failed.\n")); + DEBUG(1, "hash_lookup failed.\n"); return EIO; } @@ -154,7 +154,7 @@ void check_wait_queue(struct krb5_ctx *krb5_ctx, char *username) struct be_ctx *be_ctx; if (krb5_ctx->wait_queue_hash == NULL) { - DEBUG(1, ("No wait queue available.\n")); + DEBUG(1, "No wait queue available.\n"); return; } @@ -166,14 +166,14 @@ void check_wait_queue(struct krb5_ctx *krb5_ctx, char *username) switch (ret) { case HASH_SUCCESS: if (value.type != HASH_VALUE_PTR) { - DEBUG(1, ("Unexpected hash value type.\n")); + DEBUG(1, "Unexpected hash value type.\n"); return; } head = talloc_get_type(value.ptr, struct queue_entry); if (head->next == NULL) { - DEBUG(7, ("Wait queue for user [%s] is empty.\n", username)); + DEBUG(7, "Wait queue for user [%s] is empty.\n", username); } else { queue_entry = head->next; @@ -184,7 +184,7 @@ void check_wait_queue(struct krb5_ctx *krb5_ctx, char *username) tevent_timeval_current(), wait_queue_auth, queue_entry); if (te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); } else { return; } @@ -192,16 +192,16 @@ void check_wait_queue(struct krb5_ctx *krb5_ctx, char *username) ret = hash_delete(krb5_ctx->wait_queue_hash, &key); if (ret != HASH_SUCCESS) { - DEBUG(1, ("Failed to remove wait queue for user [%s].\n", - username)); + DEBUG(1, "Failed to remove wait queue for user [%s].\n", + username); } break; case HASH_ERROR_KEY_NOT_FOUND: - DEBUG(1, ("No wait queue for user [%s] found.\n", username)); + DEBUG(1, "No wait queue for user [%s] found.\n", username); break; default: - DEBUG(1, ("hash_lookup failed.\n")); + DEBUG(1, "hash_lookup failed.\n"); } return; diff --git a/src/providers/ldap/ldap_access.c b/src/providers/ldap/ldap_access.c index b3920b7ac..bfece09e8 100644 --- a/src/providers/ldap/ldap_access.c +++ b/src/providers/ldap/ldap_access.c @@ -68,7 +68,7 @@ void sdap_pam_access_handler(struct be_req *breq) access_ctx->id_ctx->conn, pd); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to start sdap_access request\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to start sdap_access request\n"); sdap_access_reply(breq, PAM_SYSTEM_ERR); return; } @@ -96,7 +96,7 @@ static void sdap_access_done(struct tevent_req *req) pam_status = PAM_ACCT_EXPIRED; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Error retrieving access check result.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error retrieving access check result.\n"); pam_status = PAM_SYSTEM_ERR; break; } diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c index ddaeb09c8..cef20cab8 100644 --- a/src/providers/ldap/ldap_auth.c +++ b/src/providers/ldap/ldap_auth.c @@ -62,13 +62,13 @@ static errno_t add_expired_warning(struct pam_data *pd, long exp_time) uint32_t *data; if (exp_time < 0 || exp_time > UINT32_MAX) { - DEBUG(1, ("Time to expire out of range.\n")); + DEBUG(1, "Time to expire out of range.\n"); return EINVAL; } data = talloc_array(pd, uint32_t, 2); if (data == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); return ENOMEM; } @@ -78,7 +78,7 @@ static errno_t add_expired_warning(struct pam_data *pd, long exp_time) ret = pam_add_response(pd, SSS_PAM_USER_INFO, 2 * sizeof(uint32_t), (uint8_t *) data); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return EOK; @@ -98,30 +98,30 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now, end = strptime(expire_date, "%Y%m%d%H%M%SZ", &tm); if (end == NULL) { - DEBUG(1, ("Kerberos expire date [%s] invalid.\n", expire_date)); + DEBUG(1, "Kerberos expire date [%s] invalid.\n", expire_date); return EINVAL; } if (*end != '\0') { - DEBUG(1, ("Kerberos expire date [%s] contains extra characters.\n", - expire_date)); + DEBUG(1, "Kerberos expire date [%s] contains extra characters.\n", + expire_date); return EINVAL; } expire_time = mktime(&tm); if (expire_time == -1) { - DEBUG(1, ("mktime failed to convert [%s].\n", expire_date)); + DEBUG(1, "mktime failed to convert [%s].\n", expire_date); return EINVAL; } tzset(); expire_time -= timezone; DEBUG(SSSDBG_TRACE_ALL, - ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " + "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0], - tzname[1], timezone, daylight, now, expire_time)); + tzname[1], timezone, daylight, now, expire_time); if (difftime(now, expire_time) > 0.0) { - DEBUG(4, ("Kerberos password expired.\n")); + DEBUG(4, "Kerberos password expired.\n"); ret = ERR_PASSWORD_EXPIRED; } else { if (pwd_exp_warning >= 0) { @@ -134,7 +134,7 @@ static errno_t check_pwexpire_kerberos(const char *expire_date, time_t now, expiration_warning == 0)) { ret = add_expired_warning(pd, (long) difftime(expire_time, now)); if (ret != EOK) { - DEBUG(1, ("add_expired_warning failed.\n")); + DEBUG(1, "add_expired_warning failed.\n"); } } ret = EOK; @@ -152,14 +152,14 @@ static errno_t check_pwexpire_shadow(struct spwd *spwd, time_t now, int ret; if (spwd->sp_lstchg <= 0) { - DEBUG(4, ("Last change day is not set, new password needed.\n")); + DEBUG(4, "Last change day is not set, new password needed.\n"); return ERR_PASSWORD_EXPIRED; } today = (long) (now / (60 * 60 *24)); password_age = today - spwd->sp_lstchg; if (password_age < 0) { - DEBUG(2, ("The last password change time is in the future!.\n")); + DEBUG(2, "The last password change time is in the future!.\n"); return EOK; } @@ -167,12 +167,12 @@ static errno_t check_pwexpire_shadow(struct spwd *spwd, time_t now, (spwd->sp_max != -1 && spwd->sp_inact != -1 && password_age > spwd->sp_max + spwd->sp_inact)) { - DEBUG(4, ("Account expired.\n")); + DEBUG(4, "Account expired.\n"); return ERR_ACCOUNT_EXPIRED; } if (spwd->sp_max != -1 && password_age > spwd->sp_max) { - DEBUG(4, ("Password expired.\n")); + DEBUG(4, "Password expired.\n"); return ERR_PASSWORD_EXPIRED; } @@ -188,7 +188,7 @@ static errno_t check_pwexpire_shadow(struct spwd *spwd, time_t now, ret = add_expired_warning(pd, exp); if (ret != EOK) { - DEBUG(1, ("add_expired_warning failed.\n")); + DEBUG(1, "add_expired_warning failed.\n"); } } @@ -211,7 +211,7 @@ static errno_t check_pwexpire_ldap(struct pam_data *pd, data = talloc_size(pd, 2* sizeof(uint32_t)); if (data == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); return ENOMEM; } @@ -235,7 +235,7 @@ static errno_t check_pwexpire_ldap(struct pam_data *pd, ret = pam_add_response(pd, SSS_PAM_USER_INFO, 2* sizeof(uint32_t), (uint8_t*)data); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } } @@ -259,23 +259,23 @@ static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx, pwd_policy = dp_opt_get_string(opts, SDAP_PWD_POLICY); if (pwd_policy == NULL) { - DEBUG(1, ("Missing password policy.\n")); + DEBUG(1, "Missing password policy.\n"); return EINVAL; } if (strcasecmp(pwd_policy, PWD_POL_OPT_NONE) == 0) { - DEBUG(9, ("No password policy requested.\n")); + DEBUG(9, "No password policy requested.\n"); return EOK; } else if (strcasecmp(pwd_policy, PWD_POL_OPT_MIT) == 0) { mark = ldb_msg_find_attr_as_string(msg, SYSDB_KRBPW_LASTCHANGE, NULL); if (mark != NULL) { - DEBUG(9, ("Found Kerberos password expiration attributes.\n")); + DEBUG(9, "Found Kerberos password expiration attributes.\n"); val = ldb_msg_find_attr_as_string(msg, SYSDB_KRBPW_EXPIRATION, NULL); if (val != NULL) { *data = talloc_strdup(mem_ctx, val); if (*data == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); return ENOMEM; } *type = PWEXPIRE_KERBEROS; @@ -283,18 +283,18 @@ static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx, return EOK; } } else { - DEBUG(1, ("No Kerberos password expiration attributes found, " + DEBUG(1, "No Kerberos password expiration attributes found, " "but MIT Kerberos password policy was requested. " - "Access will be denied.\n")); + "Access will be denied.\n"); return EACCES; } } else if (strcasecmp(pwd_policy, PWD_POL_OPT_SHADOW) == 0) { mark = ldb_msg_find_attr_as_string(msg, SYSDB_SHADOWPW_LASTCHANGE, NULL); if (mark != NULL) { - DEBUG(9, ("Found shadow password expiration attributes.\n")); + DEBUG(9, "Found shadow password expiration attributes.\n"); spwd = talloc_zero(mem_ctx, struct spwd); if (spwd == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } @@ -327,14 +327,14 @@ static errno_t find_password_expiration_attributes(TALLOC_CTX *mem_ctx, return EOK; } else { - DEBUG(1, ("No shadow password attributes found, " + DEBUG(1, "No shadow password attributes found, " "but shadow password policy was requested. " - "Access will be denied.\n")); + "Access will be denied.\n"); return EACCES; } } - DEBUG(9, ("No password expiration attributes found.\n")); + DEBUG(9, "No password expiration attributes found.\n"); return EOK; shadow_fail: @@ -382,7 +382,7 @@ static struct tevent_req *get_user_dn_send(TALLOC_CTX *memctx, opts->user_map[SDAP_OC_USER].name); talloc_zfree(clean_name); if (filter == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to build the base filter\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to build the base filter\n"); ret = ENOMEM; goto done; } @@ -434,17 +434,17 @@ static void get_user_dn_done(struct tevent_req *subreq) ret = sdap_search_user_recv(state, subreq, NULL, &users, &count); talloc_zfree(subreq); if (ret && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to retrieve users\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to retrieve users\n"); tevent_req_error(req, ret); return; } if (count == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("No such user\n")); + DEBUG(SSSDBG_OP_FAILURE, "No such user\n"); tevent_req_error(req, ENOMEM); return; } else if (count > 1) { - DEBUG(SSSDBG_OP_FAILURE, ("Multiple users matched\n")); + DEBUG(SSSDBG_OP_FAILURE, "Multiple users matched\n"); tevent_req_error(req, EIO); return; } @@ -453,7 +453,7 @@ static void get_user_dn_done(struct tevent_req *subreq) ret = sysdb_attrs_get_el_ext(users[0], SYSDB_ORIG_DN, false, &el); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("originalDN is not available for [%s].\n", state->username)); + "originalDN is not available for [%s].\n", state->username); tevent_req_error(req, ret); return; } @@ -464,8 +464,8 @@ static void get_user_dn_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found originalDN [%s] for [%s]\n", - state->orig_dn, state->username)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found originalDN [%s] for [%s]\n", + state->orig_dn, state->username); tevent_req_done(req); } @@ -556,13 +556,13 @@ static int get_user_dn(TALLOC_CTX *memctx, &pw_expire_type, &pw_expire_data); if (ret != EOK) { - DEBUG(1, ("find_password_expiration_attributes failed.\n")); + DEBUG(1, "find_password_expiration_attributes failed.\n"); } break; default: - DEBUG(1, ("User search by name (%s) returned > 1 results!\n", - username)); + DEBUG(1, "User search by name (%s) returned > 1 results!\n", + username); ret = EFAULT; break; } @@ -661,7 +661,7 @@ static struct tevent_req *auth_get_server(struct tevent_req *req) state->sdap_service->name, state->srv == NULL ? true : false); if (!next_req) { - DEBUG(1, ("be_resolve_server_send failed.\n")); + DEBUG(1, "be_resolve_server_send failed.\n"); return NULL; } @@ -689,8 +689,8 @@ static void auth_resolve_done(struct tevent_req *subreq) /* Determine whether we need to use TLS */ if (sdap_is_secure_uri(state->ctx->service->uri)) { - DEBUG(8, ("[%s] is a secure channel. No need to run START_TLS\n", - state->ctx->service->uri)); + DEBUG(8, "[%s] is a secure channel. No need to run START_TLS\n", + state->ctx->service->uri); use_tls = false; } else { @@ -816,8 +816,8 @@ static void auth_bind_user_done(struct tevent_req *subreq) ret = sdap_auth_recv(subreq, state, &ppolicy); talloc_zfree(subreq); if (ppolicy != NULL) { - DEBUG(9,("Found ppolicy data, " - "assuming LDAP password policies are active.\n")); + DEBUG(9,"Found ppolicy data, " + "assuming LDAP password policies are active.\n"); state->pw_expire_type = PWEXPIRE_LDAP_PASSWORD_POLICY; state->pw_expire_data = ppolicy; } @@ -894,7 +894,7 @@ void sdap_pam_chpass_handler(struct be_req *breq) pd = talloc_get_type(be_req_get_data(breq), struct pam_data); if (be_is_offline(ctx->be)) { - DEBUG(4, ("Backend is marked offline, retry later!\n")); + DEBUG(4, "Backend is marked offline, retry later!\n"); pd->pam_status = PAM_AUTHINFO_UNAVAIL; dp_err = DP_ERR_OFFLINE; goto done; @@ -902,18 +902,18 @@ void sdap_pam_chpass_handler(struct be_req *breq) if ((pd->priv == 1) && (pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) && (sss_authtok_get_type(pd->authtok) != SSS_AUTHTOK_TYPE_PASSWORD)) { - DEBUG(4, ("Password reset by root is not supported.\n")); + DEBUG(4, "Password reset by root is not supported.\n"); pd->pam_status = PAM_PERM_DENIED; dp_err = DP_ERR_OK; goto done; } - DEBUG(2, ("starting password change request for user [%s].\n", pd->user)); + DEBUG(2, "starting password change request for user [%s].\n", pd->user); pd->pam_status = PAM_SYSTEM_ERR; if (pd->cmd != SSS_PAM_CHAUTHTOK && pd->cmd != SSS_PAM_CHAUTHTOK_PRELIM) { - DEBUG(2, ("chpass target was called by wrong pam command.\n")); + DEBUG(2, "chpass target was called by wrong pam command.\n"); goto done; } @@ -955,8 +955,8 @@ static void sdap_auth4chpass_done(struct tevent_req *req) talloc_zfree(req); if ((ret == EOK || ret == ERR_PASSWORD_EXPIRED) && state->pd->cmd == SSS_PAM_CHAUTHTOK_PRELIM) { - DEBUG(9, ("Initial authentication for change password operation " - "successful.\n")); + DEBUG(9, "Initial authentication for change password operation " + "successful.\n"); state->pd->pam_status = PAM_SUCCESS; dp_err = DP_ERR_OK; goto done; @@ -972,8 +972,8 @@ static void sdap_auth4chpass_done(struct tevent_req *req) be_ctx->domain->pwd_expiration_warning); if (ret == ERR_PASSWORD_EXPIRED) { - DEBUG(1, ("LDAP provider cannot change kerberos " - "passwords.\n")); + DEBUG(1, "LDAP provider cannot change kerberos " + "passwords.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -982,7 +982,7 @@ static void sdap_auth4chpass_done(struct tevent_req *req) case PWEXPIRE_NONE: break; default: - DEBUG(1, ("Unknow pasword expiration type.\n")); + DEBUG(1, "Unknow pasword expiration type.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -991,10 +991,10 @@ static void sdap_auth4chpass_done(struct tevent_req *req) switch (ret) { case EOK: case ERR_PASSWORD_EXPIRED: - DEBUG(7, ("user [%s] successfully authenticated.\n", state->dn)); + DEBUG(7, "user [%s] successfully authenticated.\n", state->dn); if (pw_expire_type == PWEXPIRE_SHADOW) { /* TODO: implement async ldap modify request */ - DEBUG(1, ("Changing shadow password attributes not implemented.\n")); + DEBUG(1, "Changing shadow password attributes not implemented.\n"); state->pd->pam_status = PAM_MODULE_UNKNOWN; goto done; } else { @@ -1018,7 +1018,7 @@ static void sdap_auth4chpass_done(struct tevent_req *req) state->sh, state->dn, password, new_password); if (!subreq) { - DEBUG(2, ("Failed to change password for %s\n", state->username)); + DEBUG(2, "Failed to change password for %s\n", state->username); goto done; } tevent_req_set_callback(subreq, sdap_pam_chpass_done, state); @@ -1032,12 +1032,12 @@ static void sdap_auth4chpass_done(struct tevent_req *req) &msg_len, &msg); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("pack_user_info_chpass_error failed.\n")); + "pack_user_info_chpass_error failed.\n"); } else { 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"); } } @@ -1092,12 +1092,12 @@ static void sdap_pam_chpass_done(struct tevent_req *req) ret = pack_user_info_chpass_error(state->pd, user_error_message, &msg_len, &msg); if (ret != EOK) { - DEBUG(1, ("pack_user_info_chpass_error failed.\n")); + DEBUG(1, "pack_user_info_chpass_error failed.\n"); } else { ret = pam_add_response(state->pd, SSS_PAM_USER_INFO, msg_len, msg); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } } } @@ -1166,7 +1166,7 @@ void sdap_pam_auth_handler(struct be_req *breq) pd = talloc_get_type(be_req_get_data(breq), struct pam_data); if (be_is_offline(ctx->be)) { - DEBUG(4, ("Backend is marked offline, retry later!\n")); + DEBUG(4, "Backend is marked offline, retry later!\n"); pd->pam_status = PAM_AUTHINFO_UNAVAIL; dp_err = DP_ERR_OFFLINE; goto done; @@ -1231,7 +1231,7 @@ static void sdap_pam_auth_done(struct tevent_req *req) case PWEXPIRE_SHADOW: ret = check_pwexpire_shadow(pw_expire_data, time(NULL), state->pd); if (ret != EOK) { - DEBUG(1, ("check_pwexpire_shadow failed.\n")); + DEBUG(1, "check_pwexpire_shadow failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -1241,7 +1241,7 @@ static void sdap_pam_auth_done(struct tevent_req *req) state->pd, be_ctx->domain->pwd_expiration_warning); if (ret != EOK) { - DEBUG(1, ("check_pwexpire_kerberos failed.\n")); + DEBUG(1, "check_pwexpire_kerberos failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -1250,7 +1250,7 @@ static void sdap_pam_auth_done(struct tevent_req *req) ret = check_pwexpire_ldap(state->pd, pw_expire_data, be_ctx->domain->pwd_expiration_warning); if (ret != EOK) { - DEBUG(1, ("check_pwexpire_ldap failed.\n")); + DEBUG(1, "check_pwexpire_ldap failed.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -1258,7 +1258,7 @@ static void sdap_pam_auth_done(struct tevent_req *req) case PWEXPIRE_NONE: break; default: - DEBUG(1, ("Unknow pasword expiration type.\n")); + DEBUG(1, "Unknow pasword expiration type.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; goto done; } @@ -1305,11 +1305,11 @@ static void sdap_pam_auth_done(struct tevent_req *req) /* password caching failures are not fatal errors */ if (ret != EOK) { - DEBUG(2, ("Failed to cache password for %s\n", - state->pd->user)); + DEBUG(2, "Failed to cache password for %s\n", + state->pd->user); } else { - DEBUG(4, ("Password successfully cached for %s\n", - state->pd->user)); + DEBUG(4, "Password successfully cached for %s\n", + state->pd->user); } } diff --git a/src/providers/ldap/ldap_child.c b/src/providers/ldap/ldap_child.c index 19c838dac..7c60c0f73 100644 --- a/src/providers/ldap/ldap_child.c +++ b/src/providers/ldap/ldap_child.c @@ -57,16 +57,16 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, size_t p = 0; uint32_t len; - DEBUG(SSSDBG_TRACE_LIBS, ("total buffer size: %zu\n", size)); + DEBUG(SSSDBG_TRACE_LIBS, "total buffer size: %zu\n", size); /* realm_str size and length */ SAFEALIGN_COPY_UINT32_CHECK(&len, buf + p, size, &p); - DEBUG(SSSDBG_TRACE_LIBS, ("realm_str size: %d\n", len)); + DEBUG(SSSDBG_TRACE_LIBS, "realm_str size: %d\n", len); if (len) { if ((p + len ) > size) return EINVAL; ibuf->realm_str = talloc_strndup(ibuf, (char *)(buf + p), len); - DEBUG(SSSDBG_TRACE_LIBS, ("got realm_str: %s\n", ibuf->realm_str)); + DEBUG(SSSDBG_TRACE_LIBS, "got realm_str: %s\n", ibuf->realm_str); if (ibuf->realm_str == NULL) return ENOMEM; p += len; } @@ -74,11 +74,11 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, /* princ_str size and length */ SAFEALIGN_COPY_UINT32_CHECK(&len, buf + p, size, &p); - DEBUG(SSSDBG_TRACE_LIBS, ("princ_str size: %d\n", len)); + DEBUG(SSSDBG_TRACE_LIBS, "princ_str size: %d\n", len); if (len) { if ((p + len ) > size) return EINVAL; ibuf->princ_str = talloc_strndup(ibuf, (char *)(buf + p), len); - DEBUG(SSSDBG_TRACE_LIBS, ("got princ_str: %s\n", ibuf->princ_str)); + DEBUG(SSSDBG_TRACE_LIBS, "got princ_str: %s\n", ibuf->princ_str); if (ibuf->princ_str == NULL) return ENOMEM; p += len; } @@ -86,18 +86,18 @@ static errno_t unpack_buffer(uint8_t *buf, size_t size, /* keytab_name size and length */ SAFEALIGN_COPY_UINT32_CHECK(&len, buf + p, size, &p); - DEBUG(SSSDBG_TRACE_LIBS, ("keytab_name size: %d\n", len)); + DEBUG(SSSDBG_TRACE_LIBS, "keytab_name size: %d\n", len); if (len) { if ((p + len ) > size) return EINVAL; ibuf->keytab_name = talloc_strndup(ibuf, (char *)(buf + p), len); - DEBUG(SSSDBG_TRACE_LIBS, ("got keytab_name: %s\n", ibuf->keytab_name)); + DEBUG(SSSDBG_TRACE_LIBS, "got keytab_name: %s\n", ibuf->keytab_name); if (ibuf->keytab_name == NULL) return ENOMEM; p += len; } /* ticket lifetime */ SAFEALIGN_COPY_INT32_CHECK(&ibuf->lifetime, buf + p, size, &p); - DEBUG(SSSDBG_TRACE_LIBS, ("lifetime: %d\n", ibuf->lifetime)); + DEBUG(SSSDBG_TRACE_LIBS, "lifetime: %d\n", ibuf->lifetime); return EOK; } @@ -112,7 +112,7 @@ static int pack_buffer(struct response *r, int result, krb5_error_code krberr, r->size = 2 * sizeof(uint32_t) + sizeof(krb5_error_code) + len + sizeof(time_t); - DEBUG(SSSDBG_TRACE_INTERNAL, ("response size: %zu\n",r->size)); + DEBUG(SSSDBG_TRACE_INTERNAL, "response size: %zu\n",r->size); r->buf = talloc_array(r, uint8_t, r->size); if(!r->buf) { @@ -120,8 +120,8 @@ static int pack_buffer(struct response *r, int result, krb5_error_code krberr, } DEBUG(SSSDBG_TRACE_LIBS, - ("result [%d] krberr [%d] msgsize [%d] msg [%s]\n", - result, krberr, len, msg)); + "result [%d] krberr [%d] msgsize [%d] msg [%s]\n", + result, krberr, len, msg); /* result */ SAFEALIGN_SET_UINT32(&r->buf[p], result, &p); @@ -187,21 +187,21 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, krberr = krb5_init_context(&context); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to init kerberos context\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to init kerberos context\n"); return krberr; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Kerberos context initialized\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Kerberos context initialized\n"); krberr = set_child_debugging(context); if (krberr != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Cannot set krb5_child debugging\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Cannot set krb5_child debugging\n"); } if (!realm_str) { krberr = krb5_get_default_realm(context, &default_realm); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get default realm name: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get default realm name: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } @@ -219,7 +219,7 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, } } - DEBUG(SSSDBG_TRACE_INTERNAL, ("got realm_name: [%s]\n", realm_name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "got realm_name: [%s]\n", realm_name); if (princ_str) { if (!strchr(princ_str, '@')) { @@ -238,7 +238,7 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, } hostname[511] = '\0'; - DEBUG(SSSDBG_TRACE_LIBS, ("got hostname: [%s]\n", hostname)); + DEBUG(SSSDBG_TRACE_LIBS, "got hostname: [%s]\n", hostname); ret = select_principal_from_keytab(memctx, hostname, realm_name, keytab_name, &full_princ, NULL, NULL); @@ -251,12 +251,12 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, krberr = KRB5KRB_ERR_GENERIC; goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Principal name is: [%s]\n", full_princ)); + DEBUG(SSSDBG_CONF_SETTINGS, "Principal name is: [%s]\n", full_princ); krberr = krb5_parse_name(context, full_princ, &kprinc); if (krberr) { - DEBUG(2, ("Unable to build principal: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(2, "Unable to build principal: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } @@ -265,12 +265,12 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, } else { krberr = krb5_kt_default(context, &keytab); } - DEBUG(SSSDBG_CONF_SETTINGS, ("Using keytab [%s]\n", KEYTAB_CLEAN_NAME)); + DEBUG(SSSDBG_CONF_SETTINGS, "Using keytab [%s]\n", KEYTAB_CLEAN_NAME); if (krberr) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to read keytab file [%s]: %s\n", + "Failed to read keytab file [%s]: %s\n", KEYTAB_CLEAN_NAME, - sss_krb5_get_error_message(context, krberr))); + sss_krb5_get_error_message(context, krberr)); goto done; } @@ -278,7 +278,7 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, ret = sss_krb5_verify_keytab_ex(full_princ, keytab_name, context, keytab); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("Unable to verify principal is present in the keytab\n")); + "Unable to verify principal is present in the keytab\n"); krberr = KRB5_KT_IOERR; goto done; } @@ -288,12 +288,12 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, krberr = KRB5KRB_ERR_GENERIC; goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("keytab ccname: [%s]\n", ccname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "keytab ccname: [%s]\n", ccname); krberr = krb5_cc_resolve(context, ccname, &ccache); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to set cache name: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to set cache name: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } @@ -307,7 +307,7 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, tmp_str = getenv("KRB5_CANONICALIZE"); if (tmp_str != NULL && strcasecmp(tmp_str, "true") == 0) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Will canonicalize principals\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "Will canonicalize principals\n"); canonicalize = 1; } sss_krb5_get_init_creds_opt_set_canonicalize(&options, canonicalize); @@ -316,8 +316,8 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, keytab, 0, NULL, &options); if (krberr) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Failed to init credentials: %s\n", - sss_krb5_get_error_message(context, krberr))); + "Failed to init credentials: %s\n", + sss_krb5_get_error_message(context, krberr)); sss_log(SSS_LOG_ERR, "Failed to initialize credentials using keytab [%s]: %s. " "Unable to create GSSAPI-encrypted LDAP connection.", @@ -325,37 +325,37 @@ static krb5_error_code ldap_child_get_tgt_sync(TALLOC_CTX *memctx, sss_krb5_get_error_message(context, krberr)); goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("credentials initialized\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "credentials initialized\n"); /* Use updated principal if changed due to canonicalization. */ krberr = krb5_cc_initialize(context, ccache, my_creds.client); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to init ccache: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to init ccache: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } krberr = krb5_cc_store_cred(context, ccache, &my_creds); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to store creds: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to store creds: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("credentials stored\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "credentials stored\n"); #ifdef HAVE_KRB5_GET_TIME_OFFSETS krberr = krb5_get_time_offsets(context, &kdc_time_offset, &kdc_time_offset_usec); if (krberr) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get KDC time offset: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get KDC time offset: %s\n", + sss_krb5_get_error_message(context, krberr)); kdc_time_offset = 0; } else { if (kdc_time_offset_usec > 0) { kdc_time_offset++; } } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Got KDC time offset\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Got KDC time offset\n"); #else /* If we don't have this function, just assume no offset */ kdc_time_offset = 0; @@ -388,7 +388,7 @@ static int prepare_response(TALLOC_CTX *mem_ctx, r->buf = NULL; r->size = 0; - DEBUG(SSSDBG_TRACE_FUNC, ("Building response for result [%d]\n", kerr)); + DEBUG(SSSDBG_TRACE_FUNC, "Building response for result [%d]\n", kerr); if (kerr == 0) { ret = pack_buffer(r, EOK, kerr, ccname, expire_time); @@ -396,7 +396,7 @@ static int prepare_response(TALLOC_CTX *mem_ctx, krb5_msg = sss_krb5_get_error_message(krb5_error_ctx, kerr); if (krb5_msg == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sss_krb5_get_error_message failed.\n")); + "sss_krb5_get_error_message failed.\n"); return ENOMEM; } @@ -405,7 +405,7 @@ static int prepare_response(TALLOC_CTX *mem_ctx, } if (ret != EOK) { - DEBUG(1, ("pack_buffer failed\n")); + DEBUG(1, "pack_buffer failed\n"); return ret; } @@ -462,22 +462,22 @@ int main(int argc, const char *argv[]) debug_prg_name = talloc_asprintf(NULL, "[sssd[ldap_child[%d]]]", getpid()); if (!debug_prg_name) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_asprintf failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_asprintf failed.\n"); goto fail; } if (debug_fd != -1) { ret = set_debug_file_from_fd(debug_fd); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("set_debug_file_from_fd failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "set_debug_file_from_fd failed.\n"); } } - DEBUG(SSSDBG_TRACE_FUNC, ("ldap_child started.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "ldap_child started.\n"); main_ctx = talloc_new(NULL); if (main_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_new failed.\n"); talloc_free(discard_const(debug_prg_name)); goto fail; } @@ -485,23 +485,23 @@ int main(int argc, const char *argv[]) buf = talloc_size(main_ctx, sizeof(uint8_t)*IN_BUF_SIZE); if (buf == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); goto fail; } ibuf = talloc_zero(main_ctx, struct input_buffer); if (ibuf == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); goto fail; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("context initialized\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "context initialized\n"); errno = 0; len = sss_atomic_read_s(STDIN_FILENO, buf, IN_BUF_SIZE); if (len == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("read failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "read failed [%d][%s].\n", ret, strerror(ret)); goto fail; } @@ -509,24 +509,24 @@ int main(int argc, const char *argv[]) ret = unpack_buffer(buf, len, ibuf); if (ret != EOK) { - DEBUG(1, ("unpack_buffer failed.[%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "unpack_buffer failed.[%d][%s].\n", ret, strerror(ret)); goto fail; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("getting TGT sync\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "getting TGT sync\n"); kerr = ldap_child_get_tgt_sync(main_ctx, ibuf->realm_str, ibuf->princ_str, ibuf->keytab_name, ibuf->lifetime, &ccname, &expire_time); if (kerr != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ldap_child_get_tgt_sync failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ldap_child_get_tgt_sync failed.\n"); /* Do not return, must report failure */ } ret = prepare_response(main_ctx, ccname, expire_time, kerr, &resp); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("prepare_response failed. [%d][%s].\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "prepare_response failed. [%d][%s].\n", + ret, strerror(ret)); goto fail; } @@ -534,24 +534,24 @@ int main(int argc, const char *argv[]) written = sss_atomic_write_s(STDOUT_FILENO, resp->buf, resp->size); if (written == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("write failed [%d][%s].\n", ret, - strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "write failed [%d][%s].\n", ret, + strerror(ret)); goto fail; } if (written != resp->size) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Expected to write %zu bytes, wrote %zu\n", - resp->size, written)); + DEBUG(SSSDBG_CRIT_FAILURE, "Expected to write %zu bytes, wrote %zu\n", + resp->size, written); goto fail; } - DEBUG(SSSDBG_TRACE_FUNC, ("ldap_child completed successfully\n")); + DEBUG(SSSDBG_TRACE_FUNC, "ldap_child completed successfully\n"); close(STDOUT_FILENO); talloc_free(main_ctx); _exit(0); fail: - DEBUG(SSSDBG_CRIT_FAILURE, ("ldap_child failed!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ldap_child failed!\n"); close(STDOUT_FILENO); talloc_free(main_ctx); _exit(-1); diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index e799c783c..6739cacae 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -123,8 +123,8 @@ sdap_domain_add(struct sdap_options *opts, ret = domain_to_basedn(sdom, sdom->dom->name, &sdom->basedn); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot convert domain name [%s] to base DN [%d]: %s\n", - dom->name, ret, strerror(ret))); + "Cannot convert domain name [%s] to base DN [%d]: %s\n", + dom->name, ret, strerror(ret)); goto done; } @@ -163,14 +163,14 @@ sdap_domain_subdom_add(struct sdap_id_ctx *sdap_id_ctx, if (sditer == NULL) { /* New sdap domain */ - DEBUG(SSSDBG_TRACE_FUNC, ("subdomain %s is a new one, will " - "create a new sdap domain object\n", dom->name)); + DEBUG(SSSDBG_TRACE_FUNC, "subdomain %s is a new one, will " + "create a new sdap domain object\n", dom->name); ret = sdap_domain_add(sdap_id_ctx->opts, dom, &sdom); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot add new sdap domain for domain %s [%d]: %s\n", - parent->name, ret, strerror(ret))); + "Cannot add new sdap domain for domain %s [%d]: %s\n", + parent->name, ret, strerror(ret)); return ret; } } else { @@ -188,7 +188,7 @@ sdap_domain_subdom_add(struct sdap_id_ctx *sdap_id_ctx, ret = sdap_create_search_base(sdom, sdom->basedn, LDAP_SCOPE_SUBTREE, NULL, &sdom->search_bases[0]); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot create new sdap search base\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot create new sdap search base\n"); return ret; } @@ -272,15 +272,15 @@ int ldap_get_options(TALLOC_CTX *memctx, if (ret != EOK) { goto done; } - DEBUG(6, ("Option %s set to %s\n", + DEBUG(6, "Option %s set to %s\n", opts->basic[search_base_options[o]].opt_name, dp_opt_get_string(opts->basic, - search_base_options[o]))); + search_base_options[o])); } } } else { - DEBUG(5, ("Search base not set, trying to discover it later when " - "connecting to the LDAP server.\n")); + DEBUG(5, "Search base not set, trying to discover it later when " + "connecting to the LDAP server.\n"); } /* Default search */ @@ -315,14 +315,14 @@ int ldap_get_options(TALLOC_CTX *memctx, pwd_policy = dp_opt_get_string(opts->basic, SDAP_PWD_POLICY); if (pwd_policy == NULL) { - DEBUG(1, ("Missing password policy, this may not happen.\n")); + DEBUG(1, "Missing password policy, this may not happen.\n"); ret = EINVAL; goto done; } if (strcasecmp(pwd_policy, PWD_POL_OPT_NONE) != 0 && strcasecmp(pwd_policy, PWD_POL_OPT_SHADOW) != 0 && strcasecmp(pwd_policy, PWD_POL_OPT_MIT) != 0) { - DEBUG(1, ("Unsupported password policy [%s].\n", pwd_policy)); + DEBUG(1, "Unsupported password policy [%s].\n", pwd_policy); ret = EINVAL; goto done; } @@ -332,8 +332,8 @@ int ldap_get_options(TALLOC_CTX *memctx, CONFDB_PAM_CRED_TIMEOUT, 0, &offline_credentials_expiration); if (ret != EOK) { - DEBUG(1, ("Cannot get value of %s from confdb \n", - CONFDB_PAM_CRED_TIMEOUT)); + DEBUG(1, "Cannot get value of %s from confdb \n", + CONFDB_PAM_CRED_TIMEOUT); goto done; } @@ -349,22 +349,22 @@ int ldap_get_options(TALLOC_CTX *memctx, * entries must not be purged from cache. */ if (!offline_credentials_expiration && account_cache_expiration) { - DEBUG(1, ("Conflicting values for options %s (unlimited) " + DEBUG(1, "Conflicting values for options %s (unlimited) " "and %s (%d)\n", opts->basic[SDAP_ACCOUNT_CACHE_EXPIRATION].opt_name, CONFDB_PAM_CRED_TIMEOUT, - offline_credentials_expiration)); + offline_credentials_expiration); ret = EINVAL; goto done; } if (offline_credentials_expiration && account_cache_expiration && offline_credentials_expiration > account_cache_expiration) { - DEBUG(1, ("Value of %s (now %d) must be larger " + DEBUG(1, "Value of %s (now %d) must be larger " "than value of %s (now %d)\n", opts->basic[SDAP_ACCOUNT_CACHE_EXPIRATION].opt_name, account_cache_expiration, CONFDB_PAM_CRED_TIMEOUT, - offline_credentials_expiration)); + offline_credentials_expiration); ret = EINVAL; goto done; } @@ -373,7 +373,7 @@ int ldap_get_options(TALLOC_CTX *memctx, if (ldap_deref != NULL) { ret = deref_string_to_val(ldap_deref, &ldap_deref_val); if (ret != EOK) { - DEBUG(1, ("Failed to verify ldap_deref option.\n")); + DEBUG(1, "Failed to verify ldap_deref option.\n"); goto done; } } @@ -383,8 +383,8 @@ int ldap_get_options(TALLOC_CTX *memctx, ldap_referrals = dp_opt_get_bool(opts->basic, SDAP_REFERRALS); if (ldap_referrals) { - DEBUG(1, ("LDAP referrals are not supported, because the LDAP library " - "is too old, see sssd-ldap(5) for details.\n")); + DEBUG(1, "LDAP referrals are not supported, because the LDAP library " + "is too old, see sssd-ldap(5) for details.\n"); ret = dp_opt_set_bool(opts->basic, SDAP_REFERRALS, false); } #endif @@ -423,7 +423,7 @@ int ldap_get_options(TALLOC_CTX *memctx, default_netgroup_map = netgroup_map; default_service_map = service_map; } else { - DEBUG(0, ("Unrecognized schema type: %s\n", schema)); + DEBUG(0, "Unrecognized schema type: %s\n", schema); ret = EINVAL; goto done; } @@ -472,27 +472,27 @@ int ldap_get_options(TALLOC_CTX *memctx, /* FIXME - this can be removed in a future version */ ret = krb5_try_kdcip(cdb, conf_path, opts->basic, SDAP_KRB5_KDC); if (ret != EOK) { - DEBUG(1, ("sss_krb5_try_kdcip failed.\n")); + DEBUG(1, "sss_krb5_try_kdcip failed.\n"); goto done; } authtok_type = dp_opt_get_string(opts->basic, SDAP_DEFAULT_AUTHTOK_TYPE); if (authtok_type != NULL && strcasecmp(authtok_type,"obfuscated_password") == 0) { - DEBUG(9, ("Found obfuscated password, " - "trying to convert to cleartext.\n")); + DEBUG(9, "Found obfuscated password, " + "trying to convert to cleartext.\n"); authtok_blob = dp_opt_get_blob(opts->basic, SDAP_DEFAULT_AUTHTOK); if (authtok_blob.data == NULL || authtok_blob.length == 0) { - DEBUG(1, ("Missing obfuscated password string.\n")); + DEBUG(1, "Missing obfuscated password string.\n"); return EINVAL; } ret = sss_password_decrypt(memctx, (char *) authtok_blob.data, &cleartext); if (ret != EOK) { - DEBUG(1, ("Cannot convert the obfuscated " - "password back to cleartext\n")); + DEBUG(1, "Cannot convert the obfuscated " + "password back to cleartext\n"); return ret; } @@ -501,14 +501,14 @@ int ldap_get_options(TALLOC_CTX *memctx, ret = dp_opt_set_blob(opts->basic, SDAP_DEFAULT_AUTHTOK, authtok_blob); talloc_free(cleartext); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed.\n")); + DEBUG(1, "dp_opt_set_string failed.\n"); return ret; } ret = dp_opt_set_string(opts->basic, SDAP_DEFAULT_AUTHTOK_TYPE, "password"); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed.\n")); + DEBUG(1, "dp_opt_set_string failed.\n"); return ret; } } @@ -542,25 +542,25 @@ int ldap_get_sudo_options(TALLOC_CTX *memctx, ret = dp_opt_set_string(opts->basic, SDAP_SUDO_SEARCH_BASE, search_base); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set SUDO search base" - "to default value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not set SUDO search base" + "to default value\n"); return ret; } - DEBUG(SSSDBG_FUNC_DATA, ("Option %s set to %s\n", + DEBUG(SSSDBG_FUNC_DATA, "Option %s set to %s\n", opts->basic[SDAP_SUDO_SEARCH_BASE].opt_name, - dp_opt_get_string(opts->basic, SDAP_SUDO_SEARCH_BASE))); + dp_opt_get_string(opts->basic, SDAP_SUDO_SEARCH_BASE)); } } else { - DEBUG(SSSDBG_TRACE_FUNC, ("Search base not set, trying to discover it later " - "connecting to the LDAP server.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Search base not set, trying to discover it later " + "connecting to the LDAP server.\n"); } ret = sdap_parse_search_base(opts, opts->basic, SDAP_SUDO_SEARCH_BASE, &opts->sdom->sudo_search_bases); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not parse SUDO search base\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not parse SUDO search base\n"); return ret; } @@ -570,7 +570,7 @@ int ldap_get_sudo_options(TALLOC_CTX *memctx, SDAP_OPTS_SUDO, &opts->sudorule_map); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get SUDO attribute map\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not get SUDO attribute map\n"); return ret; } @@ -600,25 +600,25 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx, ret = dp_opt_set_string(opts->basic, SDAP_AUTOFS_SEARCH_BASE, search_base); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set autofs search base" - "to default value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not set autofs search base" + "to default value\n"); return ret; } - DEBUG(SSSDBG_FUNC_DATA, ("Option %s set to %s\n", + DEBUG(SSSDBG_FUNC_DATA, "Option %s set to %s\n", opts->basic[SDAP_AUTOFS_SEARCH_BASE].opt_name, - dp_opt_get_string(opts->basic, SDAP_AUTOFS_SEARCH_BASE))); + dp_opt_get_string(opts->basic, SDAP_AUTOFS_SEARCH_BASE)); } } else { - DEBUG(SSSDBG_TRACE_FUNC, ("Search base not set, trying to discover it later " - "connecting to the LDAP server.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Search base not set, trying to discover it later " + "connecting to the LDAP server.\n"); } ret = sdap_parse_search_base(opts, opts->basic, SDAP_AUTOFS_SEARCH_BASE, &opts->sdom->autofs_search_bases); if (ret != EOK && ret != ENOENT) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not parse autofs search base\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not parse autofs search base\n"); return ret; } @@ -635,7 +635,7 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx, default_entry_map = rfc2307bis_autofs_entry_map; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown LDAP schema!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown LDAP schema!\n"); return EINVAL; } @@ -645,7 +645,7 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx, &opts->autofs_mobject_map); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not get autofs map object attribute map\n")); + "Could not get autofs map object attribute map\n"); return ret; } @@ -655,7 +655,7 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx, &opts->autofs_entry_map); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not get autofs entry object attribute map\n")); + "Could not get autofs entry object attribute map\n"); return ret; } @@ -698,7 +698,7 @@ errno_t sdap_parse_search_base(TALLOC_CTX *mem_ctx, break; default: DEBUG(SSSDBG_CONF_SETTINGS, - ("Unknown search base type: [%d]\n", class)); + "Unknown search base type: [%d]\n", class); class_name = "UNKNOWN"; /* Non-fatal */ break; @@ -759,8 +759,8 @@ sdap_create_search_base(TALLOC_CTX *mem_ctx, if (!ldb_dn_validate(ldn)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Invalid base DN [%s]\n", - unparsed_base)); + "Invalid base DN [%s]\n", + unparsed_base); ret = EINVAL; goto done; } @@ -816,7 +816,7 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, */ if (count > 1 && (count % 3)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unparseable search base: [%s][%d]\n", unparsed_base, count)); + "Unparseable search base: [%s][%d]\n", unparsed_base, count); ret = EINVAL; goto done; } @@ -832,16 +832,16 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, LDAP_SCOPE_SUBTREE, old_filter, &search_bases[0]); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot create new sdap search base\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot create new sdap search base\n"); goto done; } DEBUG(SSSDBG_CONF_SETTINGS, - ("Search base added: [%s][%s][%s][%s]\n", + "Search base added: [%s][%s][%s][%s]\n", class_name, search_bases[0]->basedn, "SUBTREE", - search_bases[0]->filter ? search_bases[0]->filter : "")); + search_bases[0]->filter ? search_bases[0]->filter : ""); search_bases[1] = NULL; } else { @@ -863,7 +863,7 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, if (split_bases[c][0] == '\0') { DEBUG(SSSDBG_CRIT_FAILURE, - ("Zero-length search base: [%s]\n", unparsed_base)); + "Zero-length search base: [%s]\n", unparsed_base); ret = EINVAL; goto done; } @@ -877,8 +877,8 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, if (!ldb_dn_validate(ldn)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Invalid base DN [%s]\n", - split_bases[c])); + "Invalid base DN [%s]\n", + split_bases[c]); ret = EINVAL; goto done; } @@ -905,7 +905,7 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, search_bases[i]->scope = LDAP_SCOPE_BASE; } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unknown search scope: [%s]\n", split_bases[c+1])); + "Unknown search scope: [%s]\n", split_bases[c+1]); ret = EINVAL; goto done; } @@ -931,7 +931,7 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, tree = ldb_parse_tree(tmp_ctx, filter); if(!tree) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Invalid search filter: [%s]\n", filter)); + "Invalid search filter: [%s]\n", filter); ret = EINVAL; goto done; } @@ -942,11 +942,11 @@ errno_t common_parse_search_base(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_CONF_SETTINGS, - ("Search base added: [%s][%s][%s][%s]\n", + "Search base added: [%s][%s][%s][%s]\n", class_name, search_bases[i]->basedn, split_bases[c+1][0] ? split_bases[c+1] : "SUBTREE", - search_bases[i]->filter ? search_bases[i]->filter : "")); + search_bases[i]->filter ? search_bases[i]->filter : ""); i++; } @@ -991,15 +991,15 @@ int sdap_id_setup_tasks(struct be_ctx *be_ctx, /* set up enumeration task */ if (sdom->dom->enumerate) { - DEBUG(SSSDBG_TRACE_FUNC, ("Setting up enumeration for %s\n", - sdom->dom->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Setting up enumeration for %s\n", + sdom->dom->name); ret = ldap_setup_enumeration(be_ctx, ctx->opts, sdom, send_fn, recv_fn, pvt); } else { /* the enumeration task, runs the cleanup process by itself, * but if enumeration is not running we need to schedule it */ - DEBUG(SSSDBG_TRACE_FUNC, ("Setting up cleanup task for %s\n", - sdom->dom->name)); + DEBUG(SSSDBG_TRACE_FUNC, "Setting up cleanup task for %s\n", + sdom->dom->name); ret = ldap_setup_cleanup(ctx, sdom); } @@ -1018,7 +1018,7 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed\n")); + DEBUG(1, "talloc_new failed\n"); return; } @@ -1032,8 +1032,8 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) srvaddr = fo_get_server_hostent(server); if (!srvaddr) { - DEBUG(1, ("FATAL: No hostent available for server (%s)\n", - fo_get_server_str_name(server))); + DEBUG(1, "FATAL: No hostent available for server (%s)\n", + fo_get_server_str_name(server)); talloc_free(tmp_ctx); return; } @@ -1041,20 +1041,20 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) sockaddr = resolv_get_sockaddr_address(tmp_ctx, srvaddr, fo_get_server_port(server)); if (sockaddr == NULL) { - DEBUG(1, ("resolv_get_sockaddr_address failed.\n")); + DEBUG(1, "resolv_get_sockaddr_address failed.\n"); talloc_free(tmp_ctx); return; } if (fo_is_srv_lookup(server)) { if (!tmp) { - DEBUG(1, ("Unknown service, using ldap\n")); + DEBUG(1, "Unknown service, using ldap\n"); tmp = SSS_LDAP_SRV_NAME; } srv_name = fo_get_server_name(server); if (srv_name == NULL) { - DEBUG(1, ("Could not get server host name\n")); + DEBUG(1, "Could not get server host name\n"); talloc_free(tmp_ctx); return; } @@ -1067,12 +1067,12 @@ static void sdap_uri_callback(void *private_data, struct fo_server *server) } if (!new_uri) { - DEBUG(2, ("Failed to copy URI ...\n")); + DEBUG(2, "Failed to copy URI ...\n"); talloc_free(tmp_ctx); return; } - DEBUG(6, ("Constructed uri '%s'\n", new_uri)); + DEBUG(6, "Constructed uri '%s'\n", new_uri); /* free old one and replace with new one */ talloc_zfree(service->uri); @@ -1094,7 +1094,7 @@ static void sdap_finalize(struct tevent_context *ev, ret = remove_krb5_info_files(se, realm); if (ret != EOK) { - DEBUG(1, ("remove_krb5_info_files failed.\n")); + DEBUG(1, "remove_krb5_info_files failed.\n"); } sig_term(signum); @@ -1111,14 +1111,14 @@ errno_t sdap_install_sigterm_handler(TALLOC_CTX *mem_ctx, sig_realm = talloc_strdup(mem_ctx, realm); if (sig_realm == NULL) { - DEBUG(1, ("talloc_strdup failed!\n")); + DEBUG(1, "talloc_strdup failed!\n"); return ENOMEM; } sige = tevent_add_signal(ev, mem_ctx, SIGTERM, SA_SIGINFO, sdap_finalize, sig_realm); if (sige == NULL) { - DEBUG(1, ("tevent_add_signal failed.\n")); + DEBUG(1, "tevent_add_signal failed.\n"); talloc_free(sig_realm); return ENOMEM; } @@ -1137,21 +1137,21 @@ void sdap_remove_kdcinfo_files_callback(void *pvt) ret = be_fo_run_callbacks_at_next_request(ctx->be_ctx, ctx->kdc_service_name); if (ret != EOK) { - DEBUG(1, ("be_fo_run_callbacks_at_next_request failed, " + DEBUG(1, "be_fo_run_callbacks_at_next_request failed, " "krb5 info files will not be removed, because " - "it is unclear if they will be recreated properly.\n")); + "it is unclear if they will be recreated properly.\n"); return; } tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed, cannot remove krb5 info files.\n")); + DEBUG(1, "talloc_new failed, cannot remove krb5 info files.\n"); return; } ret = remove_krb5_info_files(tmp_ctx, ctx->realm); if (ret != EOK) { - DEBUG(1, ("remove_krb5_info_files failed.\n")); + DEBUG(1, "remove_krb5_info_files failed.\n"); } talloc_zfree(tmp_ctx); @@ -1168,7 +1168,7 @@ errno_t sdap_install_offline_callback(TALLOC_CTX *mem_ctx, ctx = talloc_zero(mem_ctx, struct remove_info_files_ctx); if (ctx == NULL) { - DEBUG(1, ("talloc_zfree failed.\n")); + DEBUG(1, "talloc_zfree failed.\n"); return ENOMEM; } @@ -1176,7 +1176,7 @@ errno_t sdap_install_offline_callback(TALLOC_CTX *mem_ctx, ctx->realm = talloc_strdup(ctx, realm); ctx->kdc_service_name = talloc_strdup(ctx, service_name); if (ctx->realm == NULL || ctx->kdc_service_name == NULL) { - DEBUG(1, ("talloc_strdup failed!\n")); + DEBUG(1, "talloc_strdup failed!\n"); ret = ENOMEM; goto done; } @@ -1185,7 +1185,7 @@ errno_t sdap_install_offline_callback(TALLOC_CTX *mem_ctx, sdap_remove_kdcinfo_files_callback, ctx, NULL); if (ret != EOK) { - DEBUG(1, ("be_add_offline_cb failed.\n")); + DEBUG(1, "be_add_offline_cb failed.\n"); goto done; } @@ -1227,7 +1227,7 @@ sdap_set_sasl_options(struct sdap_options *id_opts, *primary_realm = '\0'; desired_realm = primary_realm+1; DEBUG(SSSDBG_TRACE_INTERNAL, - ("authid contains realm [%s]\n", desired_realm)); + "authid contains realm [%s]\n", desired_realm); } else { desired_realm = dp_opt_get_string(id_opts->basic, SDAP_SASL_REALM); if (!desired_realm) { @@ -1236,9 +1236,9 @@ sdap_set_sasl_options(struct sdap_options *id_opts, } } - DEBUG(SSSDBG_CONF_SETTINGS, ("Will look for %s@%s in %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Will look for %s@%s in %s\n", desired_primary, desired_realm, - keytab_path ? keytab_path : "default keytab")); + keytab_path ? keytab_path : "default keytab"); ret = select_principal_from_keytab(tmp_ctx, desired_primary, desired_realm, @@ -1250,14 +1250,14 @@ sdap_set_sasl_options(struct sdap_options *id_opts, if (primary_requested && strcmp(desired_primary, sasl_primary) != 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Configured SASL auth ID not found in keytab. " - "Requested %s, found %s\n", desired_primary, sasl_primary)); + "Configured SASL auth ID not found in keytab. " + "Requested %s, found %s\n", desired_primary, sasl_primary); } if (realm_requested && strcmp(desired_realm, sasl_realm) != 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Configured SASL realm not found in keytab. " - "Requested %s, found %s\n", desired_realm, sasl_realm)); + "Configured SASL realm not found in keytab. " + "Requested %s, found %s\n", desired_realm, sasl_realm); } ret = dp_opt_set_string(id_opts->basic, @@ -1265,9 +1265,9 @@ sdap_set_sasl_options(struct sdap_options *id_opts, if (ret != EOK) { goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", id_opts->basic[SDAP_SASL_AUTHID].opt_name, - dp_opt_get_string(id_opts->basic, SDAP_SASL_AUTHID))); + dp_opt_get_string(id_opts->basic, SDAP_SASL_AUTHID)); ret = dp_opt_set_string(id_opts->basic, SDAP_SASL_REALM, sasl_realm); @@ -1275,9 +1275,9 @@ sdap_set_sasl_options(struct sdap_options *id_opts, goto done; } - DEBUG(SSSDBG_CONF_SETTINGS, ("Option %s set to %s\n", + DEBUG(SSSDBG_CONF_SETTINGS, "Option %s set to %s\n", id_opts->basic[SDAP_SASL_REALM].opt_name, - dp_opt_get_string(id_opts->basic, SDAP_SASL_REALM))); + dp_opt_get_string(id_opts->basic, SDAP_SASL_REALM)); ret = EOK; done: @@ -1295,25 +1295,25 @@ sdap_gssapi_get_default_realm(TALLOC_CTX *mem_ctx) krberr = krb5_init_context(&context); if (krberr) { - DEBUG(2, ("Failed to init kerberos context\n")); + DEBUG(2, "Failed to init kerberos context\n"); goto done; } krberr = krb5_get_default_realm(context, &krb5_realm); if (krberr) { - DEBUG(2, ("Failed to get default realm name: %s\n", - sss_krb5_get_error_message(context, krberr))); + DEBUG(2, "Failed to get default realm name: %s\n", + sss_krb5_get_error_message(context, krberr)); goto done; } realm = talloc_strdup(mem_ctx, krb5_realm); krb5_free_default_realm(context, krb5_realm); if (!realm) { - DEBUG(0, ("Out of memory\n")); + DEBUG(0, "Out of memory\n"); goto done; } - DEBUG(7, ("Will use default realm %s\n", realm)); + DEBUG(7, "Will use default realm %s\n", realm); done: if (context) krb5_free_context(context); return realm; @@ -1341,10 +1341,10 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, krb5_opt_realm = dp_opt_get_string(opts, SDAP_KRB5_REALM); if (krb5_opt_realm == NULL) { - DEBUG(2, ("Missing krb5_realm option, will use libkrb default\n")); + DEBUG(2, "Missing krb5_realm option, will use libkrb default\n"); krb5_realm = sdap_gssapi_get_default_realm(tmp_ctx); if (krb5_realm == NULL) { - DEBUG(0, ("Cannot determine the Kerberos realm, aborting\n")); + DEBUG(0, "Cannot determine the Kerberos realm, aborting\n"); ret = EIO; goto done; } @@ -1363,20 +1363,20 @@ int sdap_gssapi_init(TALLOC_CTX *mem_ctx, SDAP_KRB5_USE_KDCINFO), &service); if (ret != EOK) { - DEBUG(0, ("Failed to init KRB5 failover service!\n")); + DEBUG(0, "Failed to init KRB5 failover service!\n"); goto done; } ret = sdap_install_sigterm_handler(mem_ctx, bectx->ev, krb5_realm); if (ret != EOK) { - DEBUG(0, ("Failed to install sigterm handler\n")); + DEBUG(0, "Failed to install sigterm handler\n"); goto done; } ret = sdap_install_offline_callback(mem_ctx, bectx, krb5_realm, SSS_KRB5KDC_FO_SRV); if (ret != EOK) { - DEBUG(0, ("Failed to install sigterm handler\n")); + DEBUG(0, "Failed to install sigterm handler\n"); goto done; } @@ -1418,7 +1418,7 @@ static errno_t _sdap_urls_init(struct be_ctx *ctx, /* split server parm into a list */ ret = split_on_separator(tmp_ctx, urls, ',', true, true, &list, NULL); if (ret != EOK) { - DEBUG(1, ("Failed to parse server list!\n")); + DEBUG(1, "Failed to parse server list!\n"); goto done; } @@ -1427,15 +1427,15 @@ static errno_t _sdap_urls_init(struct be_ctx *ctx, 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; } if (!dns_service_name) { - DEBUG(0, ("Missing DNS service name for service [%s].\n", - service_name)); + DEBUG(0, "Missing DNS service name for service [%s].\n", + service_name); ret = EINVAL; goto done; } @@ -1449,29 +1449,29 @@ static errno_t _sdap_urls_init(struct be_ctx *ctx, dns_service_name, NULL, BE_FO_PROTO_TCP, false, srv_user_data); if (ret) { - DEBUG(0, ("Failed to add server\n")); + DEBUG(0, "Failed to add server\n"); goto done; } - DEBUG(6, ("Added service lookup\n")); + DEBUG(6, "Added service lookup\n"); continue; } ret = ldap_url_parse(list[i], &lud); if (ret != LDAP_SUCCESS) { - DEBUG(0, ("Failed to parse ldap URI (%s)!\n", list[i])); + DEBUG(0, "Failed to parse ldap URI (%s)!\n", list[i]); ret = EINVAL; goto done; } if (lud->lud_host == NULL) { - DEBUG(2, ("The LDAP URI (%s) did not contain a host name\n", - list[i])); + DEBUG(2, "The LDAP URI (%s) did not contain a host name\n", + list[i]); ldap_free_urldesc(lud); continue; } - DEBUG(6, ("Added URI %s\n", list[i])); + DEBUG(6, "Added URI %s\n", list[i]); talloc_steal(service, list[i]); @@ -1541,7 +1541,7 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_add_service(ctx, service_name, ldap_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; } @@ -1553,7 +1553,7 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, if (!urls) { DEBUG(SSSDBG_CONF_SETTINGS, - ("No primary servers defined, using service discovery\n")); + "No primary servers defined, using service discovery\n"); urls = BE_SRV_IDENTIFIER; } @@ -1574,7 +1574,7 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, ret = be_fo_service_add_callback(memctx, ctx, service->name, sdap_uri_callback, service); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to add failover callback!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to add failover callback!\n"); goto done; } @@ -1601,19 +1601,19 @@ errno_t string_to_shadowpw_days(const char *s, long *d) errno = 0; l = strtol(s, &endptr, 10); if (errno != 0) { - DEBUG(1, ("strtol failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "strtol failed [%d][%s].\n", errno, strerror(errno)); return errno; } if (*endptr != '\0') { - DEBUG(1, ("Input string [%s] is invalid.\n", s)); + DEBUG(1, "Input string [%s] is invalid.\n", s); return EINVAL; } if (l < -1) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Input string contains not allowed negative value [%ld].\n", - l)); + "Input string contains not allowed negative value [%ld].\n", + l); return EINVAL; } @@ -1818,8 +1818,8 @@ sdap_attrs_get_sid_str(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_el(sysdb_attrs, sid_attr, &el); if (ret != EOK || el->num_values != 1) { DEBUG(SSSDBG_MINOR_FAILURE, - ("No [%s] attribute while id-mapping. [%d][%s]\n", - sid_attr, el->num_values, strerror(ret))); + "No [%s] attribute while id-mapping. [%d][%s]\n", + sid_attr, el->num_values, strerror(ret)); return ENOENT; } @@ -1829,7 +1829,7 @@ sdap_attrs_get_sid_str(TALLOC_CTX *mem_ctx, sid_str = talloc_strndup(mem_ctx, (char *) el->values[0].data, el->values[0].length); if (sid_str == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_strndup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_strndup failed.\n"); return ENOMEM; } } else { @@ -1839,8 +1839,8 @@ sdap_attrs_get_sid_str(TALLOC_CTX *mem_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)); return EIO; } } diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index b948ba9f3..95e20adfe 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -95,7 +95,7 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -133,8 +133,8 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, uid, &sid); if (err == IDMAP_NO_DOMAIN) { DEBUG(SSSDBG_MINOR_FAILURE, - ("[%s] did not match any configured ID mapping domain\n", - name)); + "[%s] did not match any configured ID mapping domain\n", + name); ret = sysdb_delete_user(state->sysdb, state->domain, NULL, uid); @@ -146,8 +146,8 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, goto fail; } else if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Mapping ID [%s] to SID failed: [%s]\n", - name, idmap_error_string(err))); + "Mapping ID [%s] to SID failed: [%s]\n", + name, idmap_error_string(err)); ret = EIO; goto fail; } @@ -181,7 +181,7 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, } if (attr_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Missing search attribute name.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Missing search attribute name.\n"); ret = EINVAL; goto fail; } @@ -210,7 +210,7 @@ struct tevent_req *users_get_send(TALLOC_CTX *memctx, talloc_zfree(clean_name); if (!state->filter) { - DEBUG(2, ("Failed to build the base filter\n")); + DEBUG(2, "Failed to build the base filter\n"); ret = ENOMEM; goto fail; } @@ -551,7 +551,7 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -591,8 +591,8 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, gid, &sid); if (err == IDMAP_NO_DOMAIN) { DEBUG(SSSDBG_MINOR_FAILURE, - ("[%s] did not match any configured ID mapping domain\n", - name)); + "[%s] did not match any configured ID mapping domain\n", + name); ret = sysdb_delete_group(state->sysdb, state->domain, NULL, gid); @@ -604,8 +604,8 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, goto fail; } else if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Mapping ID [%s] to SID failed: [%s]\n", - name, idmap_error_string(err))); + "Mapping ID [%s] to SID failed: [%s]\n", + name, idmap_error_string(err)); ret = EIO; goto fail; } @@ -639,7 +639,7 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, } if (attr_name == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Missing search attribute name.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Missing search attribute name.\n"); ret = EINVAL; goto fail; } @@ -666,7 +666,7 @@ struct tevent_req *groups_get_send(TALLOC_CTX *memctx, talloc_zfree(clean_name); if (!state->filter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto fail; } @@ -960,7 +960,7 @@ static struct tevent_req *groups_by_user_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -1124,7 +1124,7 @@ void sdap_do_online_check(struct be_req *be_req, struct sdap_id_ctx *ctx) check_ctx = talloc_zero(be_req, struct sdap_online_check_ctx); if (!check_ctx) { ret = ENOMEM; - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed\n"); goto fail; } check_ctx->id_ctx = ctx; @@ -1134,7 +1134,7 @@ void sdap_do_online_check(struct be_req *be_req, struct sdap_id_ctx *ctx) be_ctx, ctx->conn->service, false, CON_TLS_DFL, false); if (req == NULL) { - DEBUG(1, ("sdap_cli_connect_send failed.\n")); + DEBUG(1, "sdap_cli_connect_send failed.\n"); ret = EIO; goto fail; } @@ -1197,12 +1197,12 @@ static void sdap_check_online_done(struct tevent_req *req) talloc_free(check_ctx); if (reinit) { - DEBUG(SSSDBG_TRACE_FUNC, ("Server reinitialization detected. " - "Cleaning cache.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Server reinitialization detected. " + "Cleaning cache.\n"); reinit_req = sdap_reinit_cleanup_send(be_req, be_ctx, id_ctx); if (reinit_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to perform reinitialization " - "clean up.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to perform reinitialization " + "clean up.\n"); /* not fatal */ goto done; } @@ -1225,11 +1225,11 @@ static void sdap_check_online_reinit_done(struct tevent_req *req) ret = sdap_reinit_cleanup_recv(req); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to perform reinitialization " - "clean up [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to perform reinitialization " + "clean up [%d]: %s\n", ret, strerror(ret)); /* not fatal */ } else { - DEBUG(SSSDBG_TRACE_FUNC, ("Reinitialization clean up completed\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Reinitialization clean up completed\n"); } sdap_handler_done(be_req, DP_ERR_OK, 0, NULL); @@ -1263,7 +1263,7 @@ void sdap_account_info_handler(struct be_req *breq) ctx = talloc_get_type(be_ctx->bet_info[BET_ID].pvt_bet_data, struct sdap_id_ctx); if (!ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not get sdap ctx\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not get sdap ctx\n"); return sdap_handler_done(breq, DP_ERR_FATAL, EINVAL, "Invalid request data\n"); } @@ -1318,7 +1318,7 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx, /* skip enumerations on demand */ if (ar->filter_type == BE_FILTER_ENUM) { DEBUG(SSSDBG_TRACE_LIBS, - ("Skipping user enumeration on demand\n")); + "Skipping user enumeration on demand\n"); state->err = "Success"; ret = EOK; goto done; @@ -1337,7 +1337,7 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx, /* skip enumerations on demand */ if (ar->filter_type == BE_FILTER_ENUM) { DEBUG(SSSDBG_TRACE_LIBS, - ("Skipping group enumeration on demand\n")); + "Skipping group enumeration on demand\n"); state->err = "Success"; ret = EOK; goto done; @@ -1386,7 +1386,7 @@ sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx, /* skip enumerations on demand */ if (ar->filter_type == BE_FILTER_ENUM) { DEBUG(SSSDBG_TRACE_LIBS, - ("Skipping service enumeration on demand\n")); + "Skipping service enumeration on demand\n"); state->err = "Success"; ret = EOK; goto done; @@ -1581,7 +1581,7 @@ static void sdap_account_info_complete(struct tevent_req *req) error_text = NULL; } else { DEBUG(SSSDBG_CRIT_FAILURE, - ("Bug: dp_error is OK on failed request")); + "Bug: dp_error is OK on failed request"); dp_error = DP_ERR_FATAL; error_text = req_error_text; } @@ -1637,7 +1637,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx, req = tevent_req_create(memctx, &state, struct get_user_and_group_state); if (req == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("tevent_req_create failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "tevent_req_create failed.\n"); return NULL; } @@ -1650,7 +1650,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -1666,7 +1666,7 @@ static struct tevent_req *get_user_and_group_send(TALLOC_CTX *memctx, state->filter_val, state->filter_type, state->attrs_type, state->noexist_delete); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("users_get_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "users_get_send failed.\n"); ret = ENOMEM; goto fail; } @@ -1712,7 +1712,7 @@ static void get_user_and_group_groups_done(struct tevent_req *subreq) state->filter_val, state->filter_type, state->attrs_type, state->noexist_delete); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("groups_get_send failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "groups_get_send failed.\n"); tevent_req_error(req, ENOMEM); return; } @@ -1742,7 +1742,7 @@ static void get_user_and_group_users_done(struct tevent_req *subreq) ret = sysdb_delete_by_sid(state->sysdb, state->domain, state->filter_val); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not delete entry by SID!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not delete entry by SID!\n"); tevent_req_error(req, ret); return; } diff --git a/src/providers/ldap/ldap_id_cleanup.c b/src/providers/ldap/ldap_id_cleanup.c index 36ef6f420..f52cc8619 100644 --- a/src/providers/ldap/ldap_id_cleanup.c +++ b/src/providers/ldap/ldap_id_cleanup.c @@ -90,8 +90,8 @@ errno_t ldap_setup_cleanup(struct sdap_id_ctx *id_ctx, BE_PTASK_OFFLINE_SKIP, ldap_cleanup_task, cleanup_ctx, name, &sdom->cleanup_task); if (ret != EOK) { - DEBUG(SSSDBG_FATAL_FAILURE, ("Unable to initialize cleanup periodic " - "task for %s\n", sdom->dom->name)); + DEBUG(SSSDBG_FATAL_FAILURE, "Unable to initialize cleanup periodic " + "task for %s\n", sdom->dom->name); goto done; } @@ -127,7 +127,7 @@ errno_t ldap_id_cleanup(struct sdap_options *opts, ret = sysdb_transaction_start(sdom->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; @@ -144,7 +144,7 @@ errno_t ldap_id_cleanup(struct sdap_options *opts, ret = sysdb_transaction_commit(sdom->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; @@ -155,7 +155,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(sdom->dom->sysdb); if (tret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -190,8 +190,8 @@ static int cleanup_users(struct sdap_options *opts, } account_cache_expiration = dp_opt_get_int(opts->basic, SDAP_ACCOUNT_CACHE_EXPIRATION); - DEBUG(9, ("Cache expiration is set to %d days\n", - account_cache_expiration)); + DEBUG(9, "Cache expiration is set to %d days\n", + account_cache_expiration); if (account_cache_expiration > 0) { subfilter = talloc_asprintf(tmpctx, @@ -211,7 +211,7 @@ static int cleanup_users(struct sdap_options *opts, SYSDB_LAST_LOGIN); } if (!subfilter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto done; } @@ -225,7 +225,7 @@ static int cleanup_users(struct sdap_options *opts, goto done; } - DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired user entries!\n", count)); + DEBUG(SSSDBG_FUNC_DATA, "Found %zu expired user entries!\n", count); if (count == 0) { ret = EOK; @@ -243,8 +243,8 @@ static int cleanup_users(struct sdap_options *opts, for (i = 0; i < count; i++) { name = ldb_msg_find_attr_as_string(msgs[i], SYSDB_NAME, NULL); if (!name) { - DEBUG(2, ("Entry %s has no Name Attribute ?!?\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(2, "Entry %s has no Name Attribute ?!?\n", + ldb_dn_get_linearized(msgs[i]->dn)); ret = EFAULT; goto done; } @@ -253,8 +253,8 @@ static int cleanup_users(struct sdap_options *opts, ret = cleanup_users_logged_in(uid_table, msgs[i]); if (ret == EOK) { /* If the user is logged in, proceed to the next one */ - DEBUG(5, ("User %s is still logged in or a dummy entry, " - "keeping data\n", name)); + DEBUG(5, "User %s is still logged in or a dummy entry, " + "keeping data\n", name); continue; } else if (ret != ENOENT) { goto done; @@ -262,7 +262,7 @@ static int cleanup_users(struct sdap_options *opts, } /* If not logged in or cannot check the table, delete him */ - DEBUG(9, ("About to delete user %s\n", name)); + DEBUG(9, "About to delete user %s\n", name); ret = sysdb_delete_user(sysdb, dom, name, 0); if (ret) { goto done; @@ -285,8 +285,8 @@ static int cleanup_users_logged_in(hash_table_t *table, uid = ldb_msg_find_attr_as_uint64(msg, SYSDB_UIDNUM, 0); if (!uid) { - DEBUG(SSSDBG_OP_FAILURE, ("Entry %s has no UID Attribute!\n", - ldb_dn_get_linearized(msg->dn))); + DEBUG(SSSDBG_OP_FAILURE, "Entry %s has no UID Attribute!\n", + ldb_dn_get_linearized(msg->dn)); return ENOENT; } @@ -333,7 +333,7 @@ static int cleanup_groups(TALLOC_CTX *memctx, SYSDB_CACHE_EXPIRE, SYSDB_CACHE_EXPIRE, (long)now); if (!subfilter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto done; } @@ -347,7 +347,7 @@ static int cleanup_groups(TALLOC_CTX *memctx, goto done; } - DEBUG(SSSDBG_FUNC_DATA, ("Found %zu expired group entries!\n", count)); + DEBUG(SSSDBG_FUNC_DATA, "Found %zu expired group entries!\n", count); if (count == 0) { ret = EOK; @@ -376,14 +376,14 @@ static int cleanup_groups(TALLOC_CTX *memctx, subfilter = talloc_asprintf(tmpctx, "(%s=%s)", SYSDB_MEMBEROF, dn); } if (!subfilter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto done; } base_dn = sysdb_base_dn(sysdb, tmpctx); if (base_dn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to build base dn\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to build base dn\n"); ret = ENOMEM; goto done; } @@ -396,17 +396,17 @@ static int cleanup_groups(TALLOC_CTX *memctx, name = ldb_msg_find_attr_as_string(msgs[i], SYSDB_NAME, NULL); if (!name) { - DEBUG(2, ("Entry %s has no Name Attribute ?!?\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(2, "Entry %s has no Name Attribute ?!?\n", + ldb_dn_get_linearized(msgs[i]->dn)); ret = EFAULT; goto done; } - DEBUG(8, ("About to delete group %s\n", name)); + DEBUG(8, "About to delete group %s\n", name); ret = sysdb_delete_group(sysdb, domain, name, 0); if (ret) { - DEBUG(2, ("Group delete returned %d (%s)\n", - ret, strerror(ret))); + DEBUG(2, "Group delete returned %d (%s)\n", + ret, strerror(ret)); goto done; } } diff --git a/src/providers/ldap/ldap_id_enum.c b/src/providers/ldap/ldap_id_enum.c index c791496a6..747309d54 100644 --- a/src/providers/ldap/ldap_id_enum.c +++ b/src/providers/ldap/ldap_id_enum.c @@ -80,7 +80,7 @@ errno_t ldap_setup_enumeration(struct be_ctx *be_ctx, ectx, "enumeration", &sdom->enum_task); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Unable to initialize enumeration periodic task\n")); + "Unable to initialize enumeration periodic task\n"); talloc_free(ectx); return ret; } @@ -113,13 +113,13 @@ ldap_enumeration_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct ldap_enumeration_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } 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; } @@ -133,7 +133,7 @@ ldap_enumeration_send(TALLOC_CTX *mem_ctx, /* 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"); ret = EIO; goto fail; } diff --git a/src/providers/ldap/ldap_id_netgroup.c b/src/providers/ldap/ldap_id_netgroup.c index e48a7da6c..1effaa562 100644 --- a/src/providers/ldap/ldap_id_netgroup.c +++ b/src/providers/ldap/ldap_id_netgroup.c @@ -82,7 +82,7 @@ struct tevent_req *ldap_netgroup_get_send(TALLOC_CTX *memctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -102,7 +102,7 @@ struct tevent_req *ldap_netgroup_get_send(TALLOC_CTX *memctx, clean_name, ctx->opts->netgroup_map[SDAP_OC_NETGROUP].name); if (!state->filter) { - DEBUG(2, ("Failed to build filter\n")); + DEBUG(2, "Failed to build filter\n"); ret = ENOMEM; goto fail; } @@ -208,8 +208,8 @@ static void ldap_netgroup_get_done(struct tevent_req *subreq) } if (ret == EOK && state->count > 1) { - DEBUG(1, ("Found more than one netgroup with the name [%s].\n", - state->name)); + DEBUG(1, "Found more than one netgroup with the name [%s].\n", + state->name); tevent_req_error(req, EINVAL); return; } diff --git a/src/providers/ldap/ldap_id_services.c b/src/providers/ldap/ldap_id_services.c index 1f3fd8043..793f3e367 100644 --- a/src/providers/ldap/ldap_id_services.c +++ b/src/providers/ldap/ldap_id_services.c @@ -94,7 +94,7 @@ services_get_send(TALLOC_CTX *mem_ctx, state->op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto error; } @@ -136,13 +136,13 @@ services_get_send(TALLOC_CTX *mem_ctx, talloc_zfree(clean_protocol); if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build the base filter\n")); + "Failed to build the base filter\n"); ret = ENOMEM; goto error; } DEBUG(SSSDBG_TRACE_LIBS, - ("Preparing to search for services with filter [%s]\n", - state->filter)); + "Preparing to search for services with filter [%s]\n", + state->filter); ret = build_attrs_from_map(state, id_ctx->opts->service_map, SDAP_OPTS_SERVICES, NULL, diff --git a/src/providers/ldap/ldap_init.c b/src/providers/ldap/ldap_init.c index cf4ab5598..327c7e123 100644 --- a/src/providers/ldap/ldap_init.c +++ b/src/providers/ldap/ldap_init.c @@ -75,7 +75,7 @@ errno_t check_order_list_for_duplicates(char **list, cmp = strcasecmp(list[c], list[d]); } if (cmp == 0) { - DEBUG(1, ("Duplicate string [%s] found.\n", list[c])); + DEBUG(1, "Duplicate string [%s] found.\n", list[c]); return EINVAL; } } @@ -100,7 +100,7 @@ static int ldap_id_init_internal(struct be_ctx *bectx, /* If we're already set up, just return that */ if(bectx->bet_info[BET_ID].mod_name && strcmp("ldap", bectx->bet_info[BET_ID].mod_name) == 0) { - DEBUG(8, ("Re-using sdap_id_ctx for this provider\n")); + DEBUG(8, "Re-using sdap_id_ctx for this provider\n"); *ops = bectx->bet_info[BET_ID].bet_ops; *pvt_data = bectx->bet_info[BET_ID].pvt_bet_data; return EOK; @@ -115,7 +115,7 @@ static int ldap_id_init_internal(struct be_ctx *bectx, dns_service_name = dp_opt_get_string(opts->basic, SDAP_DNS_SERVICE_NAME); DEBUG(SSSDBG_CONF_SETTINGS, - ("Service name for discovery set to %s\n", dns_service_name)); + "Service name for discovery set to %s\n", dns_service_name); urls = dp_opt_get_string(opts->basic, SDAP_URI); backup_urls = dp_opt_get_string(opts->basic, SDAP_BACKUP_URI); @@ -124,7 +124,7 @@ static int ldap_id_init_internal(struct be_ctx *bectx, dns_service_name, urls, backup_urls, &sdap_service); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to initialize failover service!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to initialize failover service!\n"); goto done; } @@ -142,8 +142,8 @@ static int ldap_id_init_internal(struct be_ctx *bectx, ctx->be, ctx->conn->service, &ctx->krb5_service); if (ret != EOK) { - DEBUG(1, ("sdap_gssapi_init failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "sdap_gssapi_init failed [%d][%s].\n", + ret, strerror(ret)); goto done; } } @@ -151,8 +151,8 @@ static int ldap_id_init_internal(struct be_ctx *bectx, ret = setup_tls_config(ctx->opts->basic); if (ret != EOK) { - DEBUG(1, ("setup_tls_config failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "setup_tls_config failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -162,16 +162,16 @@ static int ldap_id_init_internal(struct be_ctx *bectx, ret = sdap_setup_child(); if (ret != EOK) { - DEBUG(1, ("setup_child failed [%d][%s].\n", - ret, strerror(ret))); + DEBUG(1, "setup_child failed [%d][%s].\n", + ret, strerror(ret)); goto done; } /* setup SRV lookup plugin */ ret = be_fo_set_dns_srv_lookup_plugin(bectx, NULL); 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; } @@ -181,8 +181,8 @@ static int ldap_id_init_internal(struct be_ctx *bectx, sdap_refresh_netgroups_recv, 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 = &sdap_id_ops; @@ -207,16 +207,16 @@ int sssm_ldap_id_init(struct be_ctx *bectx, ret = ldap_id_init_internal(bectx, ops, (void **) &ctx); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("ldap_id_init_internal failed [%d][%s].\n", - ret, strerror(ret))); + "ldap_id_init_internal failed [%d][%s].\n", + ret, strerror(ret)); goto done; } ret = ldap_id_setup_tasks(ctx); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("sdap_id_setup_tasks failed [%d][%s].\n", - ret, strerror(ret))); + "sdap_id_setup_tasks failed [%d][%s].\n", + ret, strerror(ret)); goto done; } @@ -271,7 +271,7 @@ int sssm_ldap_chpass_init(struct be_ctx *bectx, ret = sssm_ldap_auth_init(bectx, ops, &data); if (ret != EOK) { - DEBUG(1, ("sssm_ldap_auth_init failed.\n")); + DEBUG(1, "sssm_ldap_auth_init failed.\n"); goto done; } @@ -280,21 +280,21 @@ int sssm_ldap_chpass_init(struct be_ctx *bectx, dns_service_name = dp_opt_get_string(ctx->opts->basic, SDAP_CHPASS_DNS_SERVICE_NAME); if (dns_service_name) { - DEBUG(7, ("Service name for chpass discovery set to %s\n", - dns_service_name)); + DEBUG(7, "Service name for chpass discovery set to %s\n", + dns_service_name); } urls = dp_opt_get_string(ctx->opts->basic, SDAP_CHPASS_URI); backup_urls = dp_opt_get_string(ctx->opts->basic, SDAP_CHPASS_BACKUP_URI); if (!urls && !backup_urls && !dns_service_name) { - DEBUG(9, ("ldap_chpass_uri and ldap_chpass_dns_service_name not set, " - "using ldap_uri.\n")); + DEBUG(9, "ldap_chpass_uri and ldap_chpass_dns_service_name not set, " + "using ldap_uri.\n"); ctx->chpass_service = NULL; } else { ret = sdap_service_init(ctx, ctx->be, "LDAP_CHPASS", dns_service_name, urls, backup_urls, &ctx->chpass_service); if (ret != EOK) { - DEBUG(1, ("Failed to initialize failover service!\n")); + DEBUG(1, "Failed to initialize failover service!\n"); goto done; } } @@ -332,34 +332,34 @@ int sssm_ldap_access_init(struct be_ctx *bectx, ret = ldap_id_init_internal(bectx, ops, (void **)&access_ctx->id_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("ldap_id_init_internal failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "ldap_id_init_internal failed.\n"); goto done; } order = dp_opt_get_cstring(access_ctx->id_ctx->opts->basic, SDAP_ACCESS_ORDER); if (order == NULL) { - DEBUG(1, ("ldap_access_order not given, using 'filter'.\n")); + DEBUG(1, "ldap_access_order not given, using 'filter'.\n"); order = "filter"; } ret = split_on_separator(access_ctx, order, ',', true, true, &order_list, &order_list_len); if (ret != EOK) { - DEBUG(1, ("split_on_separator failed.\n")); + DEBUG(1, "split_on_separator failed.\n"); goto done; } ret = check_order_list_for_duplicates(order_list, false); if (ret != EOK) { - DEBUG(1, ("check_order_list_for_duplicates failed.\n")); + DEBUG(1, "check_order_list_for_duplicates failed.\n"); goto done; } if (order_list_len > LDAP_ACCESS_LAST) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Currently only [%d] different access rules are supported.\n", - LDAP_ACCESS_LAST)); + "Currently only [%d] different access rules are supported.\n", + LDAP_ACCESS_LAST); ret = EINVAL; goto done; } @@ -374,9 +374,9 @@ int sssm_ldap_access_init(struct be_ctx *bectx, /* It's okay if this is NULL. In that case we will simply act * like the 'deny' provider. */ - DEBUG(0, ("Warning: LDAP access rule 'filter' is set, " + DEBUG(0, "Warning: LDAP access rule 'filter' is set, " "but no ldap_access_filter configured. " - "All domain users will be denied access.\n")); + "All domain users will be denied access.\n"); } else { access_ctx->filter = sdap_get_access_filter(access_ctx, filter); @@ -391,9 +391,9 @@ int sssm_ldap_access_init(struct be_ctx *bectx, dummy = dp_opt_get_cstring(access_ctx->id_ctx->opts->basic, SDAP_ACCOUNT_EXPIRE_POLICY); if (dummy == NULL) { - DEBUG(0, ("Warning: LDAP access rule 'expire' is set, " + DEBUG(0, "Warning: LDAP access rule 'expire' is set, " "but no ldap_account_expire_policy configured. " - "All domain users will be denied access.\n")); + "All domain users will be denied access.\n"); } else { if (strcasecmp(dummy, LDAP_ACCOUNT_EXPIRE_SHADOW) != 0 && strcasecmp(dummy, LDAP_ACCOUNT_EXPIRE_AD) != 0 && @@ -401,8 +401,8 @@ int sssm_ldap_access_init(struct be_ctx *bectx, strcasecmp(dummy, LDAP_ACCOUNT_EXPIRE_RHDS) != 0 && strcasecmp(dummy, LDAP_ACCOUNT_EXPIRE_IPA) != 0 && strcasecmp(dummy, LDAP_ACCOUNT_EXPIRE_389DS) != 0) { - DEBUG(1, ("Unsupported LDAP account expire policy [%s].\n", - dummy)); + DEBUG(1, "Unsupported LDAP account expire policy [%s].\n", + dummy); ret = EINVAL; goto done; } @@ -412,16 +412,16 @@ int sssm_ldap_access_init(struct be_ctx *bectx, } else if (strcasecmp(order_list[c], LDAP_ACCESS_HOST_NAME) == 0) { access_ctx->access_rule[c] = LDAP_ACCESS_HOST; } else { - DEBUG(1, ("Unexpected access rule name [%s].\n", order_list[c])); + DEBUG(1, "Unexpected access rule name [%s].\n", order_list[c]); ret = EINVAL; goto done; } } access_ctx->access_rule[c] = LDAP_ACCESS_EMPTY; if (c == 0) { - DEBUG(0, ("Warning: access_provider=ldap set, " + DEBUG(0, "Warning: access_provider=ldap set, " "but ldap_access_order is empty. " - "All domain users will be denied access.\n")); + "All domain users will be denied access.\n"); } *ops = &sdap_access_ops; @@ -447,21 +447,21 @@ int sssm_ldap_sudo_init(struct be_ctx *be_ctx, ret = ldap_id_init_internal(be_ctx, ops, &data); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot init LDAP ID provider [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot init LDAP ID provider [%d]: %s\n", + ret, strerror(ret)); return ret; } id_ctx = talloc_get_type(data, struct sdap_id_ctx); if (!id_ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No ID provider?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No ID provider?\n"); return EIO; } return sdap_sudo_init(be_ctx, id_ctx, ops, pvt_data); #else - DEBUG(SSSDBG_MINOR_FAILURE, ("Sudo init handler called but SSSD is " - "built without sudo support, ignoring\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Sudo init handler called but SSSD is " + "built without sudo support, ignoring\n"); return EOK; #endif } @@ -477,21 +477,21 @@ int sssm_ldap_autofs_init(struct be_ctx *be_ctx, ret = ldap_id_init_internal(be_ctx, ops, &data); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot init LDAP ID provider [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot init LDAP ID provider [%d]: %s\n", + ret, strerror(ret)); return ret; } id_ctx = talloc_get_type(data, struct sdap_id_ctx); if (!id_ctx) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No ID provider?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No ID provider?\n"); return EIO; } return sdap_autofs_init(be_ctx, id_ctx, ops, pvt_data); #else - DEBUG(SSSDBG_MINOR_FAILURE, ("Autofs init handler called but SSSD is " - "built without autofs support, ignoring\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Autofs init handler called but SSSD is " + "built without autofs support, ignoring\n"); return EOK; #endif } diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c index ddcf199b6..360312437 100644 --- a/src/providers/ldap/sdap.c +++ b/src/providers/ldap/sdap.c @@ -59,9 +59,9 @@ int sdap_copy_map(TALLOC_CTX *memctx, map[i].name = NULL; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has%s value %s\n", + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has%s value %s\n", map[i].opt_name, map[i].name ? "" : " no", - map[i].name ? map[i].name : "")); + map[i].name ? map[i].name : ""); } *_map = map; @@ -96,7 +96,7 @@ int sdap_get_map(TALLOC_CTX *memctx, &name); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for %s\n", map[i].opt_name)); + "Failed to retrieve value for %s\n", map[i].opt_name); talloc_zfree(map); return EINVAL; } @@ -105,7 +105,7 @@ int sdap_get_map(TALLOC_CTX *memctx, ret = sss_filter_sanitize(map, name, &map[i].name); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not sanitize attribute [%s]\n", name)); + "Could not sanitize attribute [%s]\n", name); talloc_zfree(map); return EINVAL; } @@ -116,14 +116,14 @@ int sdap_get_map(TALLOC_CTX *memctx, if (map[i].def_name && !map[i].name) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to retrieve value for %s\n", map[i].opt_name)); + "Failed to retrieve value for %s\n", map[i].opt_name); talloc_zfree(map); return EINVAL; } - DEBUG(SSSDBG_TRACE_FUNC, ("Option %s has%s value %s\n", + DEBUG(SSSDBG_TRACE_FUNC, "Option %s has%s value %s\n", map[i].opt_name, map[i].name ? "" : " no", - map[i].name ? map[i].name : "")); + map[i].name ? map[i].name : ""); } *_map = map; @@ -157,8 +157,8 @@ int sdap_parse_entry(TALLOC_CTX *memctx, lerrno = 0; ret = ldap_set_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed [%s], ignored.\n", - sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed [%s], ignored.\n", + sss_ldap_err2string(ret)); } attrs = sysdb_new_attrs(tmp_ctx); @@ -170,13 +170,13 @@ int sdap_parse_entry(TALLOC_CTX *memctx, str = ldap_get_dn(sh->ldap, sm->msg); if (!str) { ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); - DEBUG(1, ("ldap_get_dn failed: %d(%s)\n", - lerrno, sss_ldap_err2string(lerrno))); + DEBUG(1, "ldap_get_dn failed: %d(%s)\n", + lerrno, sss_ldap_err2string(lerrno)); ret = EIO; goto done; } - DEBUG(9, ("OriginalDN: [%s].\n", str)); + DEBUG(9, "OriginalDN: [%s].\n", str); ret = sysdb_attrs_add_string(attrs, SYSDB_ORIG_DN, str); if (ret) goto done; if (_dn) { @@ -192,7 +192,7 @@ int sdap_parse_entry(TALLOC_CTX *memctx, if (map) { vals = ldap_get_values_len(sh->ldap, sm->msg, "objectClass"); if (!vals) { - DEBUG(1, ("Unknown entry type, no objectClasses found!\n")); + DEBUG(1, "Unknown entry type, no objectClasses found!\n"); ret = EINVAL; goto done; } @@ -206,8 +206,8 @@ int sdap_parse_entry(TALLOC_CTX *memctx, } } if (!vals[i]) { - DEBUG(1, ("objectClass not matching: %s\n", - map[0].name)); + DEBUG(1, "objectClass not matching: %s\n", + map[0].name); ldap_value_free_len(vals); ret = EINVAL; goto done; @@ -221,8 +221,8 @@ int sdap_parse_entry(TALLOC_CTX *memctx, DEBUG(lerrno == LDAP_SUCCESS ? SSSDBG_TRACE_INTERNAL : SSSDBG_MINOR_FAILURE, - ("Entry has no attributes [%d(%s)]!?\n", - lerrno, sss_ldap_err2string(lerrno))); + "Entry has no attributes [%d(%s)]!?\n", + lerrno, sss_ldap_err2string(lerrno)); if (map) { ret = EINVAL; goto done; @@ -248,7 +248,7 @@ int sdap_parse_entry(TALLOC_CTX *memctx, break; default: DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not determine if attribute [%s] was ranged\n", str)); + "Could not determine if attribute [%s] was ranged\n", str); goto done; } @@ -285,25 +285,25 @@ int sdap_parse_entry(TALLOC_CTX *memctx, if (!vals) { ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); if (lerrno != LDAP_SUCCESS) { - DEBUG(1, ("LDAP Library error: %d(%s)", - lerrno, sss_ldap_err2string(lerrno))); + DEBUG(1, "LDAP Library error: %d(%s)", + lerrno, sss_ldap_err2string(lerrno)); ret = EIO; goto done; } - DEBUG(5, ("Attribute [%s] has no values, skipping.\n", str)); + DEBUG(5, "Attribute [%s] has no values, skipping.\n", str); } else { if (!vals[0]) { - DEBUG(1, ("Missing value after ldap_get_values() ??\n")); + DEBUG(1, "Missing value after ldap_get_values() ??\n"); ret = EINVAL; goto done; } for (i = 0; vals[i]; i++) { if (vals[i]->bv_len == 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Value of attribute [%s] is empty. " - "Skipping this value.\n", str)); + "Value of attribute [%s] is empty. " + "Skipping this value.\n", str); continue; } if (base64) { @@ -334,8 +334,8 @@ int sdap_parse_entry(TALLOC_CTX *memctx, ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); if (lerrno) { - DEBUG(1, ("LDAP Library error: %d(%s)", - lerrno, sss_ldap_err2string(lerrno))); + DEBUG(1, "LDAP Library error: %d(%s)", + lerrno, sss_ldap_err2string(lerrno)); ret = EIO; goto done; } @@ -390,19 +390,19 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } if (!dref->derefVal.bv_val) { - DEBUG(2, ("Entry has no DN?\n")); + DEBUG(2, "Entry has no DN?\n"); ret = EINVAL; goto done; } orig_dn = dref->derefVal.bv_val; DEBUG(SSSDBG_TRACE_LIBS, - ("Dereferenced DN: %s\n", orig_dn)); + "Dereferenced DN: %s\n", orig_dn); if (!dref->attrVals) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Dereferenced entry [%s] has no attributes\n", - orig_dn)); + "Dereferenced entry [%s] has no attributes\n", + orig_dn); ret = EINVAL; goto done; } @@ -411,7 +411,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, for (dval = dref->attrVals; dval != NULL; dval = dval->next) { if (strcasecmp("objectClass", dval->type) == 0) { if (dval->vals == NULL) { - DEBUG(4, ("No value for objectClass, skipping\n")); + DEBUG(4, "No value for objectClass, skipping\n"); continue; } @@ -424,8 +424,8 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } for (i=0; i<len; i++) { - DEBUG(9, ("Dereferenced objectClass value: %s\n", - dval->vals[i].bv_val)); + DEBUG(9, "Dereferenced objectClass value: %s\n", + dval->vals[i].bv_val); ocs[i] = talloc_strdup(ocs, dval->vals[i].bv_val); if (!ocs[i]) { ret = ENOMEM; @@ -437,7 +437,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } } if (!ocs) { - DEBUG(1, ("Unknown entry type, no objectClasses found!\n")); + DEBUG(1, "Unknown entry type, no objectClasses found!\n"); ret = EINVAL; goto done; } @@ -448,7 +448,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, for (i=0; ocs[i]; i++) { /* the objectclass is always the first name in the map */ if (strcasecmp(minfo[mi].map[0].name, ocs[i]) == 0) { - DEBUG(9, ("Found map for objectclass '%s'\n", ocs[i])); + DEBUG(9, "Found map for objectclass '%s'\n", ocs[i]); map = minfo[mi].map; num_attrs = minfo[mi].num_attrs; break; @@ -469,7 +469,7 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } for (dval = dref->attrVals; dval != NULL; dval = dval->next) { - DEBUG(8, ("Dereferenced attribute: %s\n", dval->type)); + DEBUG(8, "Dereferenced attribute: %s\n", dval->type); for (a = 1; a < num_attrs; a++) { /* check if this attr is valid with the chosen schema */ @@ -486,13 +486,13 @@ errno_t sdap_parse_deref(TALLOC_CTX *mem_ctx, } if (dval->vals == NULL) { - DEBUG(4, ("No value for attribute %s, skipping\n", name)); + DEBUG(4, "No value for attribute %s, skipping\n", name); continue; } for (i=0; dval->vals[i].bv_val; i++) { - DEBUG(9, ("Dereferenced attribute value: %s\n", - dval->vals[i].bv_val)); + DEBUG(9, "Dereferenced attribute value: %s\n", + dval->vals[i].bv_val); ret = sysdb_attrs_add_mem(res[mi]->attrs, name, dval->vals[i].bv_val, dval->vals[i].bv_len); @@ -521,15 +521,15 @@ int sdap_get_msg_dn(TALLOC_CTX *memctx, struct sdap_handle *sh, lerrno = 0; ret = ldap_set_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed [%s], ignored.\n", - sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed [%s], ignored.\n", + sss_ldap_err2string(ret)); } str = ldap_get_dn(sh->ldap, sm->msg); if (!str) { ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &lerrno); - DEBUG(1, ("ldap_get_dn failed: %d(%s)\n", - lerrno, sss_ldap_err2string(lerrno))); + DEBUG(1, "ldap_get_dn failed: %d(%s)\n", + lerrno, sss_ldap_err2string(lerrno)); return EIO; } @@ -563,7 +563,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) ldap_opt_x_tls_require_cert = LDAP_OPT_X_TLS_HARD; } else { - DEBUG(1, ("Unknown value for tls_reqcert.\n")); + DEBUG(1, "Unknown value for tls_reqcert.\n"); return EINVAL; } /* LDAP_OPT_X_TLS_REQUIRE_CERT has to be set as a global option, @@ -571,7 +571,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ldap_opt_x_tls_require_cert); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -580,7 +580,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) if (tls_opt) { ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE, tls_opt); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -589,7 +589,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) if (tls_opt) { ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTDIR, tls_opt); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -598,7 +598,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) if (tls_opt) { ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CERTFILE, tls_opt); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -607,7 +607,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) if (tls_opt) { ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_KEYFILE, tls_opt); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -616,7 +616,7 @@ errno_t setup_tls_config(struct dp_option *basic_opts) if (tls_opt) { ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CIPHER_SUITE, tls_opt); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_set_option failed: %s\n", sss_ldap_err2string(ret))); + DEBUG(1, "ldap_set_option failed: %s\n", sss_ldap_err2string(ret)); return EIO; } } @@ -710,15 +710,15 @@ static char *get_single_value_as_string(TALLOC_CTX *mem_ctx, char *str = NULL; if (el->num_values == 0) { - DEBUG(3, ("Missing value.\n")); + DEBUG(3, "Missing value.\n"); } else if (el->num_values == 1) { str = talloc_strndup(mem_ctx, (char *) el->values[0].data, el->values[0].length); if (str == NULL) { - DEBUG(1, ("talloc_strndup failed.\n")); + DEBUG(1, "talloc_strndup failed.\n"); } } else { - DEBUG(3, ("More than one value found.\n")); + DEBUG(3, "More than one value found.\n"); } return str; @@ -743,19 +743,19 @@ static char *get_naming_context(TALLOC_CTX *mem_ctx, } if (dnc == NULL && nc == NULL) { - DEBUG(3, ("No attributes [%s] or [%s] found in rootDSE.\n", + DEBUG(3, "No attributes [%s] or [%s] found in rootDSE.\n", SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS, - SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT)); + SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT); } else { if (dnc != NULL) { - DEBUG(5, ("Using value from [%s] as naming context.\n", - SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT)); + DEBUG(5, "Using value from [%s] as naming context.\n", + SDAP_ROOTDSE_ATTR_DEFAULT_NAMING_CONTEXT); naming_context = get_single_value_as_string(mem_ctx, dnc); } if (naming_context == NULL && nc != NULL) { - DEBUG(5, ("Using value from [%s] as naming context.\n", - SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS)); + DEBUG(5, "Using value from [%s] as naming context.\n", + SDAP_ROOTDSE_ATTR_NAMING_CONTEXTS); naming_context = get_single_value_as_string(mem_ctx, nc); } } @@ -806,12 +806,12 @@ static errno_t sdap_set_search_base(struct sdap_options *opts, } DEBUG(SSSDBG_CONF_SETTINGS, - ("Setting option [%s] to [%s].\n", - opts->basic[class].opt_name, naming_context)); + "Setting option [%s] to [%s].\n", + opts->basic[class].opt_name, naming_context); ret = dp_opt_set_string(opts->basic, class, naming_context); if (ret != EOK) { - DEBUG(1, ("dp_opt_set_string failed.\n")); + DEBUG(1, "dp_opt_set_string failed.\n"); goto done; } @@ -838,7 +838,7 @@ errno_t sdap_set_config_options_with_rootdse(struct sysdb_attrs *rootdse, || !sdom->autofs_search_bases) { naming_context = get_naming_context(opts->basic, rootdse); if (naming_context == NULL) { - DEBUG(1, ("get_naming_context failed.\n")); + DEBUG(1, "get_naming_context failed.\n"); /* This has to be non-fatal, since some servers offer * multiple namingContexts entries. We will just @@ -952,29 +952,29 @@ int sdap_get_server_opts_from_rootdse(TALLOC_CTX *memctx, if (ret != EOK) { switch (ret) { case ENOENT: - DEBUG(1, ("%s configured but not found in rootdse!\n", - opts->gen_map[SDAP_AT_LAST_USN].opt_name)); + DEBUG(1, "%s configured but not found in rootdse!\n", + opts->gen_map[SDAP_AT_LAST_USN].opt_name); break; case ERANGE: - DEBUG(1, ("Multiple values of %s found in rootdse!\n", - opts->gen_map[SDAP_AT_LAST_USN].opt_name)); + DEBUG(1, "Multiple values of %s found in rootdse!\n", + opts->gen_map[SDAP_AT_LAST_USN].opt_name); break; default: - DEBUG(1, ("Unkown error (%d) checking rootdse!\n", ret)); + DEBUG(1, "Unkown error (%d) checking rootdse!\n", ret); } } else { if (!entry_usn_name) { - DEBUG(1, ("%s found in rootdse but %s is not set!\n", + DEBUG(1, "%s found in rootdse but %s is not set!\n", last_usn_name, - opts->gen_map[SDAP_AT_ENTRY_USN].opt_name)); + opts->gen_map[SDAP_AT_ENTRY_USN].opt_name); } else { so->supports_usn = true; so->last_usn = strtoul(last_usn_value, &endptr, 10); if (endptr != NULL && (*endptr != '\0' || endptr == last_usn_value)) { - DEBUG(3, ("USN is not valid (value: %s)\n", last_usn_value)); + DEBUG(3, "USN is not valid (value: %s)\n", last_usn_value); so->last_usn = 0; } else { - DEBUG(9, ("USN value: %s (int: %lu)\n", last_usn_value, so->last_usn)); + DEBUG(9, "USN value: %s (int: %lu)\n", last_usn_value, so->last_usn); } } } @@ -993,10 +993,10 @@ int sdap_get_server_opts_from_rootdse(TALLOC_CTX *memctx, so->supports_usn = true; so->last_usn = strtoul(last_usn_value, &endptr, 10); if (endptr != NULL && (*endptr != '\0' || endptr == last_usn_value)) { - DEBUG(3, ("USN is not valid (value: %s)\n", last_usn_value)); + DEBUG(3, "USN is not valid (value: %s)\n", last_usn_value); so->last_usn = 0; } else { - DEBUG(9, ("USN value: %s (int: %lu)\n", last_usn_value, so->last_usn)); + DEBUG(9, "USN value: %s (int: %lu)\n", last_usn_value, so->last_usn); } last_usn_name = usn_attrs[i].last_name; break; @@ -1018,26 +1018,26 @@ int sdap_get_server_opts_from_rootdse(TALLOC_CTX *memctx, case DS_BEHAVIOR_WIN2012: opts->dc_functional_level = dc_level; DEBUG(SSSDBG_CONF_SETTINGS, - ("Setting AD compatibility level to [%d]\n", - opts->dc_functional_level)); + "Setting AD compatibility level to [%d]\n", + opts->dc_functional_level); break; default: DEBUG(SSSDBG_MINOR_FAILURE, - ("Received invalid value for AD compatibility level. " - "Continuing without AD performance enhancements\n")); + "Received invalid value for AD compatibility level. " + "Continuing without AD performance enhancements\n"); } } else if (ret != ENOENT) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error detecting Active Directory compatibility level " + "Error detecting Active Directory compatibility level " "(%s). Continuing without AD performance enhancements\n", - strerror(ret))); + strerror(ret)); } } if (!last_usn_name) { - DEBUG(5, ("No known USN scheme is supported by this server!\n")); + DEBUG(5, "No known USN scheme is supported by this server!\n"); if (!entry_usn_name) { - DEBUG(5, ("Will use modification timestamp as usn!\n")); + DEBUG(5, "Will use modification timestamp as usn!\n"); opts->gen_map[SDAP_AT_ENTRY_USN].name = talloc_strdup(opts->gen_map, "modifyTimestamp"); } @@ -1168,11 +1168,11 @@ int sdap_control_create(struct sdap_handle *sh, const char *oid, int iscritical, if (sdap_is_control_supported(sh, oid)) { ret = sss_ldap_control_create(oid, iscritical, value, dupval, ctrlp); if (ret != LDAP_SUCCESS) { - DEBUG(1, ("sss_ldap_control_create failed [%d][%s].\n", - ret, sss_ldap_err2string(ret))); + DEBUG(1, "sss_ldap_control_create failed [%d][%s].\n", + ret, sss_ldap_err2string(ret)); } } else { - DEBUG(3, ("Server does not support the requested control [%s].\n", oid)); + DEBUG(3, "Server does not support the requested control [%s].\n", oid); ret = LDAP_NOT_SUPPORTED; } @@ -1189,13 +1189,13 @@ int sdap_replace_id(struct sysdb_attrs *entry, const char *attr, id_t val) if (ret == ENOENT) { return sysdb_attrs_add_uint32(entry, attr, val); } else if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot get attribute [%s]\n", attr)); + DEBUG(SSSDBG_OP_FAILURE, "Cannot get attribute [%s]\n", attr); return ret; } if (el->num_values != 1) { DEBUG(SSSDBG_OP_FAILURE, - ("Expected 1 value for %s, got %d\n", attr, el->num_values)); + "Expected 1 value for %s, got %d\n", attr, el->num_values); return EINVAL; } @@ -1223,17 +1223,17 @@ sdap_get_primary_name(TALLOC_CTX *memctx, ret = sysdb_attrs_primary_name(dom->sysdb, attrs, attr_name, &orig_name); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("The object has no name attribute\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "The object has no name attribute\n"); return EINVAL; } name = sss_get_domain_name(memctx, orig_name, dom); if (name == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to format original name [%s]\n", orig_name)); + "Failed to format original name [%s]\n", orig_name); return ENOMEM; } - DEBUG(SSSDBG_TRACE_FUNC, ("Processing object %s\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing object %s\n", name); *_primary_name = name; return EOK; diff --git a/src/providers/ldap/sdap_access.c b/src/providers/ldap/sdap_access.c index 29e83eb43..c0e911e81 100644 --- a/src/providers/ldap/sdap_access.c +++ b/src/providers/ldap/sdap_access.c @@ -91,7 +91,7 @@ sdap_access_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_access_req_ctx); if (req == NULL) { - DEBUG(1, ("tevent_req_create failed.\n")); + DEBUG(1, "tevent_req_create failed.\n"); return NULL; } @@ -103,10 +103,10 @@ sdap_access_send(TALLOC_CTX *mem_ctx, state->conn = conn; state->current_rule = 0; - DEBUG(6, ("Performing access check for user [%s]\n", pd->user)); + DEBUG(6, "Performing access check for user [%s]\n", pd->user); if (access_ctx->access_rule[0] == LDAP_ACCESS_EMPTY) { - DEBUG(3, ("No access rules defined, access denied.\n")); + DEBUG(3, "No access rules defined, access denied.\n"); ret = ERR_ACCESS_DENIED; goto done; } @@ -130,7 +130,7 @@ sdap_access_send(TALLOC_CTX *mem_ctx, } if (res->count != 1) { - DEBUG(1, ("Invalid response from sysdb_get_user_attr\n")); + DEBUG(1, "Invalid response from sysdb_get_user_attr\n"); ret = EINVAL; goto done; } @@ -173,7 +173,7 @@ static errno_t check_next_rule(struct sdap_access_req_ctx *state, state->pd->user, state->user_entry); if (subreq == NULL) { - DEBUG(1, ("sdap_access_filter_send failed.\n")); + DEBUG(1, "sdap_access_filter_send failed.\n"); return ENOMEM; } @@ -194,7 +194,7 @@ static errno_t check_next_rule(struct sdap_access_req_ctx *state, break; default: - DEBUG(1, ("Unexpected access rule type. Access denied.\n")); + DEBUG(1, "Unexpected access rule type. Access denied.\n"); ret = ERR_ACCESS_DENIED; } @@ -214,7 +214,7 @@ static void sdap_access_filter_done(struct tevent_req *subreq) ret = sdap_access_filter_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error retrieving access check result.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Error retrieving access check result.\n"); tevent_req_error(req, ret); return; } @@ -252,17 +252,17 @@ static errno_t sdap_account_expired_shadow(struct pam_data *pd, long sp_expire; long today; - DEBUG(6, ("Performing access shadow check for user [%s]\n", pd->user)); + DEBUG(6, "Performing access shadow check for user [%s]\n", pd->user); val = ldb_msg_find_attr_as_string(user_entry, SYSDB_SHADOWPW_EXPIRE, NULL); if (val == NULL) { - DEBUG(3, ("Shadow expire attribute not found. " - "Access will be granted.\n")); + DEBUG(3, "Shadow expire attribute not found. " + "Access will be granted.\n"); return EOK; } ret = string_to_shadowpw_days(val, &sp_expire); if (ret != EOK) { - DEBUG(1, ("Failed to retrieve shadow expire date.\n")); + DEBUG(1, "Failed to retrieve shadow expire date.\n"); return ret; } @@ -273,7 +273,7 @@ static errno_t sdap_account_expired_shadow(struct pam_data *pd, sizeof(SHADOW_EXPIRE_MSG), (const uint8_t *) SHADOW_EXPIRE_MSG); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCOUNT_EXPIRED; @@ -301,7 +301,7 @@ static bool ad_account_expired(uint64_t expiration_time) now = time(NULL); if (now == ((time_t) -1)) { err = errno; - DEBUG(1, ("time failed [%d][%s].\n", err, strerror(err))); + DEBUG(1, "time failed [%d][%s].\n", err, strerror(err)); return true; } @@ -322,18 +322,18 @@ static errno_t sdap_account_expired_ad(struct pam_data *pd, uint64_t expiration_time; int ret; - DEBUG(6, ("Performing AD access check for user [%s]\n", pd->user)); + DEBUG(6, "Performing AD access check for user [%s]\n", pd->user); uac = ldb_msg_find_attr_as_uint(user_entry, SYSDB_AD_USER_ACCOUNT_CONTROL, 0); - DEBUG(9, ("User account control for user [%s] is [%X].\n", - pd->user, uac)); + DEBUG(9, "User account control for user [%s] is [%X].\n", + pd->user, uac); expiration_time = ldb_msg_find_attr_as_uint64(user_entry, SYSDB_AD_ACCOUNT_EXPIRES, 0); DEBUG(SSSDBG_TRACE_ALL, - ("Expiration time for user [%s] is [%"PRIu64"].\n", - pd->user, expiration_time)); + "Expiration time for user [%s] is [%"PRIu64"].\n", + pd->user, expiration_time); if (uac & UAC_ACCOUNTDISABLE) { @@ -341,7 +341,7 @@ static errno_t sdap_account_expired_ad(struct pam_data *pd, sizeof(AD_DISABLE_MESSAGE), (const uint8_t *) AD_DISABLE_MESSAGE); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -352,7 +352,7 @@ static errno_t sdap_account_expired_ad(struct pam_data *pd, sizeof(AD_EXPIRED_MESSAGE), (const uint8_t *) AD_EXPIRED_MESSAGE); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCOUNT_EXPIRED; @@ -369,18 +369,18 @@ static errno_t sdap_account_expired_rhds(struct pam_data *pd, bool locked; int ret; - DEBUG(6, ("Performing RHDS access check for user [%s]\n", pd->user)); + DEBUG(6, "Performing RHDS access check for user [%s]\n", pd->user); locked = ldb_msg_find_attr_as_bool(user_entry, SYSDB_NS_ACCOUNT_LOCK, false); - DEBUG(9, ("Account for user [%s] is%s locked.\n", pd->user, - locked ? "" : " not" )); + DEBUG(9, "Account for user [%s] is%s locked.\n", pd->user, + locked ? "" : " not" ); if (locked) { ret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(RHDS_LOCK_MSG), (const uint8_t *) RHDS_LOCK_MSG); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -401,7 +401,7 @@ static bool nds_check_expired(const char *exp_time_str) time_t now; if (exp_time_str == NULL) { - DEBUG(9, ("ndsLoginExpirationTime is not set, access granted.\n")); + DEBUG(9, "ndsLoginExpirationTime is not set, access granted.\n"); return false; } @@ -409,18 +409,18 @@ static bool nds_check_expired(const char *exp_time_str) end = strptime(exp_time_str, "%Y%m%d%H%M%SZ", &tm); if (end == NULL) { - DEBUG(1, ("NDS expire date [%s] invalid.\n", exp_time_str)); + DEBUG(1, "NDS expire date [%s] invalid.\n", exp_time_str); return true; } if (*end != '\0') { - DEBUG(1, ("NDS expire date [%s] contains extra characters.\n", - exp_time_str)); + DEBUG(1, "NDS expire date [%s] contains extra characters.\n", + exp_time_str); return true; } expire_time = mktime(&tm); if (expire_time == -1) { - DEBUG(1, ("mktime failed to convert [%s].\n", exp_time_str)); + DEBUG(1, "mktime failed to convert [%s].\n", exp_time_str); return true; } @@ -428,12 +428,12 @@ static bool nds_check_expired(const char *exp_time_str) expire_time -= timezone; now = time(NULL); DEBUG(SSSDBG_TRACE_ALL, - ("Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " + "Time info: tzname[0] [%s] tzname[1] [%s] timezone [%ld] " "daylight [%d] now [%ld] expire_time [%ld].\n", tzname[0], - tzname[1], timezone, daylight, now, expire_time)); + tzname[1], timezone, daylight, now, expire_time); if (difftime(now, expire_time) > 0.0) { - DEBUG(4, ("NDS account expired.\n")); + DEBUG(4, "NDS account expired.\n"); return true; } @@ -453,14 +453,14 @@ static bool nds_check_time_map(const struct ldb_val *time_map) uint8_t mask = 0; if (time_map == NULL) { - DEBUG(9, ("loginAllowedTimeMap is missing, access granted.\n")); + DEBUG(9, "loginAllowedTimeMap is missing, access granted.\n"); return false; } if (time_map->length != 42) { DEBUG(SSSDBG_FUNC_DATA, - ("Allowed time map has the wrong size, " - "got [%zu], expected 42.\n", time_map->length)); + "Allowed time map has the wrong size, " + "got [%zu], expected 42.\n", time_map->length); return true; } @@ -472,7 +472,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map) if (map_index > 335) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unexpected index value [%zu] for time map.\n", map_index)); + "Unexpected index value [%zu] for time map.\n", map_index); return true; } @@ -480,8 +480,8 @@ static bool nds_check_time_map(const struct ldb_val *time_map) if (q.quot > 41 || q.quot < 0 || q.rem > 7 || q.rem < 0) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unexpected result of div(), [%zu][%d][%d].\n", - map_index, q.quot, q.rem)); + "Unexpected result of div(), [%zu][%d][%d].\n", + map_index, q.quot, q.rem); return true; } @@ -490,7 +490,7 @@ static bool nds_check_time_map(const struct ldb_val *time_map) } if (time_map->data[q.quot] & mask) { - DEBUG(4, ("Access allowed by time map.\n")); + DEBUG(4, "Access allowed by time map.\n"); return false; } @@ -505,19 +505,19 @@ static errno_t sdap_account_expired_nds(struct pam_data *pd, const char *exp_time_str; const struct ldb_val *time_map; - DEBUG(6, ("Performing NDS access check for user [%s]\n", pd->user)); + DEBUG(6, "Performing NDS access check for user [%s]\n", pd->user); locked = ldb_msg_find_attr_as_bool(user_entry, SYSDB_NDS_LOGIN_DISABLED, false); - DEBUG(9, ("Account for user [%s] is%s disabled.\n", pd->user, - locked ? "" : " not")); + DEBUG(9, "Account for user [%s] is%s disabled.\n", pd->user, + locked ? "" : " not"); if (locked) { ret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(NDS_DISABLE_MSG), (const uint8_t *) NDS_DISABLE_MSG); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -528,15 +528,15 @@ static errno_t sdap_account_expired_nds(struct pam_data *pd, NULL); locked = nds_check_expired(exp_time_str); - DEBUG(9, ("Account for user [%s] is%s expired.\n", pd->user, - locked ? "" : " not")); + DEBUG(9, "Account for user [%s] is%s expired.\n", pd->user, + locked ? "" : " not"); if (locked) { ret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(NDS_EXPIRED_MSG), (const uint8_t *) NDS_EXPIRED_MSG); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -547,15 +547,15 @@ static errno_t sdap_account_expired_nds(struct pam_data *pd, locked = nds_check_time_map(time_map); - DEBUG(9, ("Account for user [%s] is%s locked at this time.\n", - pd->user, locked ? "" : " not")); + DEBUG(9, "Account for user [%s] is%s locked at this time.\n", + pd->user, locked ? "" : " not"); if (locked) { ret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(NDS_TIME_MAP_MSG), (const uint8_t *) NDS_TIME_MAP_MSG); if (ret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -577,34 +577,34 @@ static errno_t sdap_account_expired(struct sdap_access_ctx *access_ctx, expire = dp_opt_get_cstring(access_ctx->id_ctx->opts->basic, SDAP_ACCOUNT_EXPIRE_POLICY); if (expire == NULL) { - DEBUG(1, ("Missing account expire policy. Access denied\n")); + DEBUG(1, "Missing account expire policy. Access denied\n"); return ERR_ACCESS_DENIED; } else { if (strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_SHADOW) == 0) { ret = sdap_account_expired_shadow(pd, user_entry); if (ret != EOK) { - DEBUG(1, ("sdap_account_expired_shadow failed.\n")); + DEBUG(1, "sdap_account_expired_shadow failed.\n"); } } else if (strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_AD) == 0) { ret = sdap_account_expired_ad(pd, user_entry); if (ret != EOK) { - DEBUG(1, ("sdap_account_expired_ad failed.\n")); + DEBUG(1, "sdap_account_expired_ad failed.\n"); } } else if (strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_RHDS) == 0 || strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_IPA) == 0 || strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_389DS) == 0) { ret = sdap_account_expired_rhds(pd, user_entry); if (ret != EOK) { - DEBUG(1, ("sdap_account_expired_rhds failed.\n")); + DEBUG(1, "sdap_account_expired_rhds failed.\n"); } } else if (strcasecmp(expire, LDAP_ACCOUNT_EXPIRE_NDS) == 0) { ret = sdap_account_expired_nds(pd, user_entry); if (ret != EOK) { - DEBUG(1, ("sdap_account_expired_nds failed.\n")); + DEBUG(1, "sdap_account_expired_nds failed.\n"); } } else { - DEBUG(1, ("Unsupported LDAP account expire policy [%s]. " - "Access denied.\n", expire)); + DEBUG(1, "Unsupported LDAP account expire policy [%s]. " + "Access denied.\n", expire); ret = ERR_ACCESS_DENIED; } } @@ -654,7 +654,7 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, if (access_ctx->filter == NULL || *access_ctx->filter == '\0') { /* If no filter is set, default to restrictive */ - DEBUG(6, ("No filter set. Access is denied.\n")); + DEBUG(6, "No filter set. Access is denied.\n"); ret = ERR_ACCESS_DENIED; goto done; } @@ -667,7 +667,7 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, state->access_ctx = access_ctx; state->domain = domain; - DEBUG(6, ("Performing access filter check for user [%s]\n", username)); + DEBUG(6, "Performing access filter check for user [%s]\n", username); state->cached_access = ldb_msg_find_attr_as_bool(user_entry, SYSDB_LDAP_ACCESS_FILTER, @@ -682,15 +682,15 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, /* Perform online operation */ basedn = ldb_msg_find_attr_as_string(user_entry, SYSDB_ORIG_DN, NULL); if (basedn == NULL) { - DEBUG(1,("Could not find originalDN for user [%s]\n", - state->username)); + DEBUG(1,"Could not find originalDN for user [%s]\n", + state->username); ret = EINVAL; goto done; } state->basedn = talloc_strdup(state, basedn); if (state->basedn == NULL) { - DEBUG(1, ("Could not allocate memory for originalDN\n")); + DEBUG(1, "Could not allocate memory for originalDN\n"); ret = ENOMEM; goto done; } @@ -700,8 +700,8 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, ret = sss_parse_name(state, domain->names, username, &domname, &name); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not parse [%s] into name and " - "domain components, access might fail\n", username)); + "Could not parse [%s] into name and " + "domain components, access might fail\n", username); name = discard_const(username); } @@ -718,18 +718,18 @@ static struct tevent_req *sdap_access_filter_send(TALLOC_CTX *mem_ctx, state->opts->user_map[SDAP_OC_USER].name, state->access_ctx->filter); if (state->filter == NULL) { - DEBUG(0, ("Could not construct access filter\n")); + DEBUG(0, "Could not construct access filter\n"); ret = ENOMEM; goto done; } talloc_zfree(clean_username); - DEBUG(6, ("Checking filter against LDAP\n")); + DEBUG(6, "Checking filter against LDAP\n"); state->sdap_op = sdap_id_op_create(state, state->conn->conn_cache); if (!state->sdap_op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto done; } @@ -757,10 +757,10 @@ static errno_t sdap_access_filter_decide_offline(struct tevent_req *req) tevent_req_data(req, struct sdap_access_filter_req_ctx); if (state->cached_access) { - DEBUG(6, ("Access granted by cached credentials\n")); + DEBUG(6, "Access granted by cached credentials\n"); return EOK; } else { - DEBUG(6, ("Access denied by cached credentials\n")); + DEBUG(6, "Access denied by cached credentials\n"); return ERR_ACCESS_DENIED; } } @@ -774,7 +774,7 @@ static int sdap_access_filter_retry(struct tevent_req *req) subreq = sdap_id_op_connect_send(state->sdap_op, state, &ret); if (!subreq) { - DEBUG(2, ("sdap_id_op_connect_send failed: %d (%s)\n", ret, strerror(ret))); + DEBUG(2, "sdap_id_op_connect_send failed: %d (%s)\n", ret, strerror(ret)); return ret; } @@ -821,7 +821,7 @@ static void sdap_access_filter_connect_done(struct tevent_req *subreq) SDAP_SEARCH_TIMEOUT), false); if (subreq == NULL) { - DEBUG(1, ("Could not start LDAP communication\n")); + DEBUG(1, "Could not start LDAP communication\n"); tevent_req_error(req, EIO); return; } @@ -859,11 +859,11 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) sss_log(SSS_LOG_ERR, "Malformed access control filter [%s]\n", state->filter); DEBUG(SSSDBG_CRIT_FAILURE, - ("Malformed access control filter [%s]\n", state->filter)); + "Malformed access control filter [%s]\n", state->filter); ret = ERR_ACCESS_DENIED; } else { - DEBUG(1, ("sdap_get_generic_send() returned error [%d][%s]\n", - ret, sss_strerror(ret))); + DEBUG(1, "sdap_get_generic_send() returned error [%d][%s]\n", + ret, sss_strerror(ret)); } goto done; @@ -875,12 +875,12 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) * Anything else is an error */ if (num_results < 1) { - DEBUG(4, ("User [%s] was not found with the specified filter. " - "Denying access.\n", state->username)); + DEBUG(4, "User [%s] was not found with the specified filter. " + "Denying access.\n", state->username); found = false; } else if (results == NULL) { - DEBUG(1, ("num_results > 0, but results is NULL\n")); + DEBUG(1, "num_results > 0, but results is NULL\n"); ret = ERR_INTERNAL; goto done; } @@ -888,7 +888,7 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) /* It should not be possible to get more than one reply * here, since we're doing a base-scoped search */ - DEBUG(1, ("Received multiple replies\n")); + DEBUG(1, "Received multiple replies\n"); ret = ERR_INTERNAL; goto done; } @@ -900,21 +900,21 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) /* Save "allow" to the cache for future offline :q* access checks. */ - DEBUG(6, ("Access granted by online lookup\n")); + DEBUG(6, "Access granted by online lookup\n"); ret = EOK; } else { /* Save "disallow" to the cache for future offline * access checks. */ - DEBUG(6, ("Access denied by online lookup\n")); + DEBUG(6, "Access denied by online lookup\n"); ret = ERR_ACCESS_DENIED; } attrs = sysdb_new_attrs(state); if (attrs == NULL) { ret = ENOMEM; - DEBUG(1, ("Could not set up attrs\n")); + DEBUG(1, "Could not set up attrs\n"); goto done; } @@ -924,7 +924,7 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) /* Failing to save to the cache is non-fatal. * Just return the result. */ - DEBUG(1, ("Could not set up attrs\n")); + DEBUG(1, "Could not set up attrs\n"); goto done; } @@ -934,7 +934,7 @@ static void sdap_access_filter_get_access_done(struct tevent_req *subreq) /* Failing to save to the cache is non-fatal. * Just return the result. */ - DEBUG(1, ("Failed to set user access attribute\n")); + DEBUG(1, "Failed to set user access attribute\n"); goto done; } @@ -971,13 +971,13 @@ static errno_t sdap_access_service(struct pam_data *pd, el = ldb_msg_find_element(user_entry, SYSDB_AUTHORIZED_SERVICE); if (!el || el->num_values == 0) { - DEBUG(1, ("Missing authorized services. Access denied\n")); + DEBUG(1, "Missing authorized services. Access denied\n"); tret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(AUTHR_SRV_MISSING_MSG), (const uint8_t *) AUTHR_SRV_MISSING_MSG); if (tret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } return ERR_ACCESS_DENIED; @@ -990,13 +990,13 @@ static errno_t sdap_access_service(struct pam_data *pd, if (service[0] == '!' && strcasecmp(pd->service, service+1) == 0) { /* This service is explicitly denied */ - DEBUG(4, ("Access denied by [%s]\n", service)); + DEBUG(4, "Access denied by [%s]\n", service); tret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(AUTHR_SRV_DENY_MSG), (const uint8_t *) AUTHR_SRV_DENY_MSG); if (tret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } /* A denial trumps all. Break here */ @@ -1004,14 +1004,14 @@ static errno_t sdap_access_service(struct pam_data *pd, } else if (strcasecmp(pd->service, service) == 0) { /* This service is explicitly allowed */ - DEBUG(4, ("Access granted for [%s]\n", service)); + DEBUG(4, "Access granted for [%s]\n", service); /* We still need to loop through to make sure * that it's not also explicitly denied */ ret = EOK; } else if (strcmp("*", service) == 0) { /* This user has access to all services */ - DEBUG(4, ("Access granted to all services\n")); + DEBUG(4, "Access granted to all services\n"); /* We still need to loop through to make sure * that it's not also explicitly denied */ @@ -1020,13 +1020,13 @@ static errno_t sdap_access_service(struct pam_data *pd, } if (ret == ENOENT) { - DEBUG(4, ("No matching service rule found\n")); + DEBUG(4, "No matching service rule found\n"); tret = pam_add_response(pd, SSS_PAM_SYSTEM_INFO, sizeof(AUTHR_SRV_NO_MATCH_MSG), (const uint8_t *) AUTHR_SRV_NO_MATCH_MSG); if (tret != EOK) { - DEBUG(1, ("pam_add_response failed.\n")); + DEBUG(1, "pam_add_response failed.\n"); } ret = ERR_ACCESS_DENIED; @@ -1045,12 +1045,12 @@ static errno_t sdap_access_host(struct ldb_message *user_entry) el = ldb_msg_find_element(user_entry, SYSDB_AUTHORIZED_HOST); if (!el || el->num_values == 0) { - DEBUG(1, ("Missing hosts. Access denied\n")); + DEBUG(1, "Missing hosts. Access denied\n"); return ERR_ACCESS_DENIED; } if (gethostname(hostname, sizeof(hostname)) == -1) { - DEBUG(1, ("Unable to get system hostname. Access denied\n")); + DEBUG(1, "Unable to get system hostname. Access denied\n"); return ERR_ACCESS_DENIED; } @@ -1067,20 +1067,20 @@ static errno_t sdap_access_host(struct ldb_message *user_entry) if (host[0] == '!' && strcasecmp(hostname, host+1) == 0) { /* This host is explicitly denied */ - DEBUG(4, ("Access denied by [%s]\n", host)); + DEBUG(4, "Access denied by [%s]\n", host); /* A denial trumps all. Break here */ return ERR_ACCESS_DENIED; } else if (strcasecmp(hostname, host) == 0) { /* This host is explicitly allowed */ - DEBUG(4, ("Access granted for [%s]\n", host)); + DEBUG(4, "Access granted for [%s]\n", host); /* We still need to loop through to make sure * that it's not also explicitly denied */ ret = EOK; } else if (strcmp("*", host) == 0) { /* This user has access to all hosts */ - DEBUG(4, ("Access granted to all hosts\n")); + DEBUG(4, "Access granted to all hosts\n"); /* We still need to loop through to make sure * that it's not also explicitly denied */ @@ -1089,7 +1089,7 @@ static errno_t sdap_access_host(struct ldb_message *user_entry) } if (ret == ENOENT) { - DEBUG(4, ("No matching host rule found\n")); + DEBUG(4, "No matching host rule found\n"); ret = ERR_ACCESS_DENIED; } diff --git a/src/providers/ldap/sdap_async.c b/src/providers/ldap/sdap_async.c index 1022a093f..b6ba90744 100644 --- a/src/providers/ldap/sdap_async.c +++ b/src/providers/ldap/sdap_async.c @@ -33,7 +33,7 @@ void make_realm_upper_case(const char *upn) c = strchr(upn, REALM_SEPARATOR); if (c == NULL) { - DEBUG(9, ("No realm delimiter found in upn [%s].\n", upn)); + DEBUG(9, "No realm delimiter found in upn [%s].\n", upn); return; } @@ -100,10 +100,10 @@ static void sdap_handle_release(struct sdap_handle *sh) { struct sdap_op *op; - DEBUG(8, ("Trace: sh[%p], connected[%d], ops[%p], ldap[%p], " + DEBUG(8, "Trace: sh[%p], connected[%d], ops[%p], ldap[%p], " "destructor_lock[%d], release_memory[%d]\n", sh, (int)sh->connected, sh->ops, sh->ldap, - (int)sh->destructor_lock, (int)sh->release_memory)); + (int)sh->destructor_lock, (int)sh->release_memory); if (sh->destructor_lock) return; sh->destructor_lock = true; @@ -168,11 +168,11 @@ static void sdap_process_result(struct tevent_context *ev, void *pvt) LDAPMessage *msg; int ret; - DEBUG(8, ("Trace: sh[%p], connected[%d], ops[%p], ldap[%p]\n", - sh, (int)sh->connected, sh->ops, sh->ldap)); + DEBUG(8, "Trace: sh[%p], connected[%d], ops[%p], ldap[%p]\n", + sh, (int)sh->connected, sh->ops, sh->ldap); if (!sh->connected || !sh->ldap) { - DEBUG(2, ("ERROR: LDAP connection is not connected!\n")); + DEBUG(2, "ERROR: LDAP connection is not connected!\n"); sdap_handle_release(sh); return; } @@ -181,14 +181,14 @@ static void sdap_process_result(struct tevent_context *ev, void *pvt) if (ret == 0) { /* this almost always means we have reached the end of * the list of received messages */ - DEBUG(8, ("Trace: ldap_result found nothing!\n")); + DEBUG(8, "Trace: ldap_result found nothing!\n"); return; } if (ret == -1) { ldap_get_option(sh->ldap, LDAP_OPT_RESULT_CODE, &ret); DEBUG(SSSDBG_OP_FAILURE, - ("ldap_result error: [%s]\n", ldap_err2string(ret))); + "ldap_result error: [%s]\n", ldap_err2string(ret)); sdap_handle_release(sh); return; } @@ -203,7 +203,7 @@ static void sdap_process_result(struct tevent_context *ev, void *pvt) te = tevent_add_timer(ev, sh, no_timeout, sdap_ldap_next_result, sh); if (!te) { - DEBUG(1, ("Failed to add critical timer to fetch next result!\n")); + DEBUG(1, "Failed to add critical timer to fetch next result!\n"); } /* now process this message */ @@ -281,7 +281,7 @@ static void sdap_process_message(struct tevent_context *ev, msgid = ldap_msgid(msg); if (msgid == -1) { - DEBUG(2, ("can't fire callback, message id invalid!\n")); + DEBUG(2, "can't fire callback, message id invalid!\n"); ldap_msgfree(msg); return; } @@ -293,20 +293,20 @@ static void sdap_process_message(struct tevent_context *ev, } if (op == NULL) { - DEBUG(2, ("Unmatched msgid, discarding message (type: %0x)\n", - msgtype)); + DEBUG(2, "Unmatched msgid, discarding message (type: %0x)\n", + msgtype); ldap_msgfree(msg); return; } /* shouldn't happen */ if (op->done) { - DEBUG(2, ("Operation [%p] already handled (type: %0x)\n", op, msgtype)); + DEBUG(2, "Operation [%p] already handled (type: %0x)\n", op, msgtype); ldap_msgfree(msg); return; } - DEBUG(9, ("Message type: [%s]\n", sdap_ldap_result_str(msgtype))); + DEBUG(9, "Message type: [%s]\n", sdap_ldap_result_str(msgtype)); switch (msgtype) { case LDAP_RES_SEARCH_ENTRY: @@ -334,7 +334,7 @@ static void sdap_process_message(struct tevent_context *ev, default: /* unkwon msg type ?? */ - DEBUG(1, ("Couldn't figure out the msg type! [%0x]\n", msgtype)); + DEBUG(1, "Couldn't figure out the msg type! [%0x]\n", msgtype); ldap_msgfree(msg); return; } @@ -395,7 +395,7 @@ static void sdap_unlock_next_reply(struct sdap_op *op) te = tevent_add_timer(op->ev, op, tv, sdap_process_next_reply, op); if (!te) { - DEBUG(1, ("Failed to add critical timer for next reply!\n")); + DEBUG(1, "Failed to add critical timer for next reply!\n"); op->callback(op, NULL, EFAULT, op->data); } } @@ -435,7 +435,7 @@ static void sdap_op_timeout(struct tevent_req *req) /* should never happen, but just in case */ if (op->done) { - DEBUG(2, ("Timeout happened after op was finished !?\n")); + DEBUG(2, "Timeout happened after op was finished !?\n"); return; } @@ -523,7 +523,7 @@ struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx, ber = ber_alloc_t( LBER_USE_DER ); if (ber == NULL) { - DEBUG(7, ("ber_alloc_t failed.\n")); + DEBUG(7, "ber_alloc_t failed.\n"); talloc_zfree(req); return NULL; } @@ -533,7 +533,7 @@ struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx, LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, password, LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, new_password); if (ret == -1) { - DEBUG(1, ("ber_printf failed.\n")); + DEBUG(1, "ber_printf failed.\n"); ber_free(ber, 1); talloc_zfree(req); return NULL; @@ -542,7 +542,7 @@ struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx, ret = ber_flatten(ber, &bv); ber_free(ber, 1); if (ret == -1) { - DEBUG(1, ("ber_flatten failed.\n")); + DEBUG(1, "ber_flatten failed.\n"); talloc_zfree(req); return NULL; } @@ -550,31 +550,31 @@ struct tevent_req *sdap_exop_modify_passwd_send(TALLOC_CTX *memctx, ret = sdap_control_create(state->sh, LDAP_CONTROL_PASSWORDPOLICYREQUEST, 0, NULL, 0, &ctrls[0]); if (ret != LDAP_SUCCESS && ret != LDAP_NOT_SUPPORTED) { - DEBUG(1, ("sdap_control_create failed to create " - "Password Policy control.\n")); + DEBUG(1, "sdap_control_create failed to create " + "Password Policy control.\n"); ret = ERR_INTERNAL; goto fail; } request_controls = ctrls; - DEBUG(4, ("Executing extended operation\n")); + DEBUG(4, "Executing extended operation\n"); ret = ldap_extended_operation(state->sh->ldap, LDAP_EXOP_MODIFY_PASSWD, bv, request_controls, NULL, &msgid); ber_bvfree(bv); if (ctrls[0]) ldap_control_free(ctrls[0]); if (ret == -1 || msgid == -1) { - DEBUG(1, ("ldap_extended_operation failed\n")); + DEBUG(1, "ldap_extended_operation failed\n"); ret = ERR_NETWORK_IO; goto fail; } - DEBUG(8, ("ldap_extended_operation sent, msgid = %d\n", msgid)); + DEBUG(8, "ldap_extended_operation sent, msgid = %d\n", msgid); /* FIXME: get timeouts from configuration, for now 5 secs. */ ret = sdap_op_add(state, ev, state->sh, msgid, sdap_exop_modify_passwd_done, req, 5, &state->op); if (ret) { - DEBUG(1, ("Failed to set up operation!\n")); + DEBUG(1, "Failed to set up operation!\n"); ret = ERR_INTERNAL; goto fail; } @@ -612,17 +612,17 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op, &result, NULL, &errmsg, NULL, &response_controls, 0); if (ret != LDAP_SUCCESS) { - DEBUG(2, ("ldap_parse_result failed (%d)\n", state->op->msgid)); + DEBUG(2, "ldap_parse_result failed (%d)\n", state->op->msgid); ret = ERR_INTERNAL; goto done; } if (response_controls == NULL) { - DEBUG(5, ("Server returned no controls.\n")); + DEBUG(5, "Server returned no controls.\n"); } else { for (c = 0; response_controls[c] != NULL; c++) { - DEBUG(9, ("Server returned control [%s].\n", - response_controls[c]->ldctl_oid)); + DEBUG(9, "Server returned control [%s].\n", + response_controls[c]->ldctl_oid); if (strcmp(response_controls[c]->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) == 0) { ret = ldap_parse_passwordpolicy_control(state->sh->ldap, @@ -630,20 +630,20 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op, &pp_expire, &pp_grace, &pp_error); if (ret != LDAP_SUCCESS) { - DEBUG(1, ("ldap_parse_passwordpolicy_control failed.\n")); + DEBUG(1, "ldap_parse_passwordpolicy_control failed.\n"); ret = ERR_NETWORK_IO; goto done; } - DEBUG(7, ("Password Policy Response: expire [%d] grace [%d] " + DEBUG(7, "Password Policy Response: expire [%d] grace [%d] " "error [%s].\n", pp_expire, pp_grace, - ldap_passwordpolicy_err2txt(pp_error))); + ldap_passwordpolicy_err2txt(pp_error)); } } } - DEBUG(3, ("ldap_extended_operation result: %s(%d), %s\n", - sss_ldap_err2string(result), result, errmsg)); + DEBUG(3, "ldap_extended_operation result: %s(%d), %s\n", + sss_ldap_err2string(result), result, errmsg); switch (result) { case LDAP_SUCCESS: @@ -653,7 +653,7 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op, state->user_error_message = talloc_strdup(state, "Please make sure the password meets the complexity constraints."); if (state->user_error_message == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup failed\n"); ret = ENOMEM; goto done; } @@ -664,7 +664,7 @@ static void sdap_exop_modify_passwd_done(struct sdap_op *op, if (errmsg) { state->user_error_message = talloc_strdup(state, errmsg); if (state->user_error_message == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); ret = ENOMEM; goto done; } @@ -763,14 +763,14 @@ sdap_modify_shadow_lastchange_send(TALLOC_CTX *mem_ctx, ret = ldap_modify_ext(state->sh->ldap, state->dn, state->mods, NULL, NULL, &msgid); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to send operation!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to send operation!\n"); goto done; } ret = sdap_op_add(state, state->ev, state->sh, msgid, sdap_modify_shadow_lastchange_done, req, 5, &state->op); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to set up operation!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to set up operation!\n"); goto done; } @@ -803,15 +803,15 @@ static void sdap_modify_shadow_lastchange_done(struct sdap_op *op, &result, NULL, &errmsg, NULL, NULL, 0); if (lret != LDAP_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("ldap_parse_result failed (%d)\n", - state->op->msgid)); + DEBUG(SSSDBG_OP_FAILURE, "ldap_parse_result failed (%d)\n", + state->op->msgid); ret = EIO; goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Updating lastPwdChange result: %s(%d), %s\n", + DEBUG(SSSDBG_TRACE_LIBS, "Updating lastPwdChange result: %s(%d), %s\n", sss_ldap_err2string(result), - result, errmsg)); + result, errmsg); done: ldap_memfree(errmsg); @@ -866,7 +866,7 @@ struct tevent_req *sdap_get_rootdse_send(TALLOC_CTX *memctx, NULL }; - DEBUG(9, ("Getting rootdse\n")); + DEBUG(9, "Getting rootdse\n"); req = tevent_req_create(memctx, &state, struct sdap_get_rootdse_state); if (!req) return NULL; @@ -916,15 +916,15 @@ static void sdap_get_rootdse_done(struct tevent_req *subreq) } if (num_results == 0 || !results) { - DEBUG(2, ("RootDSE could not be retrieved. " + DEBUG(2, "RootDSE could not be retrieved. " "Please check that anonymous access to RootDSE is allowed\n" - )); + ); tevent_req_error(req, ENOENT); return; } if (num_results > 1) { - DEBUG(2, ("Multiple replies when searching for RootDSE ??\n")); + DEBUG(2, "Multiple replies when searching for RootDSE ??\n"); tevent_req_error(req, EIO); return; } @@ -932,7 +932,7 @@ static void sdap_get_rootdse_done(struct tevent_req *subreq) state->rootdse = talloc_steal(state, results[0]); talloc_zfree(results); - DEBUG(SSSDBG_TRACE_INTERNAL, ("Got rootdse\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Got rootdse\n"); /* Auto-detect the ldap matching rule if requested */ if ((!dp_opt_get_bool(state->opts->basic, @@ -944,13 +944,13 @@ static void sdap_get_rootdse_done(struct tevent_req *subreq) * lookup. */ DEBUG(SSSDBG_TRACE_INTERNAL, - ("Skipping auto-detection of match rule\n")); + "Skipping auto-detection of match rule\n"); tevent_req_done(req); return; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("Auto-detecting support for match rule\n")); + "Auto-detecting support for match rule\n"); /* Create a filter using the matching rule. It need not point * at any valid data. We're only going to be looking for the @@ -997,16 +997,16 @@ static void sdap_get_matching_rule_done(struct tevent_req *subreq) state->opts->support_matching_rule = false; } else { DEBUG(SSSDBG_MINOR_FAILURE, - ("Unexpected error while testing for matching rule support\n")); + "Unexpected error while testing for matching rule support\n"); tevent_req_error(req, ret); return; } DEBUG(SSSDBG_CONF_SETTINGS, - ("LDAP server %s the matching rule extension\n", + "LDAP server %s the matching rule extension\n", state->opts->support_matching_rule ? "supports" - : "does not support")); + : "does not support"); tevent_req_done(req); } @@ -1042,7 +1042,7 @@ static errno_t add_to_reply(TALLOC_CTX *mem_ctx, struct sysdb_attrs *, sreply->reply_max); if (sreply->reply == NULL) { - DEBUG(1, ("talloc_realloc failed.\n")); + DEBUG(1, "talloc_realloc failed.\n"); return ENOMEM; } } @@ -1075,7 +1075,7 @@ static errno_t add_to_deref_reply(TALLOC_CTX *mem_ctx, struct sdap_deref_attrs *, dreply->reply_max); if (dreply->reply == NULL) { - DEBUG(1, ("talloc_realloc failed.\n")); + DEBUG(1, "talloc_realloc failed.\n"); return ENOMEM; } } @@ -1170,7 +1170,7 @@ sdap_get_generic_ext_send(TALLOC_CTX *memctx, if (state->sh == NULL || state->sh->ldap == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Trying LDAP search while not connected.\n")); + "Trying LDAP search while not connected.\n"); tevent_req_error(req, EIO); tevent_req_post(req, ev); return req; @@ -1252,15 +1252,15 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req) talloc_zfree(state->op); DEBUG(SSSDBG_TRACE_FUNC, - ("calling ldap_search_ext with [%s][%s].\n", + "calling ldap_search_ext with [%s][%s].\n", state->filter ? state->filter : "no filter", - state->search_base)); + state->search_base); if (DEBUG_IS_SET(SSSDBG_TRACE_LIBS)) { int i; if (state->attrs) { for (i = 0; state->attrs[i]; i++) { - DEBUG(7, ("Requesting attrs: [%s]\n", state->attrs[i])); + DEBUG(7, "Requesting attrs: [%s]\n", state->attrs[i]); } } } @@ -1294,13 +1294,13 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req) ldap_control_free(page_control); state->serverctrls[state->nserverctrls] = NULL; if (lret != LDAP_SUCCESS) { - DEBUG(3, ("ldap_search_ext failed: %s\n", sss_ldap_err2string(lret))); + DEBUG(3, "ldap_search_ext failed: %s\n", sss_ldap_err2string(lret)); if (lret == LDAP_SERVER_DOWN) { ret = ETIMEDOUT; optret = sss_ldap_get_diagnostic_msg(state, state->sh->ldap, &errmsg); if (optret == LDAP_SUCCESS) { - DEBUG(3, ("Connection error: %s\n", errmsg)); + DEBUG(3, "Connection error: %s\n", errmsg); sss_log(SSS_LOG_ERR, "LDAP connection error: %s", errmsg); } else { @@ -1314,14 +1314,14 @@ static errno_t sdap_get_generic_ext_step(struct tevent_req *req) } goto done; } - DEBUG(8, ("ldap_search_ext called, msgid = %d\n", msgid)); + DEBUG(8, "ldap_search_ext called, msgid = %d\n", msgid); ret = sdap_op_add(state, state->ev, state->sh, msgid, sdap_get_generic_ext_done, req, state->timeout, &state->op); if (ret != EOK) { - DEBUG(1, ("Failed to set up operation!\n")); + DEBUG(1, "Failed to set up operation!\n"); goto done; } @@ -1362,7 +1362,7 @@ static void sdap_get_generic_ext_done(struct sdap_op *op, case LDAP_RES_SEARCH_ENTRY: ret = state->parse_cb(state->sh, reply, state->cb_data); if (ret != EOK) { - DEBUG(1, ("reply parsing callback failed.\n")); + DEBUG(1, "reply parsing callback failed.\n"); tevent_req_error(req, ret); return; } @@ -1375,19 +1375,19 @@ static void sdap_get_generic_ext_done(struct sdap_op *op, &result, NULL, &errmsg, NULL, &returned_controls, 0); if (ret != LDAP_SUCCESS) { - DEBUG(2, ("ldap_parse_result failed (%d)\n", state->op->msgid)); + DEBUG(2, "ldap_parse_result failed (%d)\n", state->op->msgid); tevent_req_error(req, EIO); return; } - DEBUG(6, ("Search result: %s(%d), %s\n", + DEBUG(6, "Search result: %s(%d), %s\n", sss_ldap_err2string(result), result, - errmsg ? errmsg : "no errmsg set")); + errmsg ? errmsg : "no errmsg set"); if (result == LDAP_SIZELIMIT_EXCEEDED) { /* Try to return what we've got */ DEBUG(SSSDBG_MINOR_FAILURE, - ("LDAP sizelimit was exceeded, returning incomplete data\n")); + "LDAP sizelimit was exceeded, returning incomplete data\n"); } else if (result == LDAP_INAPPROPRIATE_MATCHING) { /* This error should only occur when we're testing for * specialized functionality like the ldap matching rule @@ -1395,8 +1395,8 @@ static void sdap_get_generic_ext_done(struct sdap_op *op, * level and return EIO. */ DEBUG(SSSDBG_TRACE_INTERNAL, - ("LDAP_INAPPROPRIATE_MATCHING: %s\n", - errmsg ? errmsg : "no errmsg set")); + "LDAP_INAPPROPRIATE_MATCHING: %s\n", + errmsg ? errmsg : "no errmsg set"); ldap_memfree(errmsg); tevent_req_error(req, EIO); return; @@ -1406,9 +1406,9 @@ static void sdap_get_generic_ext_done(struct sdap_op *op, return; } else if (result != LDAP_SUCCESS && result != LDAP_NO_SUCH_OBJECT) { DEBUG(SSSDBG_OP_FAILURE, - ("Unexpected result from ldap: %s(%d), %s\n", + "Unexpected result from ldap: %s(%d), %s\n", sss_ldap_err2string(result), result, - errmsg ? errmsg : "no errmsg set")); + errmsg ? errmsg : "no errmsg set"); ldap_memfree(errmsg); tevent_req_error(req, EIO); return; @@ -1428,11 +1428,11 @@ static void sdap_get_generic_ext_done(struct sdap_op *op, &total_count, &cookie); ldap_controls_free(returned_controls); if (lret != LDAP_SUCCESS) { - DEBUG(1, ("Could not determine page control")); + DEBUG(1, "Could not determine page control"); tevent_req_error(req, EIO); return; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Total count [%d]\n", total_count)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Total count [%d]\n", total_count); if (cookie.bv_val != NULL && cookie.bv_len > 0) { /* Cookie contains data, which means there are more requests @@ -1546,14 +1546,14 @@ static errno_t sdap_get_generic_parse_entry(struct sdap_handle *sh, state->map, state->map_num_attrs, &attrs, NULL, disable_range_rtrvl); if (ret != EOK) { - DEBUG(3, ("sdap_parse_entry failed [%d]: %s\n", ret, strerror(ret))); + DEBUG(3, "sdap_parse_entry failed [%d]: %s\n", ret, strerror(ret)); return ret; } ret = add_to_reply(state, &state->sreply, attrs); if (ret != EOK) { talloc_free(attrs); - DEBUG(1, ("add_to_reply failed.\n")); + DEBUG(1, "add_to_reply failed.\n"); return ret; } @@ -1570,8 +1570,8 @@ static void sdap_get_generic_done(struct tevent_req *subreq) ret = sdap_get_generic_ext_recv(subreq); talloc_zfree(subreq); if (ret) { - DEBUG(4, ("sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(4, "sdap_get_generic_ext_recv failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -1647,12 +1647,12 @@ sdap_x_deref_search_send(TALLOC_CTX *memctx, struct tevent_context *ev, ret = sdap_x_deref_create_control(sh, deref_attr, attrs, &state->ctrls[0]); if (ret != EOK) { - DEBUG(1, ("Could not create OpenLDAP deref control\n")); + DEBUG(1, "Could not create OpenLDAP deref control\n"); talloc_zfree(req); return NULL; } - DEBUG(6, ("Dereferencing entry [%s] using OpenLDAP deref\n", base_dn)); + DEBUG(6, "Dereferencing entry [%s] using OpenLDAP deref\n", base_dn); subreq = sdap_get_generic_ext_send(state, ev, opts, sh, base_dn, LDAP_SCOPE_BASE, NULL, attrs, false, state->ctrls, NULL, 0, timeout, @@ -1683,8 +1683,8 @@ static int sdap_x_deref_create_control(struct sdap_handle *sh, ret = ldap_create_deref_control_value(sh->ldap, ds, &derefval); if (ret != LDAP_SUCCESS) { - DEBUG(1, ("sss_ldap_control_create failed: %s\n", - ldap_err2string(ret))); + DEBUG(1, "sss_ldap_control_create failed: %s\n", + ldap_err2string(ret)); return ret; } @@ -1692,7 +1692,7 @@ static int sdap_x_deref_create_control(struct sdap_handle *sh, 1, &derefval, 1, ctrl); ldap_memfree(derefval.bv_val); if (ret != EOK) { - DEBUG(1, ("sss_ldap_control_create failed\n")); + DEBUG(1, "sss_ldap_control_create failed\n"); return ret; } @@ -1720,12 +1720,12 @@ static errno_t sdap_x_deref_parse_entry(struct sdap_handle *sh, ret = ldap_get_entry_controls(state->sh->ldap, msg->msg, &ctrls); if (ret != LDAP_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("ldap_parse_result failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "ldap_parse_result failed\n"); goto done; } if (!ctrls) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No controls found for entry\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No controls found for entry\n"); ret = ENOENT; goto done; } @@ -1734,20 +1734,20 @@ static errno_t sdap_x_deref_parse_entry(struct sdap_handle *sh, derefctrl = ldap_control_find(LDAP_CONTROL_X_DEREF, ctrls, NULL); if (!derefctrl) { - DEBUG(SSSDBG_FUNC_DATA, ("No deref controls found\n")); + DEBUG(SSSDBG_FUNC_DATA, "No deref controls found\n"); ret = EOK; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Got deref control\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Got deref control\n"); ret = ldap_parse_derefresponse_control(state->sh->ldap, derefctrl, &deref_res); if (ret != LDAP_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, - ("ldap_parse_derefresponse_control failed: %s\n", - ldap_err2string(ret))); + "ldap_parse_derefresponse_control failed: %s\n", + ldap_err2string(ret)); goto done; } @@ -1755,21 +1755,21 @@ static errno_t sdap_x_deref_parse_entry(struct sdap_handle *sh, ret = sdap_parse_deref(tmp_ctx, state->maps, state->num_maps, dref, &res); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_parse_deref failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_parse_deref failed [%d]: %s\n", + ret, strerror(ret)); goto done; } ret = add_to_deref_reply(state, state->num_maps, &state->dreply, res); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("add_to_deref_reply failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "add_to_deref_reply failed.\n"); goto done; } } DEBUG(SSSDBG_TRACE_FUNC, - ("All deref results from a single control parsed\n")); + "All deref results from a single control parsed\n"); ldap_derefresponse_free(deref_res); deref_res = NULL; @@ -1790,8 +1790,8 @@ static void sdap_x_deref_search_done(struct tevent_req *subreq) ret = sdap_get_generic_ext_recv(subreq); talloc_zfree(subreq); if (ret) { - DEBUG(4, ("sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(4, "sdap_get_generic_ext_recv failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -1875,11 +1875,11 @@ sdap_asq_search_send(TALLOC_CTX *memctx, struct tevent_context *ev, ret = sdap_asq_search_create_control(sh, deref_attr, &state->ctrls[0]); if (ret != EOK) { talloc_zfree(req); - DEBUG(1, ("Could not create ASQ control\n")); + DEBUG(1, "Could not create ASQ control\n"); return NULL; } - DEBUG(6, ("Dereferencing entry [%s] using ASQ\n", base_dn)); + DEBUG(6, "Dereferencing entry [%s] using ASQ\n", base_dn); subreq = sdap_get_generic_ext_send(state, ev, opts, sh, base_dn, LDAP_SCOPE_BASE, NULL, attrs, false, state->ctrls, NULL, 0, timeout, @@ -1905,13 +1905,13 @@ static int sdap_asq_search_create_control(struct sdap_handle *sh, ber = ber_alloc_t(LBER_USE_DER); if (ber == NULL) { - DEBUG(2, ("ber_alloc_t failed.\n")); + DEBUG(2, "ber_alloc_t failed.\n"); return ENOMEM; } ret = ber_printf(ber, "{s}", attr); if (ret == -1) { - DEBUG(2, ("ber_printf failed.\n")); + DEBUG(2, "ber_printf failed.\n"); ber_free(ber, 1); return EIO; } @@ -1919,14 +1919,14 @@ static int sdap_asq_search_create_control(struct sdap_handle *sh, ret = ber_flatten(ber, &asqval); ber_free(ber, 1); if (ret == -1) { - DEBUG(1, ("ber_flatten failed.\n")); + DEBUG(1, "ber_flatten failed.\n"); return EIO; } ret = sdap_control_create(sh, LDAP_SERVER_ASQ_OID, 1, asqval, 1, ctrl); ber_bvfree(asqval); if (ret != EOK) { - DEBUG(1, ("sdap_control_create failed\n")); + DEBUG(1, "sdap_control_create failed\n"); return ret; } @@ -1988,7 +1988,7 @@ static errno_t sdap_asq_search_parse_entry(struct sdap_handle *sh, vals = ldap_get_values_len(sh->ldap, msg->msg, "objectClass"); if (!vals) { DEBUG(SSSDBG_OP_FAILURE, - ("Unknown entry type, no objectClass found for DN [%s]!\n", dn)); + "Unknown entry type, no objectClass found for DN [%s]!\n", dn); ret = EINVAL; goto done; } @@ -2000,8 +2000,8 @@ static errno_t sdap_asq_search_parse_entry(struct sdap_handle *sh, vals[i]->bv_val, vals[i]->bv_len) == 0) { /* it's an entry of the right type */ DEBUG(SSSDBG_TRACE_INTERNAL, - ("Matched objectclass [%s] on DN [%s], will use associated map\n", - state->maps[mi].map[0].name, dn)); + "Matched objectclass [%s] on DN [%s], will use associated map\n", + state->maps[mi].map[0].name, dn); map = state->maps[mi].map; num_attrs = state->maps[mi].num_attrs; break; @@ -2009,8 +2009,8 @@ static errno_t sdap_asq_search_parse_entry(struct sdap_handle *sh, } if (!map) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("DN [%s] did not match the objectClass [%s]\n", - dn, state->maps[mi].map[0].name)); + "DN [%s] did not match the objectClass [%s]\n", + dn, state->maps[mi].map[0].name); continue; } @@ -2021,7 +2021,7 @@ static errno_t sdap_asq_search_parse_entry(struct sdap_handle *sh, map, num_attrs, &res[mi]->attrs, NULL, disable_range_rtrvl); if (ret != EOK) { - DEBUG(3, ("sdap_parse_entry failed [%d]: %s\n", ret, strerror(ret))); + DEBUG(3, "sdap_parse_entry failed [%d]: %s\n", ret, strerror(ret)); goto done; } } @@ -2030,7 +2030,7 @@ static errno_t sdap_asq_search_parse_entry(struct sdap_handle *sh, ret = add_to_deref_reply(state, state->num_maps, &state->dreply, res); if (ret != EOK) { - DEBUG(1, ("add_to_deref_reply failed.\n")); + DEBUG(1, "add_to_deref_reply failed.\n"); goto done; } @@ -2049,8 +2049,8 @@ static void sdap_asq_search_done(struct tevent_req *subreq) ret = sdap_get_generic_ext_recv(subreq); talloc_zfree(subreq); if (ret) { - DEBUG(4, ("sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(4, "sdap_get_generic_ext_recv failed [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -2163,8 +2163,8 @@ static errno_t sdap_posix_check_next(struct tevent_req *req) tevent_req_data(req, struct sdap_posix_check_state); DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for POSIX attributes with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for POSIX attributes with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_ext_send(state, state->ev, state->opts, state->sh, @@ -2195,10 +2195,10 @@ static errno_t sdap_posix_check_parse(struct sdap_handle *sh, dn = ldap_get_dn(sh->ldap, msg->msg); if (dn == NULL) { DEBUG(SSSDBG_TRACE_LIBS, - ("Search did not find any entry with POSIX attributes\n")); + "Search did not find any entry with POSIX attributes\n"); goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Found [%s] with POSIX attributes\n", dn)); + DEBUG(SSSDBG_TRACE_LIBS, "Found [%s] with POSIX attributes\n", dn); ldap_memfree(dn); vals = ldap_get_values_len(sh->ldap, msg->msg, @@ -2207,13 +2207,13 @@ static errno_t sdap_posix_check_parse(struct sdap_handle *sh, vals = ldap_get_values_len(sh->ldap, msg->msg, state->opts->group_map[SDAP_AT_GROUP_GID].name); if (vals == NULL) { - DEBUG(SSSDBG_TRACE_LIBS, ("Entry does not have POSIX attrs?\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Entry does not have POSIX attrs?\n"); goto done; } } if (vals[0] == NULL) { - DEBUG(SSSDBG_TRACE_LIBS, ("No value for POSIX attr\n")); + DEBUG(SSSDBG_TRACE_LIBS, "No value for POSIX attr\n"); goto done; } @@ -2221,7 +2221,7 @@ static errno_t sdap_posix_check_parse(struct sdap_handle *sh, strtouint32(vals[0]->bv_val, &endptr, 10); if (errno || *endptr || (vals[0]->bv_val == endptr)) { DEBUG(SSSDBG_OP_FAILURE, - ("POSIX attribute is not a number: %s\n", vals[0]->bv_val)); + "POSIX attribute is not a number: %s\n", vals[0]->bv_val); goto done; } @@ -2243,15 +2243,15 @@ static void sdap_posix_check_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_get_generic_ext_recv failed [%d]: %s\n", - ret, strerror(ret))); + "sdap_get_generic_ext_recv failed [%d]: %s\n", + ret, strerror(ret)); tevent_req_error(req, ret); return; } /* Positive hit is definitve, no need to search other bases */ if (state->has_posix == true) { - DEBUG(SSSDBG_FUNC_DATA, ("Server has POSIX attributes\n")); + DEBUG(SSSDBG_FUNC_DATA, "Server has POSIX attributes\n"); tevent_req_done(req); return; } @@ -2267,7 +2267,7 @@ static void sdap_posix_check_done(struct tevent_req *subreq) } /* All bases done! */ - DEBUG(SSSDBG_TRACE_LIBS, ("Cycled through all bases\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Cycled through all bases\n"); tevent_req_done(req); } @@ -2322,29 +2322,29 @@ sdap_deref_search_send(TALLOC_CTX *memctx, state->reply = NULL; if (sdap_is_control_supported(sh, LDAP_SERVER_ASQ_OID)) { - DEBUG(8, ("Server supports ASQ\n")); + DEBUG(8, "Server supports ASQ\n"); state->deref_type = SDAP_DEREF_ASQ; subreq = sdap_asq_search_send(state, ev, opts, sh, base_dn, deref_attr, attrs, maps, num_maps, timeout); if (!subreq) { - DEBUG(2, ("Cannot start ASQ search\n")); + DEBUG(2, "Cannot start ASQ search\n"); goto fail; } } else if (sdap_is_control_supported(sh, LDAP_CONTROL_X_DEREF)) { - DEBUG(8, ("Server supports OpenLDAP deref\n")); + DEBUG(8, "Server supports OpenLDAP deref\n"); state->deref_type = SDAP_DEREF_OPENLDAP; subreq = sdap_x_deref_search_send(state, ev, opts, sh, base_dn, deref_attr, attrs, maps, num_maps, timeout); if (!subreq) { - DEBUG(2, ("Cannot start OpenLDAP deref search\n")); + DEBUG(2, "Cannot start OpenLDAP deref search\n"); goto fail; } } else { - DEBUG(2, ("Server does not support any known deref method!\n")); + DEBUG(2, "Server does not support any known deref method!\n"); goto fail; } @@ -2374,14 +2374,14 @@ static void sdap_deref_search_done(struct tevent_req *subreq) &state->reply_count, &state->reply); break; default: - DEBUG(1, ("Unknown deref method\n")); + DEBUG(1, "Unknown deref method\n"); tevent_req_error(req, EINVAL); return; } talloc_zfree(subreq); if (ret != EOK) { - DEBUG(2, ("dereference processing failed [%d]: %s\n", ret, strerror(ret))); + DEBUG(2, "dereference processing failed [%d]: %s\n", ret, strerror(ret)); if (ret == ENOTSUP) { sss_log(SSS_LOG_WARNING, "LDAP server claims to support deref, but deref search failed. " @@ -2434,8 +2434,8 @@ bool sdap_has_deref_support(struct sdap_handle *sh, struct sdap_options *opts) for (i=0; deref_oids[i][0]; i++) { if (sdap_is_control_supported(sh, deref_oids[i][0])) { - DEBUG(6, ("The server supports deref method %s\n", - deref_oids[i][1])); + DEBUG(6, "The server supports deref method %s\n", + deref_oids[i][1]); return true; } } @@ -2459,20 +2459,20 @@ sdap_attrs_add_ldap_attr(struct sysdb_attrs *ldap_attrs, ret = sysdb_attrs_get_el(ldap_attrs, attr_name, &el); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get %s from the " + DEBUG(SSSDBG_OP_FAILURE, "Could not get %s from the " "list of the LDAP attributes [%d]: %s\n", - attr_name, ret, strerror(ret))); + attr_name, ret, strerror(ret)); return ret; } if (el->num_values == 0) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("%s is not available " - "for [%s].\n", desc, objname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "%s is not available " + "for [%s].\n", desc, objname); } else { num_values = multivalued ? el->num_values : 1; for (i = 0; i < num_values; i++) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding %s [%s] to attributes " - "of [%s].\n", desc, el->values[i].data, objname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Adding %s [%s] to attributes " + "of [%s].\n", desc, el->values[i].data, objname); ret = sysdb_attrs_add_mem(attrs, attr_name, el->values[i].data, el->values[i].length); @@ -2507,7 +2507,7 @@ sdap_save_all_names(const char *name, ret = sysdb_attrs_get_aliases(tmp_ctx, ldap_attrs, name, lowercase, &aliases); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get the alias list")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get the alias list"); goto done; } @@ -2521,16 +2521,16 @@ sdap_save_all_names(const char *name, if (lowercase) { ret = sysdb_attrs_add_lc_name_alias(attrs, domname); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to add lower-cased version " + DEBUG(SSSDBG_OP_FAILURE, "Failed to add lower-cased version " "of alias [%s] into the " - "attribute list\n", aliases[i])); + "attribute list\n", aliases[i]); goto done; } } else { ret = sysdb_attrs_add_string(attrs, SYSDB_NAME_ALIAS, domname); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to add alias [%s] into the " - "attribute list\n", aliases[i])); + DEBUG(SSSDBG_OP_FAILURE, "Failed to add alias [%s] into the " + "attribute list\n", aliases[i]); goto done; } } diff --git a/src/providers/ldap/sdap_async_autofs.c b/src/providers/ldap/sdap_async_autofs.c index 4886150f9..980ea7219 100644 --- a/src/providers/ldap/sdap_async_autofs.c +++ b/src/providers/ldap/sdap_async_autofs.c @@ -62,7 +62,7 @@ get_autofs_entry_attr(struct sysdb_attrs *entry, struct sdap_options *opts, if (ret) return NULL; if (el->num_values != 1) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Expected one entry got %d\n", el->num_values)); + "Expected one entry got %d\n", el->num_values); return NULL; } @@ -93,13 +93,13 @@ add_autofs_entry(struct sysdb_ctx *sysdb, key = get_autofs_entry_key(entry, opts); if (!key) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get autofs entry key\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not get autofs entry key\n"); return EINVAL; } value = get_autofs_entry_value(entry, opts); if (!value) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get autofs entry value\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not get autofs entry value\n"); return EINVAL; } @@ -132,30 +132,30 @@ save_autofs_entries(struct sysdb_ctx *sysdb, hret = hash_lookup(entry_hash, &key, &value); if (hret != HASH_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot retrieve entry [%s] from hash\n", add_dn_list[i])); + "Cannot retrieve entry [%s] from hash\n", add_dn_list[i]); continue; } entry = talloc_get_type(value.ptr, struct sysdb_attrs); if (!entry) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot retrieve entry [%s] from ptr\n", add_dn_list[i])); + "Cannot retrieve entry [%s] from ptr\n", add_dn_list[i]); continue; } DEBUG(SSSDBG_TRACE_FUNC, - ("Saving autofs entry [%s]\n", add_dn_list[i])); + "Saving autofs entry [%s]\n", add_dn_list[i]); ret = add_autofs_entry(sysdb, domain, map, opts, entry); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot save entry [%s] to cache\n", add_dn_list[i])); + "Cannot save entry [%s] to cache\n", add_dn_list[i]); continue; } - DEBUG(SSSDBG_TRACE_FUNC, ("Saved entry [%s]\n", add_dn_list[i])); + DEBUG(SSSDBG_TRACE_FUNC, "Saved entry [%s]\n", add_dn_list[i]); } - DEBUG(SSSDBG_TRACE_INTERNAL, ("All entries saved\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "All entries saved\n"); return EOK; } @@ -170,17 +170,17 @@ del_autofs_entries(struct sysdb_ctx *sysdb, for (i=0; del_dn_list[i]; i++) { DEBUG(SSSDBG_TRACE_FUNC, - ("Removing autofs entry [%s]\n", del_dn_list[i])); + "Removing autofs entry [%s]\n", del_dn_list[i]); ret = sysdb_del_autofsentry(sysdb, del_dn_list[i]); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot delete entry %s\n", del_dn_list[i])); + "Cannot delete entry %s\n", del_dn_list[i]); continue; } } - DEBUG(SSSDBG_TRACE_INTERNAL, ("All entries removed\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "All entries removed\n"); return EOK; } @@ -267,7 +267,7 @@ automntmaps_process_members_send(TALLOC_CTX *mem_ctx, opts->autofs_entry_map[SDAP_AT_AUTOFS_ENTRY_KEY].name, opts->autofs_entry_map[SDAP_OC_AUTOFS_ENTRY].name); if (!state->base_filter) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to build filter\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to build filter\n"); ret = ENOMEM; goto immediate; } @@ -276,7 +276,7 @@ automntmaps_process_members_send(TALLOC_CTX *mem_ctx, SDAP_OPTS_AUTOFS_ENTRY, NULL, &state->attrs, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to build attributes from map\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to build attributes from map\n"); ret = ENOMEM; goto immediate; } @@ -284,17 +284,17 @@ automntmaps_process_members_send(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(state->map, SYSDB_ORIG_DN, &state->orig_dn); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot get originalDN\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get originalDN\n"); goto immediate; } DEBUG(SSSDBG_TRACE_FUNC, - ("Examining autofs map [%s]\n", state->orig_dn)); + "Examining autofs map [%s]\n", state->orig_dn); ret = automntmaps_process_members_next_base(req); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("search failed [%d]: %s\n", ret, strerror(ret))); + "search failed [%d]: %s\n", ret, strerror(ret)); goto immediate; } @@ -326,8 +326,8 @@ automntmaps_process_members_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for automount map entries with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for automount map entries with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, state->orig_dn, @@ -337,7 +337,7 @@ automntmaps_process_members_next_base(struct tevent_req *req) SDAP_OPTS_AUTOFS_ENTRY, state->timeout, true); if (!subreq) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot start search for entries\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot start search for entries\n"); return EIO; } tevent_req_set_callback(subreq, automntmaps_process_members_done, req); @@ -391,11 +391,11 @@ automntmaps_process_members_done(struct tevent_req *subreq) } } - DEBUG(SSSDBG_TRACE_INTERNAL, ("No more search bases to try\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "No more search bases to try\n"); DEBUG(SSSDBG_TRACE_FUNC, - ("Search for autofs entries, returned %zu results.\n", - state->entries_count)); + "Search for autofs entries, returned %zu results.\n", + state->entries_count); tevent_req_done(req); return; @@ -509,8 +509,8 @@ sdap_get_automntmap_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for automount maps with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for automount maps with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -549,7 +549,7 @@ sdap_get_automntmap_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for autofs maps, returned %zu results.\n", state->count)); + "Search for autofs maps, returned %zu results.\n", state->count); if (state->count == 0) { /* No maps found in this search */ @@ -567,12 +567,12 @@ sdap_get_automntmap_process(struct tevent_req *subreq) return; } else if (state->count > 1) { DEBUG(SSSDBG_OP_FAILURE, - ("The search yielded more than one autofs map\n")); + "The search yielded more than one autofs map\n"); tevent_req_error(req, EIO); return; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Processing autofs maps\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Processing autofs maps\n"); subreq = automntmaps_process_members_send(state, state->ev, state->opts, state->sh, state->dom, state->search_bases, @@ -604,7 +604,7 @@ sdap_get_automntmap_done(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_FUNC, ("automount map members received\n")); + DEBUG(SSSDBG_TRACE_FUNC, "automount map members received\n"); tevent_req_done(req); return; } @@ -677,7 +677,7 @@ sdap_autofs_setautomntent_send(TALLOC_CTX *memctx, if (!req) return NULL; if (!mapname) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No map name given\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "No map name given\n"); ret = EINVAL; goto fail; } @@ -699,7 +699,7 @@ sdap_autofs_setautomntent_send(TALLOC_CTX *memctx, clean_mapname, state->opts->autofs_mobject_map[SDAP_OC_AUTOFS_MAP].name); if (!state->filter) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to build filter\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to build filter\n"); ret = ENOMEM; goto fail; } @@ -709,7 +709,7 @@ sdap_autofs_setautomntent_send(TALLOC_CTX *memctx, SDAP_OPTS_AUTOFS_MAP, NULL, &state->attrs, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to build attributes from map\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to build attributes from map\n"); ret = ENOMEM; goto fail; } @@ -722,7 +722,7 @@ sdap_autofs_setautomntent_send(TALLOC_CTX *memctx, dp_opt_get_int(state->opts->basic, SDAP_SEARCH_TIMEOUT)); if (!subreq) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Out of memory\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Out of memory\n"); ret = ENOMEM; goto fail; } @@ -752,11 +752,11 @@ sdap_autofs_setautomntent_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { if (ret == ENOENT) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not find automount map\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not find automount map\n"); } else { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_get_automntmap_recv failed [%d]: %s\n", - ret, strerror(ret))); + "sdap_get_automntmap_recv failed [%d]: %s\n", + ret, strerror(ret)); } tevent_req_error(req, ret); return; @@ -764,7 +764,7 @@ sdap_autofs_setautomntent_done(struct tevent_req *subreq) ret = sdap_autofs_setautomntent_save(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not save automount map\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not save automount map\n"); tevent_req_error(req, ret); return; } @@ -801,7 +801,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) if (!tmp_ctx) return ENOMEM; DEBUG(SSSDBG_TRACE_LIBS, - ("Got %zu map entries from LDAP\n", state->entries_count)); + "Got %zu map entries from LDAP\n", state->entries_count); if (state->entries_count == 0) { /* No entries for this map in LDAP. * We need to ensure that there are no entries @@ -826,7 +826,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) key = get_autofs_entry_key(state->entries[i], state->opts); val = get_autofs_entry_value(state->entries[i], state->opts); if (!key || !val) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Malformed entry, skipping\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Malformed entry, skipping\n"); continue; } @@ -861,12 +861,12 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) &count, &entries); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_OP_FAILURE, - ("cache lookup for the map failed [%d]: %s\n", - ret, strerror(ret))); + "cache lookup for the map failed [%d]: %s\n", + ret, strerror(ret)); goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Got %zu map entries from sysdb\n", count)); + DEBUG(SSSDBG_TRACE_LIBS, "Got %zu map entries from sysdb\n", count); if (count == 0) { /* No map members for this map in sysdb currently */ sysdb_entrylist = NULL; @@ -899,8 +899,8 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot start sysdb transaction [%d]: %s\n", - ret, strerror(ret))); + "Cannot start sysdb transaction [%d]: %s\n", + ret, strerror(ret)); goto done; } in_transaction = true; @@ -909,8 +909,8 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) ret = save_autofs_map(state->sysdb, state->dom, state->opts, state->map); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot save autofs map entry [%d]: %s\n", - ret, strerror(ret))); + "Cannot save autofs map entry [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -921,8 +921,8 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) entry_hash); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot save autofs entries [%d]: %s\n", - ret, strerror(ret))); + "Cannot save autofs entries [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -933,8 +933,8 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) state->mapname, del_entries); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot delete autofs entries [%d]: %s\n", - ret, strerror(ret))); + "Cannot delete autofs entries [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -943,8 +943,8 @@ sdap_autofs_setautomntent_save(struct tevent_req *req) ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot commit sysdb transaction [%d]: %s\n", - ret, strerror(ret))); + "Cannot commit sysdb transaction [%d]: %s\n", + ret, strerror(ret)); goto done; } in_transaction = false; @@ -955,8 +955,8 @@ done: tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot cancel sysdb transaction [%d]: %s\n", - ret, strerror(ret))); + "Cannot cancel sysdb transaction [%d]: %s\n", + ret, strerror(ret)); } } talloc_zfree(tmp_ctx); diff --git a/src/providers/ldap/sdap_async_connection.c b/src/providers/ldap/sdap_async_connection.c index 0a7746088..2494837eb 100644 --- a/src/providers/ldap/sdap_async_connection.c +++ b/src/providers/ldap/sdap_async_connection.c @@ -41,7 +41,7 @@ errno_t deref_string_to_val(const char *str, int *val) } else if (strcasecmp(str, "always") == 0) { *val = LDAP_DEREF_ALWAYS; } else { - DEBUG(1, ("Illegal deref option [%s].\n", str)); + DEBUG(1, "Illegal deref option [%s].\n", str); return EINVAL; } @@ -125,7 +125,7 @@ struct tevent_req *sdap_connect_send(TALLOC_CTX *memctx, timeout); if (subreq == NULL) { ret = ENOMEM; - DEBUG(1, ("sss_ldap_init_send failed.\n")); + DEBUG(1, "sss_ldap_init_send failed.\n"); goto fail; } @@ -164,14 +164,14 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) ret = sss_ldap_init_recv(subreq, &state->sh->ldap, &sd); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(1, ("sdap_async_connect_call request failed.\n")); + DEBUG(1, "sdap_async_connect_call request failed.\n"); tevent_req_error(req, ret); return; } ret = setup_ldap_connection_callbacks(state->sh, state->ev); if (ret != EOK) { - DEBUG(1, ("setup_ldap_connection_callbacks failed.\n")); + DEBUG(1, "setup_ldap_connection_callbacks failed.\n"); goto fail; } @@ -181,7 +181,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) if (sd != -1) { ret = sdap_call_conn_cb(state->uri, sd, state->sh); if (ret != EOK) { - DEBUG(1, ("sdap_call_conn_cb failed.\n")); + DEBUG(1, "sdap_call_conn_cb failed.\n"); goto fail; } } @@ -190,7 +190,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) ver = LDAP_VERSION3; lret = ldap_set_option(state->sh->ldap, LDAP_OPT_PROTOCOL_VERSION, &ver); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set ldap version to 3\n")); + DEBUG(1, "Failed to set ldap version to 3\n"); goto fail; } @@ -198,7 +198,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) * to handle EINTR during poll(). */ ret = ldap_set_option(state->sh->ldap, LDAP_OPT_RESTART, LDAP_OPT_ON); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set restart option.\n")); + DEBUG(1, "Failed to set restart option.\n"); } /* Set Network Timeout */ @@ -206,8 +206,8 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) tv.tv_usec = 0; lret = ldap_set_option(state->sh->ldap, LDAP_OPT_NETWORK_TIMEOUT, &tv); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set network timeout to %d\n", - dp_opt_get_int(state->opts->basic, SDAP_NETWORK_TIMEOUT))); + DEBUG(1, "Failed to set network timeout to %d\n", + dp_opt_get_int(state->opts->basic, SDAP_NETWORK_TIMEOUT)); goto fail; } @@ -216,8 +216,8 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) tv.tv_usec = 0; lret = ldap_set_option(state->sh->ldap, LDAP_OPT_TIMEOUT, &tv); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set default timeout to %d\n", - dp_opt_get_int(state->opts->basic, SDAP_OPT_TIMEOUT))); + DEBUG(1, "Failed to set default timeout to %d\n", + dp_opt_get_int(state->opts->basic, SDAP_OPT_TIMEOUT)); goto fail; } @@ -226,8 +226,8 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) lret = ldap_set_option(state->sh->ldap, LDAP_OPT_REFERRALS, (ldap_referrals ? LDAP_OPT_ON : LDAP_OPT_OFF)); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set referral chasing to %s\n", - (ldap_referrals ? "LDAP_OPT_ON" : "LDAP_OPT_OFF"))); + DEBUG(1, "Failed to set referral chasing to %s\n", + (ldap_referrals ? "LDAP_OPT_ON" : "LDAP_OPT_OFF")); goto fail; } @@ -235,7 +235,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) rebind_proc_params = talloc_zero(state->sh, struct sdap_rebind_proc_params); if (rebind_proc_params == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = ENOMEM; goto fail; } @@ -247,7 +247,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) lret = ldap_set_rebind_proc(state->sh->ldap, sdap_rebind_proc, rebind_proc_params); if (lret != LDAP_SUCCESS) { - DEBUG(1, ("ldap_set_rebind_proc failed.\n")); + DEBUG(1, "ldap_set_rebind_proc failed.\n"); goto fail; } } @@ -257,13 +257,13 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) if (ldap_deref != NULL) { ret = deref_string_to_val(ldap_deref, &ldap_deref_val); if (ret != EOK) { - DEBUG(1, ("deref_string_to_val failed.\n")); + DEBUG(1, "deref_string_to_val failed.\n"); goto fail; } lret = ldap_set_option(state->sh->ldap, LDAP_OPT_DEREF, &ldap_deref_val); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set deref option to %d\n", ldap_deref_val)); + DEBUG(1, "Failed to set deref option to %d\n", ldap_deref_val); goto fail; } @@ -276,9 +276,9 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) if (lret != LDAP_OPT_SUCCESS) { /* Do not fail, just warn into both debug logs and syslog */ DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to set LDAP SASL nocanon option to %s. If your system " + "Failed to set LDAP SASL nocanon option to %s. If your system " "is configured to use SASL, LDAP operations might fail.\n", - sasl_nocanon ? "true" : "false")); + sasl_nocanon ? "true" : "false"); sss_log(SSS_LOG_INFO, "Failed to set LDAP SASL nocanon option to %s. If your system " "is configured to use SASL, LDAP operations might fail.\n", @@ -293,8 +293,8 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) lret = ldap_set_option(state->sh->ldap, LDAP_OPT_X_SASL_SSF_MIN, &ber_sasl_minssf); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to set LDAP MIN SSF option " - "to %d\n", sasl_minssf)); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to set LDAP MIN SSF option " + "to %d\n", sasl_minssf); goto fail; } } @@ -307,21 +307,21 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) return; } - DEBUG(4, ("Executing START TLS\n")); + DEBUG(4, "Executing START TLS\n"); lret = ldap_start_tls(state->sh->ldap, NULL, NULL, &msgid); if (lret != LDAP_SUCCESS) { optret = sss_ldap_get_diagnostic_msg(state, state->sh->ldap, &errmsg); if (optret == LDAP_SUCCESS) { - DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n", + DEBUG(3, "ldap_start_tls failed: [%s] [%s]\n", sss_ldap_err2string(lret), - errmsg)); + errmsg); sss_log(SSS_LOG_ERR, "Could not start TLS. %s", errmsg); } else { - DEBUG(3, ("ldap_start_tls failed: [%s]\n", - sss_ldap_err2string(lret))); + DEBUG(3, "ldap_start_tls failed: [%s]\n", + sss_ldap_err2string(lret)); sss_log(SSS_LOG_ERR, "Could not start TLS. " "Check for certificate issues."); } @@ -335,7 +335,7 @@ static void sdap_sys_connect_done(struct tevent_req *subreq) ret = sdap_op_add(state, state->ev, state->sh, msgid, sdap_connect_done, req, 5, &state->op); if (ret) { - DEBUG(1, ("Failed to set up operation!\n")); + DEBUG(1, "Failed to set up operation!\n"); goto fail; } @@ -376,17 +376,17 @@ static void sdap_connect_done(struct sdap_op *op, ret = ldap_parse_result(state->sh->ldap, state->reply->msg, &state->result, NULL, &errmsg, NULL, NULL, 0); if (ret != LDAP_SUCCESS) { - DEBUG(2, ("ldap_parse_result failed (%d)\n", state->op->msgid)); + DEBUG(2, "ldap_parse_result failed (%d)\n", state->op->msgid); tevent_req_error(req, EIO); return; } - DEBUG(3, ("START TLS result: %s(%d), %s\n", - sss_ldap_err2string(state->result), state->result, errmsg)); + DEBUG(3, "START TLS result: %s(%d), %s\n", + sss_ldap_err2string(state->result), state->result, errmsg); ldap_memfree(errmsg); if (ldap_tls_inplace(state->sh->ldap)) { - DEBUG(9, ("SSL/TLS handler already in place.\n")); + DEBUG(9, "SSL/TLS handler already in place.\n"); tevent_req_done(req); return; } @@ -398,14 +398,14 @@ static void sdap_connect_done(struct sdap_op *op, optret = sss_ldap_get_diagnostic_msg(state, state->sh->ldap, &tlserr); if (optret == LDAP_SUCCESS) { - DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n", + DEBUG(3, "ldap_install_tls failed: [%s] [%s]\n", sss_ldap_err2string(ret), - tlserr)); + tlserr); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. %s", tlserr); } else { - DEBUG(3, ("ldap_install_tls failed: [%s]\n", - sss_ldap_err2string(ret))); + DEBUG(3, "ldap_install_tls failed: [%s]\n", + sss_ldap_err2string(ret)); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. " "Check for certificate issues."); } @@ -468,7 +468,7 @@ struct tevent_req *sdap_connect_host_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_connect_host_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -495,7 +495,7 @@ struct tevent_req *sdap_connect_host_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_FUNC, ("Resolving host %s\n", host)); + DEBUG(SSSDBG_TRACE_FUNC, "Resolving host %s\n", host); subreq = resolv_gethostbyname_send(state, state->ev, resolv_ctx, host, family_order, host_db); @@ -534,19 +534,19 @@ static void sdap_connect_host_resolv_done(struct tevent_req *subreq) ret = resolv_gethostbyname_recv(subreq, state, &status, NULL, &hostent); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to resolve host %s: %s\n", - state->host, resolv_strerror(status))); + DEBUG(SSSDBG_OP_FAILURE, "Failed to resolve host %s: %s\n", + state->host, resolv_strerror(status)); goto done; } sockaddr = resolv_get_sockaddr_address(state, hostent, state->port); if (sockaddr == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("resolv_get_sockaddr_address() failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "resolv_get_sockaddr_address() failed\n"); ret = EIO; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Connecting to %s\n", state->uri)); + DEBUG(SSSDBG_TRACE_FUNC, "Connecting to %s\n", state->uri); subreq = sdap_connect_send(state, state->ev, state->opts, state->uri, sockaddr, state->use_start_tls); @@ -589,12 +589,12 @@ static void sdap_connect_host_done(struct tevent_req *subreq) /* we need to mark handle as connected to allow anonymous bind */ ret = sdap_set_connected(state->sh, state->ev); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_set_connected() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_set_connected() failed\n"); goto done; } } - DEBUG(SSSDBG_TRACE_FUNC, ("Successful connection to %s\n", state->uri)); + DEBUG(SSSDBG_TRACE_FUNC, "Successful connection to %s\n", state->uri); done: if (ret != EOK) { @@ -669,13 +669,13 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx, ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST, 0, NULL, 0, &ctrls[0]); if (ret != LDAP_SUCCESS && ret != LDAP_NOT_SUPPORTED) { - DEBUG(1, ("sss_ldap_control_create failed to create " - "Password Policy control.\n")); + DEBUG(1, "sss_ldap_control_create failed to create " + "Password Policy control.\n"); goto fail; } request_controls = ctrls; - DEBUG(4, ("Executing simple bind as: %s\n", state->user_dn)); + DEBUG(4, "Executing simple bind as: %s\n", state->user_dn); ret = ldap_sasl_bind(state->sh->ldap, state->user_dn, LDAP_SASL_SIMPLE, pw, request_controls, NULL, &msgid); @@ -684,16 +684,16 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx, ret = ldap_get_option(state->sh->ldap, LDAP_OPT_RESULT_CODE, &ldap_err); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("ldap_bind failed (couldn't get ldap error)\n")); + DEBUG(1, "ldap_bind failed (couldn't get ldap error)\n"); ret = LDAP_LOCAL_ERROR; } else { - DEBUG(1, ("ldap_bind failed (%d)[%s]\n", - ldap_err, sss_ldap_err2string(ldap_err))); + DEBUG(1, "ldap_bind failed (%d)[%s]\n", + ldap_err, sss_ldap_err2string(ldap_err)); ret = ldap_err; } goto fail; } - DEBUG(8, ("ldap simple bind sent, msgid = %d\n", msgid)); + DEBUG(8, "ldap simple bind sent, msgid = %d\n", msgid); if (!sh->connected) { ret = sdap_set_connected(sh, ev); @@ -704,7 +704,7 @@ static struct tevent_req *simple_bind_send(TALLOC_CTX *memctx, ret = sdap_op_add(state, ev, sh, msgid, simple_bind_done, req, 5, &state->op); if (ret) { - DEBUG(1, ("Failed to set up operation!\n")); + DEBUG(1, "Failed to set up operation!\n"); goto fail; } @@ -750,7 +750,7 @@ static void simple_bind_done(struct sdap_op *op, &response_controls, 0); if (lret != LDAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("ldap_parse_result failed (%d)\n", state->op->msgid)); + "ldap_parse_result failed (%d)\n", state->op->msgid); ret = ERR_INTERNAL; goto done; } @@ -762,13 +762,13 @@ static void simple_bind_done(struct sdap_op *op, } if (response_controls == NULL) { - DEBUG(SSSDBG_TRACE_LIBS, ("Server returned no controls.\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Server returned no controls.\n"); state->ppolicy = NULL; } else { for (c = 0; response_controls[c] != NULL; c++) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Server returned control [%s].\n", - response_controls[c]->ldctl_oid)); + "Server returned control [%s].\n", + response_controls[c]->ldctl_oid); if (strcmp(response_controls[c]->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) == 0) { lret = ldap_parse_passwordpolicy_control(state->sh->ldap, @@ -777,14 +777,14 @@ static void simple_bind_done(struct sdap_op *op, &pp_error); if (lret != LDAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("ldap_parse_passwordpolicy_control failed.\n")); + "ldap_parse_passwordpolicy_control failed.\n"); ret = ERR_INTERNAL; goto done; } - DEBUG(7, ("Password Policy Response: expire [%d] grace [%d] " + DEBUG(7, "Password Policy Response: expire [%d] grace [%d] " "error [%s].\n", pp_expire, pp_grace, - ldap_passwordpolicy_err2txt(pp_error))); + ldap_passwordpolicy_err2txt(pp_error)); if (!state->ppolicy) state->ppolicy = talloc_zero(state, struct sdap_ppolicy_data); @@ -798,29 +798,29 @@ static void simple_bind_done(struct sdap_op *op, if (pp_error == PP_changeAfterReset) { DEBUG(SSSDBG_TRACE_LIBS, - ("Password was reset. " - "User must set a new password.\n")); + "Password was reset. " + "User must set a new password.\n"); ret = ERR_PASSWORD_EXPIRED; } else if (pp_grace >= 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("Password expired. " + "Password expired. " "[%d] grace logins remaining.\n", - pp_grace)); + pp_grace); } else if (pp_expire > 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("Password will expire in [%d] seconds.\n", - pp_expire)); + "Password will expire in [%d] seconds.\n", + pp_expire); } } else if (result == LDAP_INVALID_CREDENTIALS && pp_error == PP_passwordExpired) { DEBUG(SSSDBG_TRACE_LIBS, - ("Password expired user must set a new password.\n")); + "Password expired user must set a new password.\n"); ret = ERR_PASSWORD_EXPIRED; } } else if (strcmp(response_controls[c]->ldctl_oid, LDAP_CONTROL_PWEXPIRED) == 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("Password expired user must set a new password.\n")); + "Password expired user must set a new password.\n"); ret = ERR_PASSWORD_EXPIRED; } else if (strcmp(response_controls[c]->ldctl_oid, LDAP_CONTROL_PWEXPIRING) == 0) { @@ -850,21 +850,21 @@ static void simple_bind_done(struct sdap_op *op, talloc_zfree(nval); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Couldn't convert control response " - "to an integer [%s].\n", strerror(ret))); + "Couldn't convert control response " + "to an integer [%s].\n", strerror(ret)); goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Password will expire in [%d] seconds.\n", - state->ppolicy->expire)); + "Password will expire in [%d] seconds.\n", + state->ppolicy->expire); } } } - DEBUG(SSSDBG_TRACE_FUNC, ("Bind result: %s(%d), %s\n", + DEBUG(SSSDBG_TRACE_FUNC, "Bind result: %s(%d), %s\n", sss_ldap_err2string(result), result, - errmsg ? errmsg : "no errmsg set")); + errmsg ? errmsg : "no errmsg set"); if (result != LDAP_SUCCESS && ret == EOK) { ret = ERR_AUTH_FAILED; @@ -933,8 +933,8 @@ static struct tevent_req *sasl_bind_send(TALLOC_CTX *memctx, state->sasl_user = sasl_user; state->sasl_cred = sasl_cred; - DEBUG(4, ("Executing sasl bind mech: %s, user: %s\n", - sasl_mech, sasl_user)); + DEBUG(4, "Executing sasl bind mech: %s, user: %s\n", + sasl_mech, sasl_user); /* FIXME: Warning, this is a sync call! * No async variant exist in openldap libraries yet */ @@ -945,14 +945,14 @@ static struct tevent_req *sasl_bind_send(TALLOC_CTX *memctx, (*sdap_sasl_interact), state); if (ret != LDAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("ldap_sasl_bind failed (%d)[%s]\n", - ret, sss_ldap_err2string(ret))); + "ldap_sasl_bind failed (%d)[%s]\n", + ret, sss_ldap_err2string(ret)); optret = sss_ldap_get_diagnostic_msg(state, state->sh->ldap, &diag_msg); if (optret == EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Extended failure message: [%s]\n", diag_msg)); + "Extended failure message: [%s]\n", diag_msg); } talloc_zfree(diag_msg); @@ -1075,12 +1075,12 @@ struct tevent_req *sdap_kinit_send(TALLOC_CTX *memctx, struct sdap_kinit_state *state; int ret; - DEBUG(6, ("Attempting kinit (%s, %s, %s, %d)\n", + DEBUG(6, "Attempting kinit (%s, %s, %s, %d)\n", keytab ? keytab : "default", - principal, realm, lifetime)); + principal, realm, lifetime); if (lifetime < 0 || lifetime > INT32_MAX) { - DEBUG(1, ("Ticket lifetime out of range.\n")); + DEBUG(1, "Ticket lifetime out of range.\n"); return NULL; } @@ -1099,7 +1099,7 @@ struct tevent_req *sdap_kinit_send(TALLOC_CTX *memctx, if (keytab) { ret = setenv("KRB5_KTNAME", keytab, 1); if (ret == -1) { - DEBUG(2, ("Failed to set KRB5_KTNAME to %s\n", keytab)); + DEBUG(2, "Failed to set KRB5_KTNAME to %s\n", keytab); talloc_free(req); return NULL; } @@ -1111,8 +1111,8 @@ struct tevent_req *sdap_kinit_send(TALLOC_CTX *memctx, ret = setenv("KRB5_CANONICALIZE", "false", 1); } if (ret == -1) { - DEBUG(2, ("Failed to set KRB5_CANONICALIZE to %s\n", - ((canonicalize)?"true":"false"))); + DEBUG(2, "Failed to set KRB5_CANONICALIZE to %s\n", + ((canonicalize)?"true":"false")); talloc_free(req); return NULL; } @@ -1132,14 +1132,14 @@ static struct tevent_req *sdap_kinit_next_kdc(struct tevent_req *req) struct sdap_kinit_state *state = tevent_req_data(req, struct sdap_kinit_state); - DEBUG(7, ("Resolving next KDC for service %s\n", state->krb_service_name)); + DEBUG(7, "Resolving next KDC for service %s\n", state->krb_service_name); next_req = be_resolve_server_send(state, state->ev, state->be, state->krb_service_name, state->kdc_srv == NULL ? true : false); if (next_req == NULL) { - DEBUG(1, ("be_resolve_server_send failed.\n")); + DEBUG(1, "be_resolve_server_send failed.\n"); return NULL; } tevent_req_set_callback(next_req, sdap_kinit_kdc_resolved, req); @@ -1165,7 +1165,7 @@ static void sdap_kinit_kdc_resolved(struct tevent_req *subreq) return; } - DEBUG(7, ("KDC resolved, attempting to get TGT...\n")); + DEBUG(7, "KDC resolved, attempting to get TGT...\n"); tgtreq = sdap_get_tgt_send(state, state->ev, state->realm, state->principal, state->keytab, @@ -1198,7 +1198,7 @@ static void sdap_kinit_done(struct tevent_req *subreq) /* The child didn't even respond. Perhaps the KDC is too busy, * retry with another KDC */ DEBUG(SSSDBG_MINOR_FAILURE, - ("Communication with KDC timed out, trying the next one\n")); + "Communication with KDC timed out, trying the next one\n"); be_fo_set_port_status(state->be, state->krb_service_name, state->kdc_srv, PORT_NOT_WORKING); nextreq = sdap_kinit_next_kdc(req); @@ -1208,7 +1208,7 @@ static void sdap_kinit_done(struct tevent_req *subreq) return; } else if (ret != EOK) { /* A severe error while executing the child. Abort the operation. */ - DEBUG(1, ("child failed (%d [%s])\n", ret, strerror(ret))); + DEBUG(1, "child failed (%d [%s])\n", ret, strerror(ret)); tevent_req_error(req, ret); return; } @@ -1216,7 +1216,7 @@ static void sdap_kinit_done(struct tevent_req *subreq) if (result == EOK) { ret = setenv("KRB5CCNAME", ccname, 1); if (ret == -1) { - DEBUG(2, ("Unable to set env. variable KRB5CCNAME!\n")); + DEBUG(2, "Unable to set env. variable KRB5CCNAME!\n"); tevent_req_error(req, ERR_AUTH_FAILED); } @@ -1236,7 +1236,7 @@ static void sdap_kinit_done(struct tevent_req *subreq) } - DEBUG(4, ("Could not get TGT: %d [%s]\n", result, sss_strerror(result))); + DEBUG(4, "Could not get TGT: %d [%s]\n", result, sss_strerror(result)); tevent_req_error(req, ERR_AUTH_FAILED); } @@ -1298,7 +1298,7 @@ struct tevent_req *sdap_auth_send(TALLOC_CTX *memctx, ret = sss_authtok_get_password(authtok, &password, &pwlen); if (ret != EOK) { - DEBUG(1, ("Cannot parse authtok.\n")); + DEBUG(1, "Cannot parse authtok.\n"); tevent_req_error(req, ret); return tevent_req_post(req, ev); } @@ -1333,8 +1333,8 @@ static int sdap_auth_get_authtok(const char *authtok_type, pw->bv_len = authtok.length; pw->bv_val = (char *) authtok.data; } else { - DEBUG(1, ("Authentication token type [%s] is not supported\n", - authtok_type)); + DEBUG(1, "Authentication token type [%s] is not supported\n", + authtok_type); return EINVAL; } @@ -1503,8 +1503,8 @@ static void sdap_cli_resolve_done(struct tevent_req *subreq) } if (use_tls && sdap_is_secure_uri(state->service->uri)) { - DEBUG(8, ("[%s] is a secure channel. No need to run START_TLS\n", - state->service->uri)); + DEBUG(8, "[%s] is a secure channel. No need to run START_TLS\n", + state->service->uri); use_tls = false; } @@ -1628,7 +1628,7 @@ static void sdap_cli_rootdse_done(struct tevent_req *subreq) ret = sdap_cli_use_rootdse(state); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_cli_use_rootdse failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_cli_use_rootdse failed\n"); tevent_req_error(req, ret); return; } @@ -1662,7 +1662,7 @@ static errno_t sdap_cli_use_rootdse(struct sdap_cli_connect_state *state) ret = sdap_set_rootdse_supported_lists(state->rootdse, state->sh); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_set_rootdse_supported_lists failed\n")); + "sdap_set_rootdse_supported_lists failed\n"); return ret; } @@ -1670,7 +1670,7 @@ static errno_t sdap_cli_use_rootdse(struct sdap_cli_connect_state *state) state->opts->sdom); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_set_config_options_with_rootdse failed.\n")); + "sdap_set_config_options_with_rootdse failed.\n"); return ret; } @@ -1682,7 +1682,7 @@ static errno_t sdap_cli_use_rootdse(struct sdap_cli_connect_state *state) state->opts, &state->srv_opts); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_get_server_opts_from_rootdse failed.\n")); + "sdap_get_server_opts_from_rootdse failed.\n"); return ret; } @@ -1738,7 +1738,7 @@ static void sdap_cli_kinit_done(struct tevent_req *subreq) /* We're not able to authenticate to the LDAP server. * There's not much we can do except for going offline */ DEBUG(SSSDBG_TRACE_FUNC, - ("Cannot get a TGT: ret [%d](%s)\n", ret, sss_strerror(ret))); + "Cannot get a TGT: ret [%d](%s)\n", ret, sss_strerror(ret)); tevent_req_error(req, EACCES); return; } @@ -1768,18 +1768,18 @@ static void sdap_cli_auth_step(struct tevent_req *req) */ now = time(NULL); expire_timeout = dp_opt_get_int(state->opts->basic, SDAP_EXPIRE_TIMEOUT); - DEBUG(SSSDBG_CONF_SETTINGS, ("expire timeout is %d\n", expire_timeout)); + DEBUG(SSSDBG_CONF_SETTINGS, "expire timeout is %d\n", expire_timeout); if (!state->sh->expire_time || (state->sh->expire_time > (now + expire_timeout))) { state->sh->expire_time = now + expire_timeout; DEBUG(SSSDBG_TRACE_LIBS, - ("the connection will expire at %ld\n", state->sh->expire_time)); + "the connection will expire at %ld\n", state->sh->expire_time); } if (!state->do_auth || (sasl_mech == NULL && user_dn == NULL)) { DEBUG(SSSDBG_TRACE_LIBS, - ("No authentication requested or SASL auth forced off\n")); + "No authentication requested or SASL auth forced off\n"); tevent_req_done(req); return; } @@ -1794,7 +1794,7 @@ static void sdap_cli_auth_step(struct tevent_req *req) if (authtok_type != NULL) { if (strcasecmp(authtok_type, "password") != 0) { - DEBUG(SSSDBG_TRACE_LIBS, ("Invalid authtoken type\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Invalid authtoken type\n"); tevent_req_error(req, EINVAL); return; } @@ -1893,7 +1893,7 @@ static void sdap_cli_rootdse_auth_done(struct tevent_req *subreq) /* We were able to get rootDSE after authentication */ ret = sdap_cli_use_rootdse(state); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_cli_use_rootdse failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_cli_use_rootdse failed\n"); tevent_req_error(req, ret); return; } @@ -1965,7 +1965,7 @@ static int synchronous_tls_setup(LDAP *ldap) LDAPMessage *result = NULL; TALLOC_CTX *tmp_ctx; - DEBUG(4, ("Executing START TLS\n")); + DEBUG(4, "Executing START TLS\n"); tmp_ctx = talloc_new(NULL); if (!tmp_ctx) return LDAP_NO_MEMORY; @@ -1974,11 +1974,11 @@ static int synchronous_tls_setup(LDAP *ldap) if (lret != LDAP_SUCCESS) { optret = sss_ldap_get_diagnostic_msg(tmp_ctx, ldap, &diag_msg); if (optret == LDAP_SUCCESS) { - DEBUG(3, ("ldap_start_tls failed: [%s] [%s]\n", - sss_ldap_err2string(lret), diag_msg)); + DEBUG(3, "ldap_start_tls failed: [%s] [%s]\n", + sss_ldap_err2string(lret), diag_msg); sss_log(SSS_LOG_ERR, "Could not start TLS. %s", diag_msg); } else { - DEBUG(3, ("ldap_start_tls failed: [%s]\n", sss_ldap_err2string(lret))); + DEBUG(3, "ldap_start_tls failed: [%s]\n", sss_ldap_err2string(lret)); sss_log(SSS_LOG_ERR, "Could not start TLS. " "Check for certificate issues."); } @@ -1988,8 +1988,8 @@ static int synchronous_tls_setup(LDAP *ldap) lret = ldap_result(ldap, msgid, 1, NULL, &result); if (lret != LDAP_RES_EXTENDED) { DEBUG(SSSDBG_OP_FAILURE, - ("Unexpected ldap_result, expected [%lu] got [%d].\n", - LDAP_RES_EXTENDED, lret)); + "Unexpected ldap_result, expected [%lu] got [%d].\n", + LDAP_RES_EXTENDED, lret); lret = LDAP_PARAM_ERROR; goto done; } @@ -1997,16 +1997,16 @@ static int synchronous_tls_setup(LDAP *ldap) lret = ldap_parse_result(ldap, result, &ldaperr, NULL, &errmsg, NULL, NULL, 0); if (lret != LDAP_SUCCESS) { - DEBUG(2, ("ldap_parse_result failed (%d) [%d][%s]\n", msgid, lret, - sss_ldap_err2string(lret))); + DEBUG(2, "ldap_parse_result failed (%d) [%d][%s]\n", msgid, lret, + sss_ldap_err2string(lret)); goto done; } - DEBUG(3, ("START TLS result: %s(%d), %s\n", - sss_ldap_err2string(ldaperr), ldaperr, errmsg)); + DEBUG(3, "START TLS result: %s(%d), %s\n", + sss_ldap_err2string(ldaperr), ldaperr, errmsg); if (ldap_tls_inplace(ldap)) { - DEBUG(9, ("SSL/TLS handler already in place.\n")); + DEBUG(9, "SSL/TLS handler already in place.\n"); lret = LDAP_SUCCESS; goto done; } @@ -2016,12 +2016,12 @@ static int synchronous_tls_setup(LDAP *ldap) optret = sss_ldap_get_diagnostic_msg(tmp_ctx, ldap, &diag_msg); if (optret == LDAP_SUCCESS) { - DEBUG(3, ("ldap_install_tls failed: [%s] [%s]\n", - sss_ldap_err2string(lret), diag_msg)); + DEBUG(3, "ldap_install_tls failed: [%s] [%s]\n", + sss_ldap_err2string(lret), diag_msg); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. %s", diag_msg); } else { - DEBUG(3, ("ldap_install_tls failed: [%s]\n", - sss_ldap_err2string(lret))); + DEBUG(3, "ldap_install_tls failed: [%s]\n", + sss_ldap_err2string(lret)); sss_log(SSS_LOG_ERR, "Could not start TLS encryption. " "Check for certificate issues."); } @@ -2054,14 +2054,14 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, if (p->use_start_tls) { ret = synchronous_tls_setup(ldap); if (ret != LDAP_SUCCESS) { - DEBUG(1, ("synchronous_tls_setup failed.\n")); + DEBUG(1, "synchronous_tls_setup failed.\n"); return ret; } } tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(1, ("talloc_new failed.\n")); + DEBUG(1, "talloc_new failed.\n"); return LDAP_NO_MEMORY; } @@ -2071,8 +2071,8 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, ret = sss_ldap_control_create(LDAP_CONTROL_PASSWORDPOLICYREQUEST, 0, NULL, 0, &ctrls[0]); if (ret != LDAP_SUCCESS && ret != LDAP_NOT_SUPPORTED) { - DEBUG(1, ("sss_ldap_control_create failed to create " - "Password Policy control.\n")); + DEBUG(1, "sss_ldap_control_create failed to create " + "Password Policy control.\n"); goto done; } request_controls = ctrls; @@ -2086,7 +2086,7 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, &password); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sdap_auth_get_authtok failed.\n")); + "sdap_auth_get_authtok failed.\n"); ret = LDAP_LOCAL_ERROR; goto done; } @@ -2096,13 +2096,13 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, request_controls, NULL, NULL); if (ret != LDAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("ldap_sasl_bind_s failed (%d)[%s]\n", ret, - sss_ldap_err2string(ret))); + "ldap_sasl_bind_s failed (%d)[%s]\n", ret, + sss_ldap_err2string(ret)); } } else { sasl_bind_state = talloc_zero(tmp_ctx, struct sasl_bind_state); if (sasl_bind_state == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = LDAP_NO_MEMORY; goto done; } @@ -2114,13 +2114,13 @@ static int sdap_rebind_proc(LDAP *ldap, LDAP_CONST char *url, ber_tag_t request, (*sdap_sasl_interact), sasl_bind_state); if (ret != LDAP_SUCCESS) { - DEBUG(1, ("ldap_sasl_interactive_bind_s failed (%d)[%s]\n", ret, - sss_ldap_err2string(ret))); + DEBUG(1, "ldap_sasl_interactive_bind_s failed (%d)[%s]\n", ret, + sss_ldap_err2string(ret)); } } - DEBUG(7, ("%s bind to [%s].\n", - (ret == LDAP_SUCCESS ? "Successfully" : "Failed to"), url)); + DEBUG(7, "%s bind to [%s].\n", + (ret == LDAP_SUCCESS ? "Successfully" : "Failed to"), url); done: if (ctrls[0]) ldap_control_free(ctrls[0]); diff --git a/src/providers/ldap/sdap_async_enum.c b/src/providers/ldap/sdap_async_enum.c index 0431d03c3..2b860905e 100644 --- a/src/providers/ldap/sdap_async_enum.c +++ b/src/providers/ldap/sdap_async_enum.c @@ -108,7 +108,7 @@ sdap_dom_enum_ex_send(TALLOC_CTX *memctx, state->user_op = sdap_id_op_create(state, user_conn->conn_cache); if (state->user_op == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for users\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for users\n"); ret = EIO; goto fail; } @@ -116,7 +116,7 @@ sdap_dom_enum_ex_send(TALLOC_CTX *memctx, ret = sdap_dom_enum_ex_retry(req, state->user_op, sdap_dom_enum_ex_get_users); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_dom_enum_ex_retry failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_dom_enum_ex_retry failed\n"); goto fail; } @@ -140,7 +140,7 @@ static errno_t sdap_dom_enum_ex_retry(struct tevent_req *req, subreq = sdap_id_op_connect_send(op, state, &ret); if (subreq == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_id_op_connect_send failed: %d\n", ret)); + "sdap_id_op_connect_send failed: %d\n", ret); return ret; } @@ -160,12 +160,12 @@ static bool sdap_dom_enum_ex_connected(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 false; @@ -249,13 +249,13 @@ static void sdap_dom_enum_ex_posix_check_done(struct tevent_req *subreq) } return; } else if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n"); tevent_req_done(req); return; } else { /* Non-recoverable error */ DEBUG(SSSDBG_OP_FAILURE, - ("POSIX check failed: %d: %s\n", ret, sss_strerror(ret))); + "POSIX check failed: %d: %s\n", ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -317,20 +317,20 @@ static void sdap_dom_enum_ex_users_done(struct tevent_req *subreq) } return; } else if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n"); tevent_req_done(req); return; } else if (ret != EOK && ret != ENOENT) { /* Non-recoverable error */ DEBUG(SSSDBG_OP_FAILURE, - ("User enumeration failed: %d: %s\n", ret, sss_strerror(ret))); + "User enumeration failed: %d: %s\n", ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } state->group_op = sdap_id_op_create(state, state->group_conn->conn_cache); if (state->group_op == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for groups\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for groups\n"); tevent_req_error(req, EIO); return; } @@ -388,13 +388,13 @@ static void sdap_dom_enum_ex_groups_done(struct tevent_req *subreq) } return; } else if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n"); tevent_req_done(req); return; } else if (ret != EOK && ret != ENOENT) { /* Non-recoverable error */ DEBUG(SSSDBG_OP_FAILURE, - ("Group enumeration failed: %d: %s\n", ret, sss_strerror(ret))); + "Group enumeration failed: %d: %s\n", ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -402,7 +402,7 @@ static void sdap_dom_enum_ex_groups_done(struct tevent_req *subreq) state->svc_op = sdap_id_op_create(state, state->svc_conn->conn_cache); if (state->svc_op == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create failed for svcs\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create failed for svcs\n"); tevent_req_error(req, EIO); return; } @@ -457,13 +457,13 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq) } return; } else if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_TRACE_FUNC, ("Backend is offline, retrying later\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Backend is offline, retrying later\n"); tevent_req_done(req); return; } else if (ret != EOK && ret != ENOENT) { /* Non-recoverable error */ DEBUG(SSSDBG_OP_FAILURE, - ("Service enumeration failed: %d: %s\n", ret, sss_strerror(ret))); + "Service enumeration failed: %d: %s\n", ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -477,7 +477,7 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq) state->sdom->dom, true); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not mark domain as having enumerated.\n")); + "Could not mark domain as having enumerated.\n"); /* This error is non-fatal, so continue */ } @@ -487,7 +487,7 @@ static void sdap_dom_enum_ex_svcs_done(struct tevent_req *subreq) /* Not fatal, worst case we'll have stale entries that would be * removed on a subsequent online lookup */ - DEBUG(SSSDBG_MINOR_FAILURE, ("Cleanup failed: %d\n", ret)); + DEBUG(SSSDBG_MINOR_FAILURE, "Cleanup failed: %d\n", ret); } } @@ -562,7 +562,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx, ctx->opts->user_map[SDAP_AT_USER_NAME].name); if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -583,7 +583,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx, } if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -602,7 +602,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx, if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -611,7 +611,7 @@ static struct tevent_req *enum_users_send(TALLOC_CTX *memctx, /* Terminate the search filter */ state->filter = talloc_asprintf_append_buffer(state->filter, ")"); if (!state->filter) { - DEBUG(2, ("Failed to build base filter\n")); + DEBUG(2, "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -679,8 +679,8 @@ static void enum_users_done(struct tevent_req *subreq) } } - DEBUG(4, ("Users higher USN value: [%s]\n", - state->ctx->srv_opts->max_user_value)); + DEBUG(4, "Users higher USN value: [%s]\n", + state->ctx->srv_opts->max_user_value); tevent_req_done(req); } @@ -737,7 +737,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx, ctx->opts->group_map[SDAP_AT_GROUP_NAME].name); if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -758,7 +758,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx, } if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -773,7 +773,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx, ctx->srv_opts->max_group_value); if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -783,7 +783,7 @@ static struct tevent_req *enum_groups_send(TALLOC_CTX *memctx, state->filter = talloc_asprintf_append_buffer(state->filter, ")"); if (!state->filter) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to build base filter\n")); + "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -848,8 +848,8 @@ static void enum_groups_done(struct tevent_req *subreq) } } - DEBUG(4, ("Groups higher USN value: [%s]\n", - state->ctx->srv_opts->max_group_value)); + DEBUG(4, "Groups higher USN value: [%s]\n", + state->ctx->srv_opts->max_group_value); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c index 129fb3e6c..f0f06ca99 100644 --- a/src/providers/ldap/sdap_async_groups.c +++ b/src/providers/ldap/sdap_async_groups.c @@ -68,7 +68,7 @@ static int sdap_find_entry_by_origDN(TALLOC_CTX *memctx, goto done; } - DEBUG(9, ("Searching cache for [%s].\n", sanitized_dn)); + DEBUG(9, "Searching cache for [%s].\n", sanitized_dn); ret = sysdb_search_entry(tmpctx, ctx, base_dn, LDB_SCOPE_SUBTREE, filter, no_attrs, &num_msgs, &msgs); @@ -198,7 +198,7 @@ static int sdap_fill_memberships(struct sdap_options *opts, ret = sysdb_attrs_get_el(group_attrs, SYSDB_MEMBER, &el); if (ret) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sysdb_attrs_get_el failed\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "sysdb_attrs_get_el failed\n"); goto done; } @@ -206,7 +206,7 @@ static int sdap_fill_memberships(struct sdap_options *opts, el->values = talloc_realloc(group_attrs, el->values, struct ldb_val, el->num_values + num_values + nuserdns); if (!el->values) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No memory to allocate group attrs\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No memory to allocate group attrs\n"); ret = ENOMEM; goto done; } @@ -224,8 +224,8 @@ static int sdap_fill_memberships(struct sdap_options *opts, if (hret == HASH_ERROR_KEY_NOT_FOUND) { sdom = sdap_domain_get_by_dn(opts, (char *)values[i].data); if (sdom == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Member [%s] is it out of domain " - "scope?\n", (char *)values[i].data)); + DEBUG(SSSDBG_MINOR_FAILURE, "Member [%s] is it out of domain " + "scope?\n", (char *)values[i].data); member_sysdb = ctx; member_dom = domain; } else { @@ -240,26 +240,26 @@ static int sdap_fill_memberships(struct sdap_options *opts, if (ret == ENOENT) { /* member may be outside of the configured search bases * or out of scope of nesting limit */ - DEBUG(SSSDBG_MINOR_FAILURE, ("Member [%s] was not found in " - "cache. Is it out of scope?\n", (char *)values[i].data)); + DEBUG(SSSDBG_MINOR_FAILURE, "Member [%s] was not found in " + "cache. Is it out of scope?\n", (char *)values[i].data); continue; } if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("'sdap_find_entry_by_origDN' failed for member [%s] ", - (char *)values[i].data)); + "'sdap_find_entry_by_origDN' failed for member [%s] ", + (char *)values[i].data); goto done; } - DEBUG(7, (" member #%d (%s): [%s]\n", + DEBUG(7, " member #%d (%s): [%s]\n", i, (char *)values[i].data, - (char *)el->values[j].data)); + (char *)el->values[j].data); el->values[j].length = strlen((char *)el->values[j].data); j++; } else if (hret != HASH_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("hash_lookup failed: [%d]: %s\n", hret, strerror(hret))); + "hash_lookup failed: [%d]: %s\n", hret, strerror(hret)); ret = EFAULT; goto done; } @@ -304,7 +304,7 @@ sdap_store_group_with_gid(struct sysdb_ctx *ctx, if (!posix_group) { ret = sysdb_attrs_add_uint32(group_attrs, SYSDB_GIDNUM, 0); if (ret) { - DEBUG(2, ("Could not set explicit GID 0 for %s\n", name)); + DEBUG(2, "Could not set explicit GID 0 for %s\n", name); return ret; } } @@ -312,7 +312,7 @@ sdap_store_group_with_gid(struct sysdb_ctx *ctx, ret = sysdb_store_group(ctx, domain, name, gid, group_attrs, cache_timeout, now); if (ret) { - DEBUG(2, ("Could not store group %s\n", name)); + DEBUG(2, "Could not store group %s\n", name); return ret; } @@ -341,8 +341,8 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, ret = sysdb_attrs_get_el(attrs, SYSDB_GHOST, &gh); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error reading ghost attributes: [%s]\n", - strerror(ret))); + "Error reading ghost attributes: [%s]\n", + strerror(ret)); return ret; } @@ -361,18 +361,18 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, memberel->values = NULL; } else if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error reading members: [%s]\n", strerror(ret))); + "Error reading members: [%s]\n", strerror(ret)); return ret; } if (store_original_member) { - DEBUG(SSSDBG_TRACE_FUNC, ("The group has %d members\n", memberel->num_values)); + DEBUG(SSSDBG_TRACE_FUNC, "The group has %d members\n", memberel->num_values); for (i = 0; i < memberel->num_values; i++) { ret = sysdb_attrs_add_string(sysdb_attrs, SYSDB_ORIG_MEMBER, (const char *) memberel->values[i].data); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add member [%s]\n", - (const char *) memberel->values[i].data)); + DEBUG(SSSDBG_OP_FAILURE, "Could not add member [%s]\n", + (const char *) memberel->values[i].data); return ret; } } @@ -382,8 +382,8 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, ret = sysdb_attrs_get_el(sysdb_attrs, SYSDB_MEMBER, &sysdb_memberel); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error reading group members from group_attrs: [%s]\n", - strerror(ret))); + "Error reading group members from group_attrs: [%s]\n", + strerror(ret)); return ret; } sysdb_memberel->values = memberel->values; @@ -393,14 +393,14 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, ret = sysdb_attrs_get_el(sysdb_attrs, SYSDB_GHOST, &ghostel); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error getting ghost element: [%s]\n", strerror(ret))); + "Error getting ghost element: [%s]\n", strerror(ret)); return ret; } ghostel->values = gh->values; ghostel->num_values = gh->num_values; cnt = ghostel->num_values + memberel->num_values; - DEBUG(SSSDBG_TRACE_FUNC, ("Group has %zu members\n", cnt)); + DEBUG(SSSDBG_TRACE_FUNC, "Group has %zu members\n", cnt); /* Now process RFC2307bis ghost hash table */ if (ghosts && cnt > 0) { @@ -418,13 +418,13 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs, continue; } else if (hret != HASH_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error checking hash table: [%s]\n", - hash_error_string(hret))); + "Error checking hash table: [%s]\n", + hash_error_string(hret)); return EFAULT; } DEBUG(SSSDBG_TRACE_FUNC, - ("Adding ghost member for group [%s]\n", (char *) value.ptr)); + "Adding ghost member for group [%s]\n", (char *) value.ptr); ghostel->values[ghostel->num_values].data = \ (uint8_t *) talloc_strdup(ghostel->values, value.ptr); if (ghostel->values[ghostel->num_values].data == NULL) { @@ -481,17 +481,17 @@ static int sdap_save_group(TALLOC_CTX *memctx, if (ret == EOK) { ret = sysdb_attrs_add_string(group_attrs, SYSDB_SID_STR, sid_str); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not add SID string: [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not add SID string: [%s]\n", + strerror(ret)); goto done; } } else if (ret == ENOENT) { - DEBUG(SSSDBG_TRACE_ALL, ("objectSID: not available for group [%s].\n", - group_name)); + DEBUG(SSSDBG_TRACE_ALL, "objectSID: not available for group [%s].\n", + group_name); sid_str = NULL; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not identify objectSID: [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify objectSID: [%s]\n", + strerror(ret)); sid_str = NULL; } @@ -502,28 +502,28 @@ static int sdap_save_group(TALLOC_CTX *memctx, if (subdomain) { dom = subdomain; } else { - DEBUG(SSSDBG_TRACE_FUNC, ("SID %s does not belong to any known " - "domain\n", sid_str)); + DEBUG(SSSDBG_TRACE_FUNC, "SID %s does not belong to any known " + "domain\n", sid_str); } } ret = sdap_get_group_primary_name(tmpctx, opts, attrs, dom, &group_name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get group name\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get group name\n"); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Processing group %s\n", group_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing group %s\n", group_name); posix_group = true; if (opts->schema_type == SDAP_SCHEMA_AD) { ret = sysdb_attrs_get_int32_t(attrs, SYSDB_GROUP_TYPE, &ad_group_type); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_int32_t failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_int32_t failed.\n"); goto done; } - DEBUG(SSSDBG_TRACE_ALL, ("AD group [%s] has type flags %#x.", - group_name, ad_group_type)); + DEBUG(SSSDBG_TRACE_ALL, "AD group [%s] has type flags %#x.", + group_name, ad_group_type); /* Only security groups from AD are considered for POSIX groups. * Additionally only global and universal group are taken to account * for trusted domains. */ @@ -533,19 +533,19 @@ static int sdap_save_group(TALLOC_CTX *memctx, || (ad_group_type & SDAP_AD_GROUP_TYPE_UNIVERSAL))))) { posix_group = false; gid = 0; - DEBUG(SSSDBG_TRACE_FUNC, ("Filtering AD group [%s].\n", - group_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Filtering AD group [%s].\n", + group_name); ret = sysdb_attrs_add_uint32(group_attrs, opts->group_map[SDAP_AT_GROUP_GID].sys_name, 0); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to add a GID to non-posix group!\n")); + "Failed to add a GID to non-posix group!\n"); return ret; } ret = sysdb_attrs_add_bool(group_attrs, SYSDB_POSIX, false); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Error: Failed to mark group as non-posix!\n")); + "Error: Failed to mark group as non-posix!\n"); return ret; } } @@ -559,28 +559,28 @@ static int sdap_save_group(TALLOC_CTX *memctx, posix_group = true; if (sid_str == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("SID not available, cannot map a " \ - "unix ID to group [%s].\n", group_name)); + DEBUG(SSSDBG_MINOR_FAILURE, "SID not available, cannot map a " \ + "unix ID to group [%s].\n", group_name); ret = ENOENT; goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Mapping group [%s] objectSID [%s] to unix ID\n", - group_name, sid_str)); + "Mapping group [%s] objectSID [%s] to unix ID\n", + group_name, sid_str); /* Convert the SID into a UNIX group ID */ ret = sdap_idmap_sid_to_unix(opts->idmap_ctx, sid_str, &gid); if (ret == ENOTSUP) { /* ENOTSUP is returned if built-in SID was provided * => do not store the group, but return EOK */ - DEBUG(SSSDBG_TRACE_FUNC, ("Skipping built-in object.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Skipping built-in object.\n"); ret = EOK; goto done; } else if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert SID string: [%s]\n", - strerror(ret))); + "Could not convert SID string: [%s]\n", + strerror(ret)); goto done; } @@ -589,7 +589,7 @@ static int sdap_save_group(TALLOC_CTX *memctx, */ ret = sdap_replace_id(attrs, SYSDB_GIDNUM, gid); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set the id-mapped GID\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set the id-mapped GID\n"); goto done; } } else { @@ -598,17 +598,17 @@ static int sdap_save_group(TALLOC_CTX *memctx, posix_group = true; } else if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error reading posix attribute: [%s]\n", - strerror(ret))); + "Error reading posix attribute: [%s]\n", + strerror(ret)); goto done; } - DEBUG(8, ("This is%s a posix group\n", (posix_group)?"":" not")); + DEBUG(8, "This is%s a posix group\n", (posix_group)?"":" not"); ret = sysdb_attrs_add_bool(group_attrs, SYSDB_POSIX, posix_group); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error setting posix attribute: [%s]\n", - strerror(ret))); + "Error setting posix attribute: [%s]\n", + strerror(ret)); goto done; } @@ -616,8 +616,8 @@ static int sdap_save_group(TALLOC_CTX *memctx, opts->group_map[SDAP_AT_GROUP_GID].sys_name, &gid); if (ret != EOK) { - DEBUG(1, ("no gid provided for [%s] in domain [%s].\n", - group_name, dom->name)); + DEBUG(1, "no gid provided for [%s] in domain [%s].\n", + group_name, dom->name); ret = EINVAL; goto done; } @@ -628,7 +628,7 @@ static int sdap_save_group(TALLOC_CTX *memctx, if (posix_group) { if (OUT_OF_ID_RANGE(gid, dom->id_min, dom->id_max)) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Group [%s] filtered out! (id out of range)\n", group_name)); + "Group [%s] filtered out! (id out of range)\n", group_name); ret = EINVAL; goto done; } @@ -639,8 +639,8 @@ static int sdap_save_group(TALLOC_CTX *memctx, group_name, group_attrs); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error setting original DN: [%s]\n", - strerror(ret))); + "Error setting original DN: [%s]\n", + strerror(ret)); goto done; } @@ -650,8 +650,8 @@ static int sdap_save_group(TALLOC_CTX *memctx, group_name, group_attrs); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error setting mod timestamp: [%s]\n", - strerror(ret))); + "Error setting mod timestamp: [%s]\n", + strerror(ret)); goto done; } @@ -659,21 +659,21 @@ static int sdap_save_group(TALLOC_CTX *memctx, opts->group_map[SDAP_AT_GROUP_USN].sys_name, &el); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error looking up group USN: [%s]\n", - strerror(ret))); + "Error looking up group USN: [%s]\n", + strerror(ret)); goto done; } if (el->num_values == 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("Original USN value is not available for [%s].\n", group_name)); + "Original USN value is not available for [%s].\n", group_name); } else { ret = sysdb_attrs_add_string(group_attrs, opts->group_map[SDAP_AT_GROUP_USN].sys_name, (const char*)el->values[0].data); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error setting group USN: [%s]\n", - strerror(ret))); + "Error setting group USN: [%s]\n", + strerror(ret)); goto done; } usn_value = talloc_strdup(tmpctx, (const char*)el->values[0].data); @@ -687,16 +687,16 @@ static int sdap_save_group(TALLOC_CTX *memctx, populate_members, store_original_member, group_attrs); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to save ghost members\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to save ghost members\n"); goto done; } ret = sdap_save_all_names(group_name, attrs, dom, group_attrs); if (ret != EOK) { - DEBUG(1, ("Failed to save group names\n")); + DEBUG(1, "Failed to save group names\n"); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Storing info for group %s\n", group_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Storing info for group %s\n", group_name); ret = sdap_store_group_with_gid(ctx, dom, group_name, gid, group_attrs, @@ -704,8 +704,8 @@ static int sdap_save_group(TALLOC_CTX *memctx, posix_group, now); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not store group with GID: [%s]\n", - strerror(ret))); + "Could not store group with GID: [%s]\n", + strerror(ret)); goto done; } @@ -719,9 +719,9 @@ static int sdap_save_group(TALLOC_CTX *memctx, done: if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to save group [%s]: [%s]\n", + "Failed to save group [%s]: [%s]\n", group_name ? group_name : "Unknown", - strerror(ret))); + strerror(ret)); } talloc_free(tmpctx); return ret; @@ -750,10 +750,10 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, ret = sdap_get_group_primary_name(memctx, opts, attrs, dom, &group_name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get group name\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get group name\n"); goto fail; } - DEBUG(SSSDBG_TRACE_FUNC, ("Processing group %s\n", group_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing group %s\n", group_name); /* With AD we also want to merge in parent groups of primary GID as they * are reported with tokenGroups, too @@ -763,8 +763,8 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, &userdns, &nuserdns); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("sdap_dn_by_primary_gid failed: [%d][%s].\n", - ret, strerror(ret))); + "sdap_dn_by_primary_gid failed: [%d][%s].\n", + ret, strerror(ret)); goto fail; } } @@ -772,21 +772,21 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, ret = sysdb_attrs_get_el(attrs, opts->group_map[SDAP_AT_GROUP_MEMBER].sys_name, &el); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sysdb_attrs_get_el failed: [%d][%s].\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "sysdb_attrs_get_el failed: [%d][%s].\n", + ret, strerror(ret)); goto fail; } if (el->num_values == 0 && nuserdns == 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("No members for group [%s]\n", group_name)); + "No members for group [%s]\n", group_name); } else { DEBUG(SSSDBG_TRACE_FUNC, - ("Adding member users to group [%s]\n", group_name)); + "Adding member users to group [%s]\n", group_name); group_attrs = sysdb_new_attrs(memctx); if (!group_attrs) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sysdb_new_attrs failed\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "sysdb_new_attrs failed\n"); ret = ENOMEM; goto fail; } @@ -796,8 +796,8 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, userdns, nuserdns); if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sdap_fill_memberships failed with [%d]: %s\n", ret, - strerror(ret))); + "sdap_fill_memberships failed with [%d]: %s\n", ret, + strerror(ret)); goto fail; } } @@ -805,8 +805,8 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, ret = sysdb_store_group(ctx, dom, group_name, 0, group_attrs, dom->group_timeout, now); if (ret) { - DEBUG(SSSDBG_MINOR_FAILURE, ("sysdb_store_group failed: [%d][%s].\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "sysdb_store_group failed: [%d][%s].\n", + ret, strerror(ret)); goto fail; } @@ -814,7 +814,7 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx, fail: DEBUG(SSSDBG_OP_FAILURE, - ("Failed to save members of group %s\n", group_name)); + "Failed to save members of group %s\n", group_name); return ret; } @@ -868,7 +868,7 @@ static int sdap_save_groups(TALLOC_CTX *memctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -895,9 +895,9 @@ static int sdap_save_groups(TALLOC_CTX *memctx, /* Do not fail completely on errors. * Just report the failure to save and go on */ if (ret) { - DEBUG(2, ("Failed to store group %d. Ignoring.\n", i)); + DEBUG(2, "Failed to store group %d. Ignoring.\n", i); } else { - DEBUG(9, ("Group %d processed!\n", i)); + DEBUG(9, "Group %d processed!\n", i); if (twopass && !populate_members) { saved_groups[nsaved_groups] = groups[i]; nsaved_groups++; @@ -928,16 +928,16 @@ static int sdap_save_groups(TALLOC_CTX *memctx, /* Do not fail completely on errors. * Just report the failure to save and go on */ if (ret) { - DEBUG(2, ("Failed to store group %d members.\n", i)); + DEBUG(2, "Failed to store group %d members.\n", i); } else { - DEBUG(9, ("Group %d members processed!\n", i)); + DEBUG(9, "Group %d members processed!\n", i); } } } ret = sysdb_transaction_commit(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -950,7 +950,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } talloc_zfree(tmpctx); @@ -1073,7 +1073,7 @@ struct tevent_req *sdap_process_group_send(TALLOC_CTX *memctx, /* Group without members */ if (el->num_values == 0) { - DEBUG(2, ("No Members. Done!\n")); + DEBUG(2, "No Members. Done!\n"); ret = EOK; goto done; } @@ -1123,7 +1123,7 @@ struct tevent_req *sdap_process_group_send(TALLOC_CTX *memctx, break; default: - DEBUG(1, ("Unknown schema type %d\n", opts->schema_type)); + DEBUG(1, "Unknown schema type %d\n", opts->schema_type); ret = EINVAL; break; } @@ -1132,7 +1132,7 @@ done: /* We managed to process all the entries */ /* EBUSY means we need to wait for entries in LDAP */ if (ret == EOK) { - DEBUG(7, ("All group members processed\n")); + DEBUG(7, "All group members processed\n"); tevent_req_done(req); tevent_req_post(req, ev); } @@ -1161,11 +1161,11 @@ sdap_process_missing_member_2307bis(struct tevent_req *req, * connection. */ if (grp_state->check_count > GROUPMEMBER_REQ_PARALLEL) { - DEBUG(7, (" queueing search for: %s\n", user_dn)); + DEBUG(7, " queueing search for: %s\n", user_dn); if (!grp_state->queued_members) { DEBUG(SSSDBG_TRACE_LIBS, - ("Allocating queue for %zu members\n", - num_users - grp_state->check_count)); + "Allocating queue for %zu members\n", + num_users - grp_state->check_count); grp_state->queued_members = talloc_array(grp_state, char *, num_users - grp_state->check_count + 1); @@ -1222,7 +1222,7 @@ sdap_process_group_members_2307bis(struct tevent_req *req, * User already cached in sysdb. Remember the sysdb DN for later * use by sdap_save_groups() */ - DEBUG(7, ("sysdbdn: %s\n", strdn)); + DEBUG(7, "sysdbdn: %s\n", strdn); state->sysdb_dns->values[state->sysdb_dns->num_values].data = (uint8_t*) strdn; state->sysdb_dns->values[state->sysdb_dns->num_values].length = @@ -1237,19 +1237,19 @@ sdap_process_group_members_2307bis(struct tevent_req *req, * Also, we don't want to be holding the sysdb * transaction while we're performing LDAP lookups. */ - DEBUG(7, ("Searching LDAP for missing user entry\n")); + DEBUG(7, "Searching LDAP for missing user entry\n"); ret = sdap_process_missing_member_2307bis(req, member_dn, memberel->num_values); if (ret != EOK) { - DEBUG(1, ("Error processing missing member #%d (%s):\n", - i, member_dn)); + DEBUG(1, "Error processing missing member #%d (%s):\n", + i, member_dn); return ret; } } } else { - DEBUG(1, ("Error checking cache for member #%d (%s):\n", - i, (char *)memberel->values[i].data)); + DEBUG(1, "Error checking cache for member #%d (%s):\n", + i, (char *)memberel->values[i].data); return ret; } } @@ -1322,7 +1322,7 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state, /* Entry exists but the group references it with an alias. */ if (count != 1) { - DEBUG(1, ("More than one entry with this alias?\n")); + DEBUG(1, "More than one entry with this alias?\n"); ret = EIO; goto done; } @@ -1331,8 +1331,8 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state, username = ldb_msg_find_attr_as_string(msgs[0], SYSDB_NAME, NULL); if (username == NULL) { ret = EINVAL; - DEBUG(SSSDBG_MINOR_FAILURE, ("Inconsistent sysdb: user " - "without primary name?\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Inconsistent sysdb: user " + "without primary name?\n"); goto done; } user_dn = sysdb_user_strdn(tmp_ctx, state->dom->name, username); @@ -1342,14 +1342,14 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state, ret = sdap_add_group_member_2307(state->sysdb_dns, state->dom, user_dn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add group member %s\n", username)); + DEBUG(SSSDBG_OP_FAILURE, "Could not add group member %s\n", username); } } else if (ret == ENOENT || count == 0) { /* The entry really does not exist, add a ghost */ - DEBUG(SSSDBG_TRACE_FUNC, ("Adding a ghost entry\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Adding a ghost entry\n"); ret = sdap_add_group_member_2307(state->ghost_dns, state->dom, member_name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add group member %s\n", member_name)); + DEBUG(SSSDBG_OP_FAILURE, "Could not add group member %s\n", member_name); } } else { ret = EIO; @@ -1386,7 +1386,7 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state, * User already cached in sysdb. Remember the sysdb DN for later * use by sdap_save_groups() */ - DEBUG(7, ("Member already cached in sysdb: %s\n", member_name)); + DEBUG(7, "Member already cached in sysdb: %s\n", member_name); userdn = sysdb_user_strdn(state->sysdb_dns, state->dom->name, member_name); if (userdn == NULL) { @@ -1395,23 +1395,23 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state, ret = sdap_add_group_member_2307(state->sysdb_dns, state->dom, userdn); if (ret != EOK) { - DEBUG(1, ("Could not add member %s into sysdb\n", member_name)); + DEBUG(1, "Could not add member %s into sysdb\n", member_name); goto done; } } else if (ret == ENOENT) { /* The user is not in sysdb, need to add it */ - DEBUG(7, ("member #%d (%s): not found in sysdb\n", - i, member_name)); + DEBUG(7, "member #%d (%s): not found in sysdb\n", + i, member_name); ret = sdap_process_missing_member_2307(state, member_name, now); if (ret != EOK) { - DEBUG(1, ("Error processing missing member #%d (%s):\n", - i, member_name)); + DEBUG(1, "Error processing missing member #%d (%s):\n", + i, member_name); goto done; } } else { - DEBUG(1, ("Error checking cache for member #%d (%s):\n", - i, (char *) memberel->values[i].data)); + DEBUG(1, "Error checking cache for member #%d (%s):\n", + i, (char *) memberel->values[i].data); goto done; } } @@ -1441,7 +1441,7 @@ static void sdap_process_group_members(struct tevent_req *subreq) uint8_t* name_string; state->check_count--; - DEBUG(SSSDBG_TRACE_ALL, ("Members remaining: %zu\n", state->check_count)); + DEBUG(SSSDBG_TRACE_ALL, "Members remaining: %zu\n", state->check_count); ret = sdap_get_generic_recv(subreq, state, &count, &usr_attrs); talloc_zfree(subreq); @@ -1451,7 +1451,7 @@ static void sdap_process_group_members(struct tevent_req *subreq) if (count != 1) { ret = EINVAL; DEBUG(SSSDBG_TRACE_LIBS, - ("Expected one user entry and got %zu\n", count)); + "Expected one user entry and got %zu\n", count); goto next; } ret = sysdb_attrs_get_el(usr_attrs[0], @@ -1460,7 +1460,7 @@ static void sdap_process_group_members(struct tevent_req *subreq) ret = EINVAL; } if (ret) { - DEBUG(2, ("Failed to get the member's name\n")); + DEBUG(2, "Failed to get the member's name\n"); goto next; } @@ -1474,8 +1474,8 @@ static void sdap_process_group_members(struct tevent_req *subreq) next: if (ret) { DEBUG(SSSDBG_TRACE_FUNC, - ("Error reading group member[%d]: %s. Skipping\n", - ret, strerror(ret))); + "Error reading group member[%d]: %s. Skipping\n", + ret, strerror(ret)); state->count--; } /* Are there more searches for uncached users to submit ? */ @@ -1511,8 +1511,8 @@ next: &el); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to get the group member attribute [%d]: %s\n", - ret, strerror(ret))); + "Failed to get the group member attribute [%d]: %s\n", + ret, strerror(ret)); tevent_req_error(req, ret); return; } @@ -1526,7 +1526,7 @@ next: } el->values = talloc_steal(state->group, state->ghost_dns->values); el->num_values = state->ghost_dns->num_values; - DEBUG(9, ("Processed Group - Done\n")); + DEBUG(9, "Processed Group - Done\n"); tevent_req_done(req); } } @@ -1611,7 +1611,7 @@ struct tevent_req *sdap_get_groups_send(TALLOC_CTX *memctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Group lookup request without a search base\n")); + "Group lookup request without a search base\n"); ret = EINVAL; goto done; } @@ -1623,7 +1623,7 @@ struct tevent_req *sdap_get_groups_send(TALLOC_CTX *memctx, subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx); state->op = sdap_id_op_create(state, subdom_id_ctx->ldap_ctx->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto done; } @@ -1695,8 +1695,8 @@ static errno_t sdap_get_groups_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for groups with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for groups with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, @@ -1739,11 +1739,11 @@ static void sdap_get_groups_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for groups, returned %zu results.\n", count)); + "Search for groups, returned %zu results.\n", count); if (!state->enumeration && count > 1) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Individual group search returned multiple results\n")); + "Individual group search returned multiple results\n"); tevent_req_error(req, EINVAL); return; } @@ -1846,7 +1846,7 @@ static void sdap_get_groups_process(struct tevent_req *subreq) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(0, ("Failed to start transaction\n")); + DEBUG(0, "Failed to start transaction\n"); tevent_req_error(req, ret); return; } @@ -1854,13 +1854,13 @@ static void sdap_get_groups_process(struct tevent_req *subreq) if (state->enumeration && state->opts->schema_type != SDAP_SCHEMA_RFC2307 && dp_opt_get_int(state->opts->basic, SDAP_NESTING_LEVEL) != 0) { - DEBUG(9, ("Saving groups without members first " - "to allow unrolling of nested groups.\n")); + DEBUG(9, "Saving groups without members first " + "to allow unrolling of nested groups.\n"); ret = sdap_save_groups(state, state->sysdb, state->dom, state->opts, state->groups, state->count, false, NULL, true, NULL); if (ret) { - DEBUG(2, ("Failed to store groups.\n")); + DEBUG(2, "Failed to store groups.\n"); tevent_req_error(req, ret); return; } @@ -1895,18 +1895,18 @@ static void sdap_get_groups_done(struct tevent_req *subreq) if (ret) { sysret = sysdb_transaction_cancel(state->sysdb); if (sysret != EOK) { - DEBUG(0, ("Could not cancel sysdb transaction\n")); + DEBUG(0, "Could not cancel sysdb transaction\n"); } tevent_req_error(req, ret); return; } state->check_count--; - DEBUG(SSSDBG_TRACE_ALL, ("Groups remaining: %zu\n", state->check_count)); + DEBUG(SSSDBG_TRACE_ALL, "Groups remaining: %zu\n", state->check_count); if (state->check_count == 0) { - DEBUG(9, ("All groups processed\n")); + DEBUG(9, "All groups processed\n"); /* If ignore_group_members is set for the domain, don't update * group memberships in the cache. @@ -1920,14 +1920,14 @@ static void sdap_get_groups_done(struct tevent_req *subreq) !state->enumeration, &state->higher_usn); if (ret) { - DEBUG(2, ("Failed to store groups.\n")); + DEBUG(2, "Failed to store groups.\n"); tevent_req_error(req, ret); return; } - DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Groups - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, "Saving %zu Groups - Done\n", state->count); sysret = sysdb_transaction_commit(state->sysdb); if (sysret != EOK) { - DEBUG(0, ("Couldn't commit transaction\n")); + DEBUG(0, "Couldn't commit transaction\n"); tevent_req_error(req, sysret); } else { tevent_req_done(req); @@ -1964,8 +1964,8 @@ static void sdap_ad_match_rule_members_process(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not retrieve members using AD match rule. [%s]\n", - strerror(ret))); + "Could not retrieve members using AD match rule. [%s]\n", + strerror(ret)); goto done; } @@ -1999,8 +1999,8 @@ static void sdap_ad_match_rule_members_process(struct tevent_req *subreq) &ghosts); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not determine which users are ghosts: [%s]\n", - strerror(ret))); + "Could not determine which users are ghosts: [%s]\n", + strerror(ret)); goto done; } @@ -2026,7 +2026,7 @@ static void sdap_ad_match_rule_members_process(struct tevent_req *subreq) * an originalDN. */ DEBUG(SSSDBG_MINOR_FAILURE, - ("BUG: Missing originalDN for user?\n")); + "BUG: Missing originalDN for user?\n"); goto done; } @@ -2044,8 +2044,8 @@ static void sdap_ad_match_rule_members_process(struct tevent_req *subreq) false, ghosts, true, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not save group to the cache: [%s]\n", - strerror(ret))); + "Could not save group to the cache: [%s]\n", + strerror(ret)); goto done; } @@ -2094,8 +2094,8 @@ static void sdap_nested_done(struct tevent_req *subreq) &group_count, &groups); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(1, ("Nested group processing failed: [%d][%s]\n", - ret, strerror(ret))); + DEBUG(1, "Nested group processing failed: [%d][%s]\n", + ret, strerror(ret)); goto fail; } @@ -2104,7 +2104,7 @@ static void sdap_nested_done(struct tevent_req *subreq) */ ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto fail; } in_transaction = true; @@ -2125,7 +2125,7 @@ static void sdap_nested_done(struct tevent_req *subreq) ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -2138,7 +2138,7 @@ fail: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } tevent_req_error(req, ret); @@ -2194,7 +2194,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction!\n"); goto done; } in_transaction = true; @@ -2206,7 +2206,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, } if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("User entry %d has no originalDN attribute\n", i)); + "User entry %d has no originalDN attribute\n", i); goto done; } original_dn = (const char *) el->values[0].data; @@ -2215,7 +2215,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, &clean_orig_dn); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot sanitize originalDN [%s]\n", original_dn)); + "Cannot sanitize originalDN [%s]\n", original_dn); goto done; } @@ -2226,7 +2226,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, user_dom, &username); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("User entry %d has no name attribute. Skipping\n", i)); + "User entry %d has no name attribute. Skipping\n", i); continue; } @@ -2243,13 +2243,13 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, talloc_zfree(filter); talloc_zfree(clean_orig_dn); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("Error checking cache for user entry\n")); + DEBUG(1, "Error checking cache for user entry\n"); goto done; } else if (ret == EOK) { /* The entry is cached but expired. Update the username * if needed. */ if (count != 1) { - DEBUG(1, ("More than one entry with this origDN? Skipping\n")); + DEBUG(1, "More than one entry with this origDN? Skipping\n"); continue; } @@ -2287,7 +2287,7 @@ static errno_t sdap_nested_group_populate_users(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_commit(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -2297,7 +2297,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not cancel transaction\n"); } } diff --git a/src/providers/ldap/sdap_async_groups_ad.c b/src/providers/ldap/sdap_async_groups_ad.c index 6a8a4fd13..9bb21d29b 100644 --- a/src/providers/ldap/sdap_async_groups_ad.c +++ b/src/providers/ldap/sdap_async_groups_ad.c @@ -76,8 +76,8 @@ sdap_get_ad_match_rule_members_send(TALLOC_CTX *mem_ctx, NULL, &state->attrs, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not build attribute map: [%s]\n", - strerror(ret))); + "Could not build attribute map: [%s]\n", + strerror(ret)); goto immediate; } @@ -85,8 +85,8 @@ sdap_get_ad_match_rule_members_send(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(group, SYSDB_ORIG_DN, &group_dn); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not retrieve originalDN for group: %s\n", - strerror(ret))); + "Could not retrieve originalDN for group: %s\n", + strerror(ret)); goto immediate; } @@ -94,8 +94,8 @@ sdap_get_ad_match_rule_members_send(TALLOC_CTX *mem_ctx, ret = sss_filter_sanitize(state, group_dn, &sanitized_group_dn); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not sanitize group DN: %s\n", - strerror(ret))); + "Could not sanitize group DN: %s\n", + strerror(ret)); goto immediate; } @@ -119,8 +119,8 @@ sdap_get_ad_match_rule_members_send(TALLOC_CTX *mem_ctx, ret = sdap_get_ad_match_rule_members_next_base(req); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("sdap_get_ad_match_rule_members_next_base failed: [%s]\n", - strerror(ret))); + "sdap_get_ad_match_rule_members_next_base failed: [%s]\n", + strerror(ret)); goto immediate; } @@ -149,8 +149,8 @@ sdap_get_ad_match_rule_members_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for users with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for users with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -183,13 +183,13 @@ sdap_get_ad_match_rule_members_step(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("LDAP search failed: [%s]\n", sss_strerror(ret))); + "LDAP search failed: [%s]\n", sss_strerror(ret)); tevent_req_error(req, ret); return; } DEBUG(SSSDBG_TRACE_LIBS, - ("Search for users returned %zu results\n", count)); + "Search for users returned %zu results\n", count); /* Add this batch of users to the list */ if (count > 0) { @@ -225,7 +225,7 @@ sdap_get_ad_match_rule_members_step(struct tevent_req *subreq) /* No more search bases. We're done here. */ if (state->count == 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("No users matched in any search base\n")); + "No users matched in any search base\n"); tevent_req_error(req, ENOENT); return; } diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index aba7ba42d..e00e9a6af 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -69,7 +69,7 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, tmp_name = sss_get_domain_name(tmp_ctx, groupnames[i], domain); if (tmp_name == NULL) { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to format original name [%s]\n", groupnames[i])); + "Failed to format original name [%s]\n", groupnames[i]); ret = ENOMEM; goto done; } @@ -80,14 +80,14 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, continue; } else if (ret == ENOENT) { missing[mi] = talloc_steal(missing, tmp_name); - DEBUG(7, ("Group #%d [%s][%s] is not cached, " \ + DEBUG(7, "Group #%d [%s][%s] is not cached, " \ "need to add a fake entry\n", - i, groupnames[i], missing[mi])); + i, groupnames[i], missing[mi]); mi++; continue; } else if (ret != ENOENT) { - DEBUG(1, ("search for group failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(1, "search for group failed [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -106,8 +106,8 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, ret = sysdb_transaction_start(sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot start sysdb transaction [%d]: %s\n", - ret, strerror(ret))); + "Cannot start sysdb transaction [%d]: %s\n", + ret, strerror(ret)); goto done; } in_transaction = true; @@ -121,7 +121,7 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, domain, &groupname); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("The group has no name attribute\n")); + "The group has no name attribute\n"); goto done; } @@ -136,35 +136,35 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, if (use_id_mapping) { if (sid_str == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No SID for group [%s] " \ + DEBUG(SSSDBG_MINOR_FAILURE, "No SID for group [%s] " \ "while id-mapping.\n", - groupname)); + groupname); ret = EINVAL; goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Mapping group [%s] objectSID to unix ID\n", groupname)); + "Mapping group [%s] objectSID to unix ID\n", groupname); DEBUG(SSSDBG_TRACE_INTERNAL, - ("Group [%s] has objectSID [%s]\n", - groupname, sid_str)); + "Group [%s] has objectSID [%s]\n", + groupname, sid_str); /* Convert the SID into a UNIX group ID */ ret = sdap_idmap_sid_to_unix(opts->idmap_ctx, sid_str, &gid); if (ret == EOK) { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Group [%s] has mapped gid [%lu]\n", - groupname, (unsigned long)gid)); + "Group [%s] has mapped gid [%lu]\n", + groupname, (unsigned long)gid); } else { posix = false; gid = 0; DEBUG(SSSDBG_TRACE_INTERNAL, - ("Group [%s] cannot be mapped. " + "Group [%s] cannot be mapped. " "Treating as a non-POSIX group\n", - groupname)); + groupname); } } else { @@ -172,15 +172,15 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, SYSDB_GIDNUM, &gid); if (ret == ENOENT || (ret == EOK && gid == 0)) { - DEBUG(SSSDBG_TRACE_LIBS, ("The group %s gid was %s\n", - groupname, ret == ENOENT ? "missing" : "zero")); + DEBUG(SSSDBG_TRACE_LIBS, "The group %s gid was %s\n", + groupname, ret == ENOENT ? "missing" : "zero"); DEBUG(SSSDBG_TRACE_FUNC, - ("Marking group %s as non-posix and setting GID=0!\n", - groupname)); + "Marking group %s as non-posix and setting GID=0!\n", + groupname); gid = 0; posix = false; } else if (ret) { - DEBUG(1, ("The GID attribute is malformed\n")); + DEBUG(1, "The GID attribute is malformed\n"); goto done; } } @@ -189,12 +189,12 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, SYSDB_ORIG_DN, &original_dn); if (ret) { - DEBUG(5, ("The group has no name original DN\n")); + DEBUG(5, "The group has no name original DN\n"); original_dn = NULL; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("Adding fake group %s to sysdb\n", groupname)); + "Adding fake group %s to sysdb\n", groupname); ret = sysdb_add_incomplete_group(sysdb, domain, groupname, gid, original_dn, sid_str, posix, now); @@ -206,7 +206,7 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, } if (ai == ldap_groups_count) { - DEBUG(2, ("Group %s not present in LDAP\n", missing[i])); + DEBUG(2, "Group %s not present in LDAP\n", missing[i]); ret = EINVAL; goto done; } @@ -214,7 +214,7 @@ static errno_t sdap_add_incomplete_groups(struct sysdb_ctx *sysdb, ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sysdb_transaction_commit failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sysdb_transaction_commit failed.\n"); goto done; } in_transaction = false; @@ -224,7 +224,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -263,8 +263,8 @@ int sdap_initgr_common_store(struct sysdb_ctx *sysdb, opts->group_map[SDAP_AT_GROUP_NAME].name, &ldap_grouplist); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_primary_name_list failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(1, "sysdb_attrs_primary_name_list failed [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -278,7 +278,7 @@ int sdap_initgr_common_store(struct sysdb_ctx *sysdb, ret = sysdb_transaction_start(sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -291,24 +291,24 @@ int sdap_initgr_common_store(struct sysdb_ctx *sysdb, add_groups, ldap_groups, ldap_groups_count); if (ret != EOK) { - DEBUG(1, ("Adding incomplete users failed\n")); + DEBUG(1, "Adding incomplete users failed\n"); goto done; } } - DEBUG(8, ("Updating memberships for %s\n", name)); + DEBUG(8, "Updating memberships for %s\n", name); ret = sysdb_update_members(sysdb, domain, name, type, (const char *const *) add_groups, (const char *const *) del_groups); if (ret != EOK) { - DEBUG(1, ("Membership update failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(1, "Membership update failed [%d]: %s\n", + ret, strerror(ret)); goto done; } ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto done; } in_transaction = false; @@ -318,7 +318,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } talloc_zfree(tmp_ctx); @@ -382,7 +382,7 @@ struct tevent_req *sdap_initgr_rfc2307_send(TALLOC_CTX *memctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Initgroups lookup request without a group search base\n")); + "Initgroups lookup request without a group search base\n"); ret = EINVAL; goto done; } @@ -457,8 +457,8 @@ static errno_t sdap_initgr_rfc2307_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for groups with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for groups with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -589,15 +589,15 @@ sdap_nested_groups_store(struct sysdb_ctx *sysdb, opts->group_map[SDAP_AT_GROUP_NAME].name, &groupnamelist); if (ret != EOK) { - DEBUG(3, ("sysdb_attrs_primary_name_list failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(3, "sysdb_attrs_primary_name_list failed [%d]: %s\n", + ret, strerror(ret)); goto done; } } ret = sysdb_transaction_start(sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -605,14 +605,14 @@ sdap_nested_groups_store(struct sysdb_ctx *sysdb, ret = sdap_add_incomplete_groups(sysdb, domain, opts, groupnamelist, groups, count); if (ret != EOK) { - DEBUG(6, ("Could not add incomplete groups [%d]: %s\n", - ret, strerror(ret))); + DEBUG(6, "Could not add incomplete groups [%d]: %s\n", + ret, strerror(ret)); goto done; } ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto done; } in_transaction = false; @@ -622,7 +622,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } @@ -745,13 +745,13 @@ static struct tevent_req *sdap_initgr_nested_send(TALLOC_CTX *memctx, ret = sdap_get_user_primary_name(memctx, opts, user, dom, &state->username); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("User entry had no username\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "User entry had no username\n"); goto immediate; } ret = sysdb_attrs_get_el(state->user, SYSDB_MEMBEROF, &state->memberof); if (ret || !state->memberof || state->memberof->num_values == 0) { - DEBUG(4, ("User entry lacks original memberof ?\n")); + DEBUG(4, "User entry lacks original memberof ?\n"); /* We can't find any groups for this user, so we'll * have to assume there aren't any. Just return * success here. @@ -956,8 +956,8 @@ static void sdap_initgr_nested_search(struct tevent_req *subreq) state->groups_cur++; } else { DEBUG(SSSDBG_OP_FAILURE, - ("Search for group %s, returned %zu results. Skipping\n", - state->group_dns[state->cur], count)); + "Search for group %s, returned %zu results. Skipping\n", + state->group_dns[state->cur], count); } state->cur++; @@ -1003,7 +1003,7 @@ static void sdap_initgr_nested_store(struct tevent_req *req) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto fail; } in_transaction = true; @@ -1011,30 +1011,30 @@ static void sdap_initgr_nested_store(struct tevent_req *req) /* save the groups if they are not already */ ret = sdap_initgr_store_groups(state); if (ret != EOK) { - DEBUG(3, ("Could not save groups [%d]: %s\n", - ret, strerror(ret))); + DEBUG(3, "Could not save groups [%d]: %s\n", + ret, strerror(ret)); goto fail; } /* save the group memberships */ ret = sdap_initgr_store_group_memberships(state); if (ret != EOK) { - DEBUG(3, ("Could not save group memberships [%d]: %s\n", - ret, strerror(ret))); + DEBUG(3, "Could not save group memberships [%d]: %s\n", + ret, strerror(ret)); goto fail; } /* save the user memberships */ ret = sdap_initgr_store_user_memberships(state); if (ret != EOK) { - DEBUG(3, ("Could not save user memberships [%d]: %s\n", - ret, strerror(ret))); + DEBUG(3, "Could not save user memberships [%d]: %s\n", + ret, strerror(ret)); goto fail; } ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -1046,7 +1046,7 @@ fail: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } tevent_req_error(req, ret); @@ -1102,8 +1102,8 @@ sdap_initgr_store_group_memberships(struct sdap_initgr_nested_state *state) state->groups_cur, &miter); if (ret) { - DEBUG(3, ("Could not compute memberships for group %d [%d]: %s\n", - i, ret, strerror(ret))); + DEBUG(3, "Could not compute memberships for group %d [%d]: %s\n", + i, ret, strerror(ret)); goto done; } @@ -1112,7 +1112,7 @@ sdap_initgr_store_group_memberships(struct sdap_initgr_nested_state *state) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -1123,14 +1123,14 @@ sdap_initgr_store_group_memberships(struct sdap_initgr_nested_state *state) (const char *const *) miter->add, (const char *const *) miter->del); if (ret != EOK) { - DEBUG(3, ("Failed to update memberships\n")); + DEBUG(3, "Failed to update memberships\n"); goto done; } } ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto done; } in_transaction = false; @@ -1140,7 +1140,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -1175,7 +1175,7 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) /* Get direct LDAP parents */ ret = sysdb_attrs_get_string(state->user, SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { - DEBUG(2, ("The user has no original DN\n")); + DEBUG(2, "The user has no original DN\n"); goto done; } @@ -1190,7 +1190,7 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) for (i=0; i < state->groups_cur ; i++) { ret = sysdb_attrs_get_el(state->groups[i], SYSDB_MEMBER, &el); if (ret) { - DEBUG(3, ("A group with no members during initgroups?\n")); + DEBUG(3, "A group with no members during initgroups?\n"); goto done; } @@ -1204,8 +1204,8 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) } } - DEBUG(7, ("The user %s is a direct member of %d LDAP groups\n", - state->username, nparents)); + DEBUG(7, "The user %s is a direct member of %d LDAP groups\n", + state->username, nparents); if (nparents == 0) { ldap_parent_name_list = NULL; @@ -1216,8 +1216,8 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) state->opts->group_map[SDAP_AT_GROUP_NAME].name, &ldap_parent_name_list); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_primary_name_list failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(1, "sysdb_attrs_primary_name_list failed [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -1226,8 +1226,8 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) SYSDB_MEMBER_USER, state->username, &sysdb_parent_name_list); if (ret) { - DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", - state->username, ret, strerror(ret))); + DEBUG(1, "Could not get direct sysdb parents for %s: %d [%s]\n", + state->username, ret, strerror(ret)); goto done; } @@ -1240,19 +1240,19 @@ sdap_initgr_store_user_memberships(struct sdap_initgr_nested_state *state) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto done; } in_transaction = true; - DEBUG(8, ("Updating memberships for %s\n", state->username)); + DEBUG(8, "Updating memberships for %s\n", state->username); ret = sysdb_update_members(state->sysdb, state->dom, state->username, SYSDB_MEMBER_USER, (const char *const *) add_groups, (const char *const *) del_groups); if (ret != EOK) { - DEBUG(1, ("Could not update sysdb memberships for %s: %d [%s]\n", - state->username, ret, strerror(ret))); + DEBUG(1, "Could not update sysdb memberships for %s: %d [%s]\n", + state->username, ret, strerror(ret)); goto done; } @@ -1267,7 +1267,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } talloc_zfree(tmp_ctx); @@ -1312,8 +1312,8 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx, SYSDB_MEMBER_GROUP, group_name, &sysdb_parents_names_list); if (ret) { - DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", - group_name, ret, strerror(ret))); + DEBUG(1, "Could not get direct sysdb parents for %s: %d [%s]\n", + group_name, ret, strerror(ret)); goto done; } @@ -1325,12 +1325,12 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx, &ldap_parentlist, &parents_count); if (ret != EOK) { - DEBUG(1, ("Cannot get parent groups for %s [%d]: %s\n", - group_name, ret, strerror(ret))); + DEBUG(1, "Cannot get parent groups for %s [%d]: %s\n", + group_name, ret, strerror(ret)); goto done; } - DEBUG(7, ("The group %s is a direct member of %d LDAP groups\n", - group_name, parents_count)); + DEBUG(7, "The group %s is a direct member of %d LDAP groups\n", + group_name, parents_count); if (parents_count > 0) { ret = sysdb_attrs_primary_name_list(sysdb, tmp_ctx, @@ -1339,8 +1339,8 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx, opts->group_map[SDAP_AT_GROUP_NAME].name, &ldap_parent_names_list); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_primary_name_list failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(1, "sysdb_attrs_primary_name_list failed [%d]: %s\n", + ret, strerror(ret)); goto done; } } @@ -1348,8 +1348,8 @@ sdap_initgr_nested_get_membership_diff(TALLOC_CTX *mem_ctx, ret = build_membership_diff(tmp_ctx, group_name, ldap_parent_names_list, sysdb_parents_names_list, &mdiff); if (ret != EOK) { - DEBUG(3, ("Could not build membership diff for %s [%d]: %s\n", - group_name, ret, strerror(ret))); + DEBUG(3, "Could not build membership diff for %s [%d]: %s\n", + group_name, ret, strerror(ret)); goto done; } @@ -1389,10 +1389,10 @@ static int sdap_initgr_nested_get_direct_parents(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(attrs, SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { - DEBUG(3, ("Missing originalDN\n")); + DEBUG(3, "Missing originalDN\n"); goto done; } - DEBUG(9, ("Looking up direct parents for group [%s]\n", orig_dn)); + DEBUG(9, "Looking up direct parents for group [%s]\n", orig_dn); /* FIXME - Filter only parents from full set to avoid searching * through all members of huge groups. That requires asking for memberOf @@ -1403,7 +1403,7 @@ static int sdap_initgr_nested_get_direct_parents(TALLOC_CTX *mem_ctx, for (i=0; i < ngroups; i++) { ret = sysdb_attrs_get_el(groups[i], SYSDB_MEMBER, &member); if (ret) { - DEBUG(7, ("A group with no members during initgroups?\n")); + DEBUG(7, "A group with no members during initgroups?\n"); continue; } @@ -1418,7 +1418,7 @@ static int sdap_initgr_nested_get_direct_parents(TALLOC_CTX *mem_ctx, } direct_groups[ndirect] = NULL; - DEBUG(9, ("The group [%s] has %d direct parents\n", orig_dn, ndirect)); + DEBUG(9, "The group [%s] has %d direct parents\n", orig_dn, ndirect); *_direct_parents = talloc_steal(mem_ctx, direct_groups); *_ndirect = ndirect; @@ -1514,7 +1514,7 @@ static struct tevent_req *sdap_initgr_rfc2307bis_send( if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Initgroups lookup request without a group search base\n")); + "Initgroups lookup request without a group search base\n"); ret = EINVAL; goto done; } @@ -1607,8 +1607,8 @@ static errno_t sdap_initgr_rfc2307bis_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for parent groups for user [%s] with base [%s]\n", - state->orig_dn, state->search_bases[state->base_iter]->basedn)); + "Searching for parent groups for user [%s] with base [%s]\n", + state->orig_dn, state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -1648,7 +1648,7 @@ static void sdap_initgr_rfc2307bis_process(struct tevent_req *subreq) return; } DEBUG(SSSDBG_TRACE_LIBS, - ("Found %zu parent groups for user [%s]\n", count, state->name)); + "Found %zu parent groups for user [%s]\n", count, state->name); /* Add this batch of groups to the list */ if (count > 0) { @@ -1736,7 +1736,7 @@ static void sdap_initgr_rfc2307bis_done(struct tevent_req *subreq) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto fail; } in_transaction = true; @@ -1744,27 +1744,27 @@ static void sdap_initgr_rfc2307bis_done(struct tevent_req *subreq) /* save the groups if they are not cached */ ret = save_rfc2307bis_groups(state); if (ret != EOK) { - DEBUG(3, ("Could not save groups memberships [%d]", ret)); + DEBUG(3, "Could not save groups memberships [%d]", ret); goto fail; } /* save the group membership */ ret = save_rfc2307bis_group_memberships(state); if (ret != EOK) { - DEBUG(3, ("Could not save group memberships [%d]", ret)); + DEBUG(3, "Could not save group memberships [%d]", ret); goto fail; } /* save the user memberships */ ret = save_rfc2307bis_user_memberships(state); if (ret != EOK) { - DEBUG(3, ("Could not save user memberships [%d]", ret)); + DEBUG(3, "Could not save user memberships [%d]", ret); goto fail; } ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -1776,7 +1776,7 @@ fail: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } tevent_req_error(req, ret); @@ -1837,8 +1837,8 @@ save_rfc2307bis_groups(struct sdap_initgr_rfc2307bis_state *state) ret = sdap_nested_groups_store(state->sysdb, state->dom, state->opts, groups, count); if (ret != EOK) { - DEBUG(3, ("Could not save groups [%d]: %s\n", - ret, strerror(ret))); + DEBUG(3, "Could not save groups [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -1891,7 +1891,7 @@ save_rfc2307bis_group_memberships(struct sdap_initgr_rfc2307bis_state *state) ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to start transaction\n")); + DEBUG(1, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -1930,14 +1930,14 @@ save_rfc2307bis_group_memberships(struct sdap_initgr_rfc2307bis_state *state) (const char *const *) add, (const char *const *) iter->del); if (ret != EOK) { - DEBUG(3, ("Failed to update memberships\n")); + DEBUG(3, "Failed to update memberships\n"); goto done; } } ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(1, ("Failed to commit transaction\n")); + DEBUG(1, "Failed to commit transaction\n"); goto done; } in_transaction = false; @@ -1947,7 +1947,7 @@ done: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -1981,8 +1981,8 @@ rfc2307bis_group_memberships_build(hash_entry_t *item, void *user_data) SYSDB_MEMBER_GROUP, group_name, &sysdb_parents_names_list); if (ret) { - DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", - group_name, ret, strerror(ret))); + DEBUG(1, "Could not get direct sysdb parents for %s: %d [%s]\n", + group_name, ret, strerror(ret)); goto done; } @@ -1999,8 +1999,8 @@ rfc2307bis_group_memberships_build(hash_entry_t *item, void *user_data) ret = build_membership_diff(tmp_ctx, group_name, ldap_parents_names_list, sysdb_parents_names_list, &mdiff); if (ret != EOK) { - DEBUG(3, ("Could not build membership diff for %s [%d]: %s\n", - group_name, ret, strerror(ret))); + DEBUG(3, "Could not build membership diff for %s [%d]: %s\n", + group_name, ret, strerror(ret)); goto done; } @@ -2030,10 +2030,10 @@ errno_t save_rfc2307bis_user_memberships( return ENOMEM; } - DEBUG(7, ("Save parent groups to sysdb\n")); + DEBUG(7, "Save parent groups to sysdb\n"); ret = sysdb_transaction_start(state->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto error; } in_transaction = true; @@ -2042,8 +2042,8 @@ errno_t save_rfc2307bis_user_memberships( SYSDB_MEMBER_USER, state->name, &sysdb_parent_name_list); if (ret) { - DEBUG(1, ("Could not get direct sysdb parents for %s: %d [%s]\n", - state->name, ret, strerror(ret))); + DEBUG(1, "Could not get direct sysdb parents for %s: %d [%s]\n", + state->name, ret, strerror(ret)); goto error; } @@ -2065,7 +2065,7 @@ errno_t save_rfc2307bis_user_memberships( tmp_str = sss_tc_fqname(ldap_grouplist, state->dom->names, state->dom, ldap_grouplist[c]); if (tmp_str == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("sss_tc_fqname failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sss_tc_fqname failed.\n"); ret = ENOMEM; goto error; } @@ -2086,7 +2086,7 @@ errno_t save_rfc2307bis_user_memberships( goto error; } - DEBUG(8, ("Updating memberships for %s\n", state->name)); + DEBUG(8, "Updating memberships for %s\n", state->name); ret = sysdb_update_members(state->sysdb, state->dom, state->name, SYSDB_MEMBER_USER, (const char *const *)add_groups, @@ -2097,7 +2097,7 @@ errno_t save_rfc2307bis_user_memberships( ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto error; } in_transaction = false; @@ -2109,7 +2109,7 @@ error: if (in_transaction) { tret = sysdb_transaction_cancel(state->sysdb); if (tret != EOK) { - DEBUG(1, ("Failed to cancel transaction\n")); + DEBUG(1, "Failed to cancel transaction\n"); } } talloc_free(tmp_ctx); @@ -2157,8 +2157,8 @@ struct tevent_req *rfc2307bis_nested_groups_send( struct sdap_rfc2307bis_nested_ctx *state; DEBUG(SSSDBG_TRACE_INTERNAL, - ("About to process %zu groups in nesting level %zu\n", - num_groups, nesting)); + "About to process %zu groups in nesting level %zu\n", + num_groups, nesting); req = tevent_req_create(mem_ctx, &state, struct sdap_rfc2307bis_nested_ctx); @@ -2188,8 +2188,8 @@ struct tevent_req *rfc2307bis_nested_groups_send( state->search_bases = opts->sdom->group_search_bases; if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Initgroups nested lookup request " - "without a group search base\n")); + "Initgroups nested lookup request " + "without a group search base\n"); ret = EINVAL; goto done; } @@ -2264,12 +2264,12 @@ static errno_t rfc2307bis_nested_groups_step(struct tevent_req *req) goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Processing group [%s]\n", state->primary_name)); + DEBUG(SSSDBG_TRACE_LIBS, "Processing group [%s]\n", state->primary_name); ret = hash_lookup(state->group_hash, &key, &value); if (ret == HASH_SUCCESS) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Group [%s] was already processed, " - "taking a shortcut\n", state->primary_name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Group [%s] was already processed, " + "taking a shortcut\n", state->primary_name); state->processed_groups[state->group_iter] = talloc_get_type(value.ptr, struct sdap_nested_group); talloc_free(key.str); @@ -2357,9 +2357,9 @@ static errno_t rfc2307bis_nested_groups_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for parent groups of group [%s] with base [%s]\n", + "Searching for parent groups of group [%s] with base [%s]\n", state->orig_dn, - state->search_bases[state->base_iter]->basedn)); + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -2406,7 +2406,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_LIBS, - ("Found %zu parent groups of [%s]\n", count, state->orig_dn)); + "Found %zu parent groups of [%s]\n", count, state->orig_dn); ngr = state->processed_groups[state->group_iter]; /* Add this batch of groups to the list */ @@ -2435,8 +2435,8 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq) ngr->ldap_parents[ngr->parents_count] = NULL; DEBUG(SSSDBG_TRACE_INTERNAL, - ("Total of %zu direct parents after this iteration\n", - ngr->parents_count)); + "Total of %zu direct parents after this iteration\n", + ngr->parents_count); } state->base_iter++; @@ -2537,8 +2537,8 @@ static void rfc2307bis_nested_groups_done(struct tevent_req *subreq) ret = rfc2307bis_nested_groups_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(6, ("rfc2307bis_nested failed [%d][%s]\n", - ret, strerror(ret))); + DEBUG(6, "rfc2307bis_nested failed [%d][%s]\n", + ret, strerror(ret)); tevent_req_error(req, ret); return; } @@ -2611,7 +2611,7 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx, char *clean_name; bool use_id_mapping; - DEBUG(9, ("Retrieving info for initgroups call\n")); + DEBUG(9, "Retrieving info for initgroups call\n"); req = tevent_req_create(memctx, &state, struct sdap_get_initgr_state); if (!req) return NULL; @@ -2632,7 +2632,7 @@ struct tevent_req *sdap_get_initgr_send(TALLOC_CTX *memctx, state->user_search_bases = sdom->user_search_bases; if (!state->user_search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Initgroups lookup request without a user search base\n")); + "Initgroups lookup request without a user search base\n"); ret = EINVAL; goto done; } @@ -2718,8 +2718,8 @@ static errno_t sdap_get_initgr_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for users with base [%s]\n", - state->user_search_bases[state->user_base_iter]->basedn)); + "Searching for users with base [%s]\n", + state->user_search_bases[state->user_base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -2754,7 +2754,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) size_t dn_len; size_t c = 0; - DEBUG(9, ("Receiving info for the user\n")); + DEBUG(9, "Receiving info for the user\n"); ret = sdap_get_generic_recv(subreq, state, &count, &usr_attrs); talloc_zfree(subreq); @@ -2791,29 +2791,29 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) } } else if (count != 1) { DEBUG(SSSDBG_OP_FAILURE, - ("Expected one user entry and got %zu\n", count)); + "Expected one user entry and got %zu\n", count); ret = domain_to_basedn(state, state->dom->name, &expected_basedn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("domain_to_basedn failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "domain_to_basedn failed.\n"); tevent_req_error(req, ret); return; } expected_basedn = talloc_asprintf(state, "%s%s", "cn=users,", expected_basedn); if (expected_basedn == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_append failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_append failed.\n"); tevent_req_error(req, ENOMEM); return; } - DEBUG(SSSDBG_TRACE_ALL, ("Expected BaseDN is [%s].\n", expected_basedn)); + DEBUG(SSSDBG_TRACE_ALL, "Expected BaseDN is [%s].\n", expected_basedn); expected_basedn_len = strlen(expected_basedn); for (c = 0; c < count; c++) { ret = sysdb_attrs_get_string(usr_attrs[c], SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_string failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_string failed.\n"); tevent_req_error(req, ret); return; } @@ -2823,13 +2823,13 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) && strcasecmp(orig_dn + (dn_len - expected_basedn_len), expected_basedn) == 0) { DEBUG(SSSDBG_TRACE_ALL, - ("Found matching dn [%s].\n", orig_dn)); + "Found matching dn [%s].\n", orig_dn); break; } } if (c == count) { - DEBUG(SSSDBG_OP_FAILURE, ("No matching DN found.\n")); + DEBUG(SSSDBG_OP_FAILURE, "No matching DN found.\n"); tevent_req_error(req, EINVAL); return; } @@ -2839,12 +2839,12 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) ret = sysdb_transaction_start(state->sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto fail; } in_transaction = true; - DEBUG(9, ("Storing the user\n")); + DEBUG(9, "Storing the user\n"); ret = sdap_save_user(state, state->sysdb, state->opts, state->dom, @@ -2854,11 +2854,11 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) goto fail; } - DEBUG(9, ("Commit change\n")); + DEBUG(9, "Commit change\n"); ret = sysdb_transaction_commit(state->sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -2866,12 +2866,12 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) ret = sysdb_get_real_name(state, state->sysdb, state->dom, state->name, &cname); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot canonicalize username\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot canonicalize username\n"); tevent_req_error(req, ret); return; } - DEBUG(9, ("Process user's groups\n")); + DEBUG(9, "Process user's groups\n"); switch (state->opts->schema_type) { case SDAP_SCHEMA_RFC2307: @@ -2958,7 +2958,7 @@ fail: if (in_transaction) { sret = sysdb_transaction_cancel(state->sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } tevent_req_error(req, ret); @@ -2980,7 +2980,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) char *group_sid_str; struct sdap_options *opts = state->opts; - DEBUG(9, ("Initgroups done\n")); + DEBUG(9, "Initgroups done\n"); tmp_ctx = talloc_new(NULL); if (!tmp_ctx) { @@ -3019,8 +3019,8 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret) { - DEBUG(9, ("Error in initgroups: [%d][%s]\n", - ret, strerror(ret))); + DEBUG(9, "Error in initgroups: [%d][%s]\n", + ret, strerror(ret)); goto fail; } @@ -3030,7 +3030,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) if (state->use_id_mapping) { DEBUG(SSSDBG_TRACE_LIBS, - ("Mapping primary group to unix ID\n")); + "Mapping primary group to unix ID\n"); /* The primary group ID is just the RID part of the objectSID * of the group. Generate the GID by adding this to the domain @@ -3051,7 +3051,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) &dom_sid_str); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not parse domain SID from [%s]\n", sid_str)); + "Could not parse domain SID from [%s]\n", sid_str); goto fail; } @@ -3061,7 +3061,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) &primary_gid); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("no primary group ID provided\n")); + "no primary group ID provided\n"); ret = EINVAL; goto fail; } @@ -3083,7 +3083,7 @@ static void sdap_get_initgr_done(struct tevent_req *subreq) ret = sysdb_attrs_get_uint32_t(state->orig_user, SYSDB_GIDNUM, &primary_gid); if (ret != EOK) { - DEBUG(6, ("Could not find user's primary GID\n")); + DEBUG(6, "Could not find user's primary GID\n"); goto fail; } } @@ -3161,8 +3161,8 @@ static errno_t get_sysdb_grouplist_ex(TALLOC_CTX *mem_ctx, attrs, &msg); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Error searching user [%s] by name: [%s]\n", - name, strerror(ret))); + "Error searching user [%s] by name: [%s]\n", + name, strerror(ret)); goto done; } @@ -3196,8 +3196,8 @@ static errno_t get_sysdb_grouplist_ex(TALLOC_CTX *mem_ctx, &sysdb_grouplist[i]); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not determine group name from [%s]: [%s]\n", - (const char *)groups->values[i].data, strerror(ret))); + "Could not determine group name from [%s]: [%s]\n", + (const char *)groups->values[i].data, strerror(ret)); goto done; } } diff --git a/src/providers/ldap/sdap_async_initgroups_ad.c b/src/providers/ldap/sdap_async_initgroups_ad.c index 724f308da..812f5ccc9 100644 --- a/src/providers/ldap/sdap_async_initgroups_ad.c +++ b/src/providers/ldap/sdap_async_initgroups_ad.c @@ -105,8 +105,8 @@ sdap_get_ad_match_rule_initgroups_send(TALLOC_CTX *mem_ctx, &state->attrs, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not build attribute map: [%s]\n", - strerror(ret))); + "Could not build attribute map: [%s]\n", + strerror(ret)); goto immediate; } @@ -114,8 +114,8 @@ sdap_get_ad_match_rule_initgroups_send(TALLOC_CTX *mem_ctx, ret = sss_filter_sanitize(state, state->orig_dn, &sanitized_user_dn); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not sanitize user DN: %s\n", - strerror(ret))); + "Could not sanitize user DN: %s\n", + strerror(ret)); goto immediate; } @@ -141,8 +141,8 @@ sdap_get_ad_match_rule_initgroups_send(TALLOC_CTX *mem_ctx, ret = sdap_get_ad_match_rule_initgroups_next_base(req); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("sdap_get_ad_match_rule_members_next_base failed: [%s]\n", - strerror(ret))); + "sdap_get_ad_match_rule_members_next_base failed: [%s]\n", + strerror(ret)); goto immediate; } @@ -171,8 +171,8 @@ sdap_get_ad_match_rule_initgroups_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for groups with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for groups with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -208,12 +208,12 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("LDAP search failed: [%s]\n", sss_strerror(ret))); + "LDAP search failed: [%s]\n", sss_strerror(ret)); goto error; } DEBUG(SSSDBG_TRACE_LIBS, - ("Search for users returned %zu results\n", count)); + "Search for users returned %zu results\n", count); /* Add this batch of groups to the list */ if (count > 0) { @@ -250,7 +250,7 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq) if (state->count == 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("User is not a member of any group in the search bases\n")); + "User is not a member of any group in the search bases\n"); } /* Get the current sysdb group list for this user @@ -260,9 +260,9 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq) state->name, &sysdb_grouplist); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not get the list of groups for [%s] in the sysdb: " + "Could not get the list of groups for [%s] in the sysdb: " "[%s]\n", - state->name, strerror(ret))); + state->name, strerror(ret)); goto error; } @@ -280,8 +280,8 @@ sdap_get_ad_match_rule_initgroups_step(struct tevent_req *subreq) state->count); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not store groups for user [%s]: [%s]\n", - state->name, strerror(ret))); + "Could not store groups for user [%s]: [%s]\n", + state->name, strerror(ret)); goto error; } @@ -328,7 +328,7 @@ sdap_get_ad_tokengroups_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_get_ad_tokengroups_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -383,13 +383,13 @@ static void sdap_get_ad_tokengroups_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("LDAP search failed: [%s]\n", sss_strerror(ret))); + "LDAP search failed: [%s]\n", sss_strerror(ret)); goto done; } if (num_users != 1) { DEBUG(SSSDBG_MINOR_FAILURE, - ("More than one result on a base search!\n")); + "More than one result on a base search!\n"); ret = EINVAL; goto done; } @@ -397,16 +397,16 @@ static void sdap_get_ad_tokengroups_done(struct tevent_req *subreq) /* get the list of sids from tokengroups */ ret = sysdb_attrs_get_el_ext(users[0], AD_TOKENGROUPS_ATTR, false, &el); if (ret == ENOENT) { - DEBUG(SSSDBG_TRACE_LIBS, ("No tokenGroups entries for [%s]\n", - state->username)); + DEBUG(SSSDBG_TRACE_LIBS, "No tokenGroups entries for [%s]\n", + state->username); state->sids = NULL; state->num_sids = 0; ret = EOK; goto done; } else if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not read tokenGroups attribute: " - "[%s]\n", strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not read tokenGroups attribute: " + "[%s]\n", strerror(ret)); goto done; } @@ -423,8 +423,8 @@ static void sdap_get_ad_tokengroups_done(struct tevent_req *subreq) el->values[i].length, &sid_str); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert binary SID to string: [%s]. Skipping\n", - idmap_error_string(err))); + "Could not convert binary SID to string: [%s]. Skipping\n", + idmap_error_string(err)); continue; } @@ -488,7 +488,7 @@ sdap_ad_tokengroups_update_members(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; } @@ -496,8 +496,8 @@ sdap_ad_tokengroups_update_members(TALLOC_CTX *mem_ctx, ret = get_sysdb_grouplist_dn(tmp_ctx, sysdb, domain, username, &sysdb_groups); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not get the list of groups for " - "[%s] in the sysdb: [%s]\n", username, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not get the list of groups for " + "[%s] in the sysdb: [%s]\n", username, strerror(ret)); goto done; } @@ -509,15 +509,15 @@ sdap_ad_tokengroups_update_members(TALLOC_CTX *mem_ctx, goto done; } - DEBUG(SSSDBG_TRACE_LIBS, ("Updating memberships for [%s]\n", username)); + DEBUG(SSSDBG_TRACE_LIBS, "Updating memberships for [%s]\n", username); ret = sysdb_update_members_dn(domain->sysdb, domain, username, SYSDB_MEMBER_USER, (const char *const *) add_groups, (const char *const *) del_groups); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Membership update failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Membership update failed [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -557,7 +557,7 @@ sdap_ad_resolve_sids_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_ad_resolve_sids_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -610,14 +610,14 @@ static errno_t sdap_ad_resolve_sids_step(struct tevent_req *req) domain = find_subdomain_by_sid(state->domain, state->current_sid); if (domain == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("SID %s does not belong to any known " - "domain\n", state->current_sid)); + DEBUG(SSSDBG_MINOR_FAILURE, "SID %s does not belong to any known " + "domain\n", state->current_sid); } } while (domain == NULL); sdap_domain = sdap_domain_get(state->opts, domain); if (sdap_domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("SDAP domain does not exist?\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "SDAP domain does not exist?\n"); return ERR_INTERNAL; } @@ -647,9 +647,9 @@ static void sdap_ad_resolve_sids_done(struct tevent_req *subreq) ret = groups_get_recv(subreq, &dp_error, &sdap_error); talloc_zfree(subreq); if (ret != EOK || sdap_error != EOK || dp_error != DP_ERR_OK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to resolve SID %s [dp_error: %d, " + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to resolve SID %s [dp_error: %d, " "sdap_error: %d, ret: %d]: %s\n", state->current_sid, dp_error, - sdap_error, ret, strerror(ret))); + sdap_error, ret, strerror(ret)); goto done; } @@ -715,7 +715,7 @@ sdap_ad_tokengroups_initgr_mapping_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_ad_tokengroups_initgr_mapping_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -735,15 +735,15 @@ sdap_ad_tokengroups_initgr_mapping_send(TALLOC_CTX *mem_ctx, sdom = sdap_domain_get(opts, domain); if (sdom == NULL || sdom->pvt == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No ID ctx available for [%s].\n", - domain->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "No ID ctx available for [%s].\n", + domain->name); ret = EINVAL; goto immediately; } subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx); state->op = sdap_id_op_create(state, subdom_id_ctx->ldap_ctx->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto immediately; } @@ -829,7 +829,7 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) 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"); ret = ENOMEM; goto done; } @@ -840,8 +840,8 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) ret = sdap_get_ad_tokengroups_recv(state, subreq, &num_sids, &sids); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to acquire tokengroups [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to acquire tokengroups [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -861,27 +861,27 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) for (i = 0; i < num_sids; i++) { sid = sids[i]; - DEBUG(SSSDBG_TRACE_LIBS, ("Processing membership SID [%s]\n", sid)); + DEBUG(SSSDBG_TRACE_LIBS, "Processing membership SID [%s]\n", sid); ret = sdap_idmap_sid_to_unix(state->idmap_ctx, sid, &gid); if (ret == ENOTSUP) { - DEBUG(SSSDBG_TRACE_FUNC, ("Skipping built-in object.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Skipping built-in object.\n"); ret = EOK; continue; } else if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not convert SID to GID: [%s]. " - "Skipping\n", strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not convert SID to GID: [%s]. " + "Skipping\n", strerror(ret)); continue; } domain = find_subdomain_by_sid(get_domains_head(state->domain), sid); if (domain == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Domain not found for SID %s\n", sid)); + DEBUG(SSSDBG_MINOR_FAILURE, "Domain not found for SID %s\n", sid); continue; } - DEBUG(SSSDBG_TRACE_LIBS, ("SID [%s] maps to GID [%"SPRIgid"]\n", - sid, gid)); + DEBUG(SSSDBG_TRACE_LIBS, "SID [%s] maps to GID [%"SPRIgid"]\n", + sid, gid); /* Check whether this GID already exists in the sysdb */ ret = sysdb_search_group_by_gid(tmp_ctx, domain->sysdb, domain, @@ -890,7 +890,7 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) name = ldb_msg_find_attr_as_string(msg, SYSDB_NAME, NULL); if (name == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not retrieve group name from sysdb\n")); + "Could not retrieve group name from sysdb\n"); ret = EINVAL; goto done; } @@ -902,14 +902,14 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) ret = sysdb_add_incomplete_group(domain->sysdb, domain, name, gid, NULL, sid, false, now); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not create incomplete " - "group: [%s]\n", strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not create incomplete " + "group: [%s]\n", strerror(ret)); goto done; } } else { /* Unexpected error */ - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not look up group in sysdb: " - "[%s]\n", strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not look up group in sysdb: " + "[%s]\n", strerror(ret)); goto done; } @@ -927,15 +927,15 @@ static void sdap_ad_tokengroups_initgr_mapping_done(struct tevent_req *subreq) state->sysdb, state->domain, groups); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Membership update failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Membership update failed [%d]: %s\n", + ret, strerror(ret)); goto done; } ret = sysdb_transaction_commit(state->sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not commit transaction! [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not commit transaction! [%s]\n", + strerror(ret)); goto done; } in_transaction = false; @@ -945,8 +945,8 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(state->sysdb); - DEBUG(SSSDBG_FATAL_FAILURE, ("Could not cancel transaction! [%s]\n", - strerror(sret))); + DEBUG(SSSDBG_FATAL_FAILURE, "Could not cancel transaction! [%s]\n", + strerror(sret)); } if (ret != EOK) { @@ -1010,7 +1010,7 @@ sdap_ad_tokengroups_initgr_posix_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_ad_tokengroups_initgr_posix_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -1031,15 +1031,15 @@ sdap_ad_tokengroups_initgr_posix_send(TALLOC_CTX *mem_ctx, sdom = sdap_domain_get(opts, domain); if (sdom == NULL || sdom->pvt == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("No ID ctx available for [%s].\n", - domain->name)); + DEBUG(SSSDBG_CRIT_FAILURE, "No ID ctx available for [%s].\n", + domain->name); ret = EINVAL; goto immediately; } subdom_id_ctx = talloc_get_type(sdom->pvt, struct ad_id_ctx); state->op = sdap_id_op_create(state, subdom_id_ctx->ldap_ctx->conn_cache); if (!state->op) { - DEBUG(2, ("sdap_id_op_create failed\n")); + DEBUG(2, "sdap_id_op_create failed\n"); ret = ENOMEM; goto immediately; } @@ -1126,7 +1126,7 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) 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"); ret = ENOMEM; goto done; } @@ -1138,8 +1138,8 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) ret = sdap_get_ad_tokengroups_recv(state, subreq, &num_sids, &sids); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to acquire tokengroups [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to acquire tokengroups [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -1162,11 +1162,11 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) * to remember the SID and download missing groups one by one. */ for (i = 0; i < num_sids; i++) { sid = sids[i]; - DEBUG(SSSDBG_TRACE_LIBS, ("Processing membership SID [%s]\n", sid)); + DEBUG(SSSDBG_TRACE_LIBS, "Processing membership SID [%s]\n", sid); domain = find_subdomain_by_sid(get_domains_head(state->domain), sid); if (domain == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Domain not found for SID %s\n", sid)); + DEBUG(SSSDBG_MINOR_FAILURE, "Domain not found for SID %s\n", sid); continue; } @@ -1183,7 +1183,7 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) name = ldb_msg_find_attr_as_string(msg, SYSDB_NAME, NULL); if (name == NULL) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not retrieve group name from sysdb\n")); + "Could not retrieve group name from sysdb\n"); ret = EINVAL; goto done; } @@ -1201,11 +1201,11 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) missing_sids[num_missing_sids] = talloc_steal(missing_sids, sid); num_missing_sids++; - DEBUG(SSSDBG_TRACE_FUNC, ("Missing SID %s will be downloaded\n", - sid)); + DEBUG(SSSDBG_TRACE_FUNC, "Missing SID %s will be downloaded\n", + sid); } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not look up group in sysdb: " - "[%s]\n", strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not look up group in sysdb: " + "[%s]\n", strerror(ret)); goto done; } } @@ -1218,8 +1218,8 @@ sdap_ad_tokengroups_initgr_posix_tg_done(struct tevent_req *subreq) state->sysdb, state->domain, valid_groups); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Membership update failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Membership update failed [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -1260,8 +1260,8 @@ sdap_ad_tokengroups_initgr_posix_sids_done(struct tevent_req *subreq) ret = sdap_ad_resolve_sids_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to resolve missing SIDs " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to resolve missing SIDs " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -1310,7 +1310,7 @@ sdap_ad_tokengroups_initgroups_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_ad_tokengroups_initgroups_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } diff --git a/src/providers/ldap/sdap_async_nested_groups.c b/src/providers/ldap/sdap_async_nested_groups.c index f58564aec..8095eb6d5 100644 --- a/src/providers/ldap/sdap_async_nested_groups.c +++ b/src/providers/ldap/sdap_async_nested_groups.c @@ -196,8 +196,8 @@ static errno_t sdap_nested_group_hash_entry(hash_table_t *table, return ret; } - DEBUG(SSSDBG_TRACE_ALL, ("Inserting [%s] into hash table [%s]\n", - name, table_name)); + DEBUG(SSSDBG_TRACE_ALL, "Inserting [%s] into hash table [%s]\n", + name, table_name); key.type = HASH_KEY_STRING; key.str = talloc_strdup(NULL, name); @@ -245,12 +245,12 @@ sdap_nested_group_hash_group(struct sdap_nested_group_ctx *group_ctx, if (group_ctx->opts->schema_type == SDAP_SCHEMA_AD) { ret = sysdb_attrs_get_int32_t(group, SYSDB_GROUP_TYPE, &ad_group_type); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_get_int32_t failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_get_int32_t failed.\n"); return ret; } - DEBUG(SSSDBG_TRACE_ALL, ("AD group has type flags %#x.\n", - ad_group_type)); + DEBUG(SSSDBG_TRACE_ALL, "AD group has type flags %#x.\n", + ad_group_type); /* Only security groups from AD are considered for POSIX groups. * Additionally only global and universal group are taken to account * for trusted domains. */ @@ -260,7 +260,7 @@ sdap_nested_group_hash_group(struct sdap_nested_group_ctx *group_ctx, || (ad_group_type & SDAP_AD_GROUP_TYPE_UNIVERSAL))))) { posix_group = false; gid = 0; - DEBUG(SSSDBG_TRACE_FUNC, ("Filtering AD group.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Filtering AD group.\n"); } } @@ -268,15 +268,15 @@ sdap_nested_group_hash_group(struct sdap_nested_group_ctx *group_ctx, &gid); if (ret == ENOENT || (ret == EOK && gid == 0) || !posix_group) { DEBUG(SSSDBG_TRACE_ALL, - ("The group's gid was %s\n", ret == ENOENT ? "missing" : "zero")); + "The group's gid was %s\n", ret == ENOENT ? "missing" : "zero"); DEBUG(SSSDBG_TRACE_INTERNAL, - ("Marking group as non-posix and setting GID=0!\n")); + "Marking group as non-posix and setting GID=0!\n"); if (ret == ENOENT || !posix_group) { ret = sysdb_attrs_add_uint32(group, map[SDAP_AT_GROUP_GID].sys_name, 0); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to add a GID to non-posix group!\n")); + "Failed to add a GID to non-posix group!\n"); return ret; } } @@ -284,7 +284,7 @@ sdap_nested_group_hash_group(struct sdap_nested_group_ctx *group_ctx, ret = sysdb_attrs_add_bool(group, SYSDB_POSIX, false); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Error: Failed to mark group as non-posix!\n")); + "Error: Failed to mark group as non-posix!\n"); return ret; } } else if (ret != EOK) { @@ -320,7 +320,7 @@ static errno_t sdap_nested_group_sysdb_search(struct sss_domain_info *domain, } if (count != 1) { - DEBUG(SSSDBG_OP_FAILURE, ("More than one entry found?\n")); + DEBUG(SSSDBG_OP_FAILURE, "More than one entry found?\n"); ret = EFAULT; goto done; } @@ -330,7 +330,7 @@ static errno_t sdap_nested_group_sysdb_search(struct sss_domain_info *domain, if (user) { uid = ldb_msg_find_attr_as_uint64(msgs[0], SYSDB_UIDNUM, 0); if (uid == 0) { - DEBUG(SSSDBG_OP_FAILURE, ("User with no UID?\n")); + DEBUG(SSSDBG_OP_FAILURE, "User with no UID?\n"); ret = EINVAL; goto done; } @@ -366,7 +366,7 @@ sdap_nested_group_check_cache(struct sdap_options *opts, 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; } @@ -477,7 +477,7 @@ sdap_nested_group_split_members(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; } @@ -524,7 +524,7 @@ sdap_nested_group_split_members(TALLOC_CTX *mem_ctx, dn, &type); if (ret == EOK) { /* found and valid */ - DEBUG(SSSDBG_TRACE_ALL, ("[%s] found in cache, skipping\n", dn)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] found in cache, skipping\n", dn); continue; } else if (ret != EAGAIN && ret != ENOENT) { /* error */ @@ -542,18 +542,18 @@ sdap_nested_group_split_members(TALLOC_CTX *mem_ctx, if (is_user && is_group) { /* search bases overlap */ - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is unknown object\n", dn)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is unknown object\n", dn); type = SDAP_NESTED_GROUP_DN_UNKNOWN; } else if (is_user) { - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is a user\n", dn)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is a user\n", dn); type = SDAP_NESTED_GROUP_DN_USER; } else if (is_group) { - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is a group\n", dn)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is a group\n", dn); type = SDAP_NESTED_GROUP_DN_GROUP; } else { /* dn is outside search bases */ - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is out of scope of configured " - "search bases, skipping\n", dn)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is out of scope of configured " + "search bases, skipping\n", dn); continue; } } @@ -561,8 +561,8 @@ sdap_nested_group_split_members(TALLOC_CTX *mem_ctx, /* check nesting level */ if (type == SDAP_NESTED_GROUP_DN_GROUP) { if (nesting_level >= group_ctx->max_nesting_level) { - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is outside nesting limit " - "(level %d), skipping\n", dn, nesting_level)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is outside nesting limit " + "(level %d), skipping\n", dn, nesting_level); talloc_zfree(user_filter); talloc_zfree(group_filter); continue; @@ -636,7 +636,7 @@ sdap_nested_group_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -649,15 +649,15 @@ sdap_nested_group_send(TALLOC_CTX *mem_ctx, ret = sss_hash_create(state->group_ctx, 32, &state->group_ctx->users); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to create hash table [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to create hash table [%d]: %s\n", + ret, strerror(ret)); goto immediately; } ret = sss_hash_create(state->group_ctx, 32, &state->group_ctx->groups); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to create hash table [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to create hash table [%d]: %s\n", + ret, strerror(ret)); goto immediately; } @@ -682,8 +682,8 @@ sdap_nested_group_send(TALLOC_CTX *mem_ctx, if (state->group_ctx->try_deref) { for (i = 0; opts->sdom->user_search_bases[i] != NULL; i++) { if (opts->sdom->user_search_bases[i]->filter != NULL) { - DEBUG(SSSDBG_TRACE_FUNC, ("User search base contains filter, " - "dereference will be disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "User search base contains filter, " + "dereference will be disabled\n"); state->group_ctx->try_deref = false; break; } @@ -693,8 +693,8 @@ sdap_nested_group_send(TALLOC_CTX *mem_ctx, if (state->group_ctx->try_deref) { for (i = 0; opts->sdom->group_search_bases[i] != NULL; i++) { if (opts->sdom->group_search_bases[i]->filter != NULL) { - DEBUG(SSSDBG_TRACE_FUNC, ("Group search base contains filter, " - "dereference will be disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Group search base contains filter, " + "dereference will be disabled\n"); state->group_ctx->try_deref = false; break; } @@ -704,8 +704,8 @@ sdap_nested_group_send(TALLOC_CTX *mem_ctx, /* insert initial group into hash table */ ret = sdap_nested_group_hash_group(state->group_ctx, group); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to insert group into hash table " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to insert group into hash table " + "[%d]: %s\n", ret, strerror(ret)); goto immediately; } @@ -773,8 +773,8 @@ errno_t sdap_nested_group_recv(TALLOC_CTX *mem_ctx, return ret; } - DEBUG(SSSDBG_TRACE_FUNC, ("%lu users found in the hash table\n", - num_users)); + DEBUG(SSSDBG_TRACE_FUNC, "%lu users found in the hash table\n", + num_users); ret = sdap_nested_group_extract_hash_table(state, state->group_ctx->groups, &num_groups, &groups); @@ -782,8 +782,8 @@ errno_t sdap_nested_group_recv(TALLOC_CTX *mem_ctx, return ret; } - DEBUG(SSSDBG_TRACE_FUNC, ("%lu groups found in the hash table\n", - num_groups)); + DEBUG(SSSDBG_TRACE_FUNC, "%lu groups found in the hash table\n", + num_groups); if (_num_users != NULL) { *_num_users = num_users; @@ -835,7 +835,7 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_process_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -847,8 +847,8 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, /* get original dn */ ret = sysdb_attrs_get_string(group, SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve original dn " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve original dn " + "[%d]: %s\n", ret, strerror(ret)); goto immediately; } @@ -858,7 +858,7 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("About to process group [%s]\n", orig_dn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "About to process group [%s]\n", orig_dn); /* get member list */ ret = sysdb_attrs_get_el(group, group_map[SDAP_AT_GROUP_MEMBER].sys_name, @@ -867,8 +867,8 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, ret = EOK; /* no members */ goto immediately; } else if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve member list " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve member list " + "[%d]: %s\n", ret, strerror(ret)); goto immediately; } @@ -879,8 +879,8 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, &state->num_missing_total, &state->num_missing_groups); - DEBUG(SSSDBG_TRACE_INTERNAL, ("Looking up %d/%d members of group [%s]\n", - state->num_missing_total, members->num_values, orig_dn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Looking up %d/%d members of group [%s]\n", + state->num_missing_total, members->num_values, orig_dn); if (state->num_missing_total == 0) { ret = EOK; /* we're done */ @@ -890,15 +890,15 @@ sdap_nested_group_process_send(TALLOC_CTX *mem_ctx, /* process members */ if (group_ctx->try_deref && state->num_missing_total > group_ctx->deref_treshold) { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Dereferencing members of group [%s]\n", - orig_dn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Dereferencing members of group [%s]\n", + orig_dn); state->deref = true; subreq = sdap_nested_group_deref_send(state, ev, group_ctx, members, orig_dn, state->nesting_level); } else { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Members of group [%s] will be " - "processed individually\n", orig_dn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Members of group [%s] will be " + "processed individually\n", orig_dn); state->deref = false; subreq = sdap_nested_group_single_send(state, ev, group_ctx, state->missing, @@ -943,8 +943,8 @@ static void sdap_nested_group_process_done(struct tevent_req *subreq) state->group_ctx->try_deref = false; state->deref = false; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Members of group [%s] will be " - "processed individually\n", state->group_dn)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Members of group [%s] will be " + "processed individually\n", state->group_dn); subreq = sdap_nested_group_single_send(state, state->ev, @@ -1010,7 +1010,7 @@ sdap_nested_group_recurse_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_recurse_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -1132,7 +1132,7 @@ sdap_nested_group_single_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_single_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -1256,12 +1256,12 @@ sdap_nested_group_single_step_process(struct tevent_req *subreq) /* save user in hash table */ ret = sdap_nested_group_hash_user(state->group_ctx, entry); if (ret == EEXIST) { - DEBUG(SSSDBG_TRACE_FUNC, ("User was looked up twice, " - "this shouldn't have happened.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "User was looked up twice, " + "this shouldn't have happened.\n"); goto done; } else if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to save user in hash table " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to save user in hash table " + "[%d]: %s\n", ret, strerror(ret)); goto done; } break; @@ -1285,12 +1285,12 @@ sdap_nested_group_single_step_process(struct tevent_req *subreq) ret = sysdb_attrs_get_string(entry, SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("The entry has no originalDN\n")); + "The entry has no originalDN\n"); orig_dn = "invalid"; } - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is outside nesting limit " - "(level %d), skipping\n", orig_dn, state->nesting_level)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is outside nesting limit " + "(level %d), skipping\n", orig_dn, state->nesting_level); break; } } @@ -1298,12 +1298,12 @@ sdap_nested_group_single_step_process(struct tevent_req *subreq) /* save group in hash table */ ret = sdap_nested_group_hash_group(state->group_ctx, entry); if (ret == EEXIST) { - DEBUG(SSSDBG_TRACE_FUNC, ("Group was looked up twice, " - "this shouldn't have happened.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Group was looked up twice, " + "this shouldn't have happened.\n"); goto done; } else if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to save group in hash table " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to save group in hash table " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -1336,8 +1336,8 @@ static void sdap_nested_group_single_step_done(struct tevent_req *subreq) ret = sdap_nested_group_single_step_process(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error processing direct membership " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Error processing direct membership " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -1367,7 +1367,7 @@ static void sdap_nested_group_single_step_done(struct tevent_req *subreq) done: if (ret == EOK) { /* tevent_req_error() cannot cope with EOK */ - DEBUG(SSSDBG_CRIT_FAILURE, ("We should not get here with EOK\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "We should not get here with EOK\n"); tevent_req_error(req, EINVAL); } else if (ret != EAGAIN) { tevent_req_error(req, ret); @@ -1387,8 +1387,8 @@ static void sdap_nested_group_single_done(struct tevent_req *subreq) ret = sdap_nested_group_recurse_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error processing nested groups " - "[%d]: %s", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Error processing nested groups " + "[%d]: %s", ret, strerror(ret)); tevent_req_error(req, ret); } @@ -1539,7 +1539,7 @@ sdap_nested_group_lookup_user_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_lookup_user_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -1552,8 +1552,8 @@ sdap_nested_group_lookup_user_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_MINOR_FAILURE, ("Couldn't parse out user information " - "based on DN %s, falling back to an LDAP lookup\n", member->dn)); + DEBUG(SSSDBG_MINOR_FAILURE, "Couldn't parse out user information " + "based on DN %s, falling back to an LDAP lookup\n", member->dn); } /* only pull down username and originalDN */ @@ -1636,7 +1636,7 @@ static void sdap_nested_group_lookup_user_done(struct tevent_req *subreq) state->user = NULL; } else { DEBUG(SSSDBG_OP_FAILURE, - ("BASE search returned more than one records\n")); + "BASE search returned more than one records\n"); ret = EIO; goto done; } @@ -1692,7 +1692,7 @@ sdap_nested_group_lookup_group_send(TALLOC_CTX *mem_ctx, 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")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -1772,7 +1772,7 @@ static void sdap_nested_group_lookup_group_done(struct tevent_req *subreq) state->group = NULL; } else { DEBUG(SSSDBG_OP_FAILURE, - ("BASE search returned more than one records\n")); + "BASE search returned more than one records\n"); ret = EIO; goto done; } @@ -1832,7 +1832,7 @@ sdap_nested_group_lookup_unknown_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_lookup_unknown_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -2011,7 +2011,7 @@ sdap_nested_group_deref_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_nested_group_deref_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -2101,8 +2101,8 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Received %zu dereference results, " - "about to process them\n", num_entries)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Received %zu dereference results, " + "about to process them\n", num_entries); /* * We don't have any knowledge about possible number of groups when @@ -2120,7 +2120,7 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) ret = sysdb_attrs_get_string(entries[i]->attrs, SYSDB_ORIG_DN, &orig_dn); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("The entry has no originalDN\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "The entry has no originalDN\n"); goto done; } @@ -2175,8 +2175,8 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) entries[i]->attrs); if (ret != EOK && ret != EEXIST) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unable to save user in hash table " - "[%d]: %s\n", ret, strerror(ret))); + "Unable to save user in hash table " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -2185,8 +2185,8 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) /* skip the group if we have reached the nesting limit */ if (state->nesting_level >= state->group_ctx->max_nesting_level) { - DEBUG(SSSDBG_TRACE_ALL, ("[%s] is outside nesting limit " - "(level %d), skipping\n", orig_dn, state->nesting_level)); + DEBUG(SSSDBG_TRACE_ALL, "[%s] is outside nesting limit " + "(level %d), skipping\n", orig_dn, state->nesting_level); continue; } @@ -2202,8 +2202,8 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) continue; } else if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Unable to save group in hash table " - "[%d]: %s\n", ret, strerror(ret))); + "Unable to save group in hash table " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -2214,7 +2214,7 @@ sdap_nested_group_deref_direct_process(struct tevent_req *subreq) } else { /* this should never happen, but if it does, do not loop forever */ DEBUG(SSSDBG_MINOR_FAILURE, - ("Entry does not match any known map, skipping\n")); + "Entry does not match any known map, skipping\n"); continue; } } @@ -2251,8 +2251,8 @@ static void sdap_nested_group_deref_direct_done(struct tevent_req *subreq) ret = sdap_nested_group_deref_direct_process(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Error processing direct membership " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Error processing direct membership " + "[%d]: %s\n", ret, strerror(ret)); goto done; } @@ -2275,7 +2275,7 @@ static void sdap_nested_group_deref_direct_done(struct tevent_req *subreq) done: if (ret == EOK) { /* tevent_req_error() cannot cope with EOK */ - DEBUG(SSSDBG_CRIT_FAILURE, ("We should not get here with EOK\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "We should not get here with EOK\n"); tevent_req_error(req, EINVAL); } else if (ret != EAGAIN) { tevent_req_error(req, ret); diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c index b47b3e590..99656697c 100644 --- a/src/providers/ldap/sdap_async_netgroups.c +++ b/src/providers/ldap/sdap_async_netgroups.c @@ -55,11 +55,11 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, ret = sdap_get_netgroup_primary_name(memctx, opts, attrs, dom, &name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get netgroup name\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get netgroup name\n"); goto fail; } - DEBUG(SSSDBG_TRACE_FUNC, ("Processing netgroup %s\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing netgroup %s\n", name); netgroup_attrs = sysdb_new_attrs(memctx); if (!netgroup_attrs) { @@ -81,8 +81,8 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, goto fail; } if (el->num_values == 0) { - DEBUG(7, ("Original mod-Timestamp is not available for [%s].\n", - name)); + DEBUG(7, "Original mod-Timestamp is not available for [%s].\n", + name); } else { ret = sysdb_attrs_add_string(netgroup_attrs, opts->netgroup_map[SDAP_AT_NETGROUP_MODSTAMP].sys_name, @@ -119,12 +119,12 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, goto fail; } - DEBUG(6, ("Storing info for netgroup %s\n", name)); + DEBUG(6, "Storing info for netgroup %s\n", name); ret = sdap_save_all_names(name, attrs, dom, netgroup_attrs); if (ret != EOK) { - DEBUG(1, ("Failed to save netgroup names\n")); + DEBUG(1, "Failed to save netgroup names\n"); goto fail; } @@ -134,7 +134,7 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, ret = list_missing_attrs(attrs, opts->netgroup_map, SDAP_OPTS_NETGROUP, attrs, &missing); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to list missing attributes\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to list missing attributes\n"); goto fail; } @@ -149,7 +149,7 @@ static errno_t sdap_save_netgroup(TALLOC_CTX *memctx, return EOK; fail: - DEBUG(2, ("Failed to save netgroup %s\n", name)); + DEBUG(2, "Failed to save netgroup %s\n", name); return ret; } @@ -172,14 +172,14 @@ errno_t update_dn_list(struct dn_item *dn_list, const size_t count, for(c = 0; c < count; c++) { dn = ldb_msg_find_attr_as_string(res[c], SYSDB_ORIG_DN, NULL); if (dn == NULL) { - DEBUG(1, ("Missing original DN.\n")); + DEBUG(1, "Missing original DN.\n"); return EINVAL; } if (strcmp(dn, dn_item->dn) == 0) { - DEBUG(9, ("Found matching entry for [%s].\n", dn_item->dn)); + DEBUG(9, "Found matching entry for [%s].\n", dn_item->dn); cn = ldb_msg_find_attr_as_string(res[c], SYSDB_NAME, NULL); if (cn == NULL) { - DEBUG(1, ("Missing name.\n")); + DEBUG(1, "Missing name.\n"); return EINVAL; } dn_item->cn = talloc_strdup(dn_item, cn); @@ -258,7 +258,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, SYSDB_ORIG_NETGROUP_MEMBER, state, &member_list); if (ret != EOK) { - DEBUG(7, ("Missing netgroup members.\n")); + DEBUG(7, "Missing netgroup members.\n"); continue; } @@ -266,12 +266,12 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, if (is_dn(member_list[mc])) { dn_item = talloc_zero(state, struct dn_item); if (dn_item == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); ret = ENOMEM; goto fail; } - DEBUG(9, ("Adding [%s] to DN list.\n", member_list[mc])); + DEBUG(9, "Adding [%s] to DN list.\n", member_list[mc]); dn_item->netgroup = netgroups[c]; dn_item->dn = member_list[mc]; DLIST_ADD(state->dn_list, dn_item); @@ -279,7 +279,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, ret = sysdb_attrs_add_string(netgroups[c], SYSDB_NETGROUP_MEMBER, member_list[mc]); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); goto fail; } } @@ -287,7 +287,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, } if (state->dn_list == NULL) { - DEBUG(9, ("No DNs found among netgroup members.\n")); + DEBUG(9, "No DNs found among netgroup members.\n"); tevent_req_done(req); tevent_req_post(req, ev); return req; @@ -295,7 +295,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, dn_filter = talloc_strdup(state, "(|"); if (dn_filter == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); ret = ENOMEM;; goto fail; } @@ -304,7 +304,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, dn_filter = talloc_asprintf_append(dn_filter, "(%s=%s)", SYSDB_ORIG_DN, dn_item->dn); if (dn_filter == NULL) { - DEBUG(1, ("talloc_asprintf_append failed.\n")); + DEBUG(1, "talloc_asprintf_append failed.\n"); ret = ENOMEM; goto fail; } @@ -312,14 +312,14 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, dn_filter = talloc_asprintf_append(dn_filter, ")"); if (dn_filter == NULL) { - DEBUG(1, ("talloc_asprintf_append failed.\n")); + DEBUG(1, "talloc_asprintf_append failed.\n"); ret = ENOMEM; goto fail; } sysdb_filter = talloc_asprintf(state, "(&(%s)%s)", SYSDB_NC, dn_filter); if (sysdb_filter == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto fail; } @@ -335,7 +335,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, talloc_zfree(netgr_basedn); talloc_zfree(sysdb_filter); if (ret != EOK && ret != ENOENT) { - DEBUG(1, ("sysdb_search_entry failed.\n")); + DEBUG(1, "sysdb_search_entry failed.\n"); goto fail; } @@ -343,7 +343,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, ret = update_dn_list(state->dn_list, sysdb_count, sysdb_res, &all_resolved); if (ret != EOK) { - DEBUG(1, ("update_dn_list failed.\n")); + DEBUG(1, "update_dn_list failed.\n"); goto fail; } @@ -353,7 +353,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, SYSDB_NETGROUP_MEMBER, dn_item->cn); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); goto fail; } } @@ -367,7 +367,7 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx, state->dn_idx = state->dn_list; ret = netgr_translate_members_ldap_step(req); if (ret != EOK && ret != EAGAIN) { - DEBUG(1, ("netgr_translate_members_ldap_step failed.\n")); + DEBUG(1, "netgr_translate_members_ldap_step failed.\n"); goto fail; } @@ -410,7 +410,7 @@ static errno_t netgr_translate_members_ldap_step(struct tevent_req *req) SYSDB_NETGROUP_MEMBER, state->dn_item->cn); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); tevent_req_error(req, ret); return ret; } @@ -430,14 +430,14 @@ static errno_t netgr_translate_members_ldap_step(struct tevent_req *req) cn_attr = talloc_array(state, const char *, 3); if (cn_attr == NULL) { - DEBUG(1, ("talloc_array failed.\n")); + DEBUG(1, "talloc_array failed.\n"); return ENOMEM; } cn_attr[0] = state->opts->netgroup_map[SDAP_AT_NETGROUP_NAME].name; cn_attr[1] = "objectclass"; cn_attr[2] = NULL; - DEBUG(9, ("LDAP base search for [%s].\n", state->dn_item->dn)); + DEBUG(9, "LDAP base search for [%s].\n", state->dn_item->dn); subreq = sdap_get_generic_send(state, state->ev, state->opts, state->sh, state->dn_item->dn, LDAP_SCOPE_BASE, filter, cn_attr, state->opts->netgroup_map, @@ -446,7 +446,7 @@ static errno_t netgr_translate_members_ldap_step(struct tevent_req *req) SDAP_SEARCH_TIMEOUT), false); if (!subreq) { - DEBUG(1, ("sdap_get_generic_send failed.\n")); + DEBUG(1, "sdap_get_generic_send failed.\n"); return ENOMEM; } talloc_steal(subreq, cn_attr); @@ -469,42 +469,42 @@ static void netgr_translate_members_ldap_done(struct tevent_req *subreq) ret = sdap_get_generic_recv(subreq, state, &count, &netgroups); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(1, ("sdap_get_generic request failed.\n")); + DEBUG(1, "sdap_get_generic request failed.\n"); goto fail; } switch (count) { case 0: - DEBUG(0, ("sdap_get_generic_recv found no entry for [%s].\n", - state->dn_item->dn)); + DEBUG(0, "sdap_get_generic_recv found no entry for [%s].\n", + state->dn_item->dn); break; case 1: ret = sysdb_attrs_get_string(netgroups[0], SYSDB_NAME, &str); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); break; } state->dn_item->cn = talloc_strdup(state->dn_item, str); if (state->dn_item->cn == NULL) { - DEBUG(1, ("talloc_strdup failed.\n")); + DEBUG(1, "talloc_strdup failed.\n"); } break; default: DEBUG(SSSDBG_CRIT_FAILURE, - ("Unexpected number of results [%zu] for base search.\n", - count)); + "Unexpected number of results [%zu] for base search.\n", + count); } if (state->dn_item->cn == NULL) { - DEBUG(1, ("Failed to resolve netgroup name for DN [%s], using DN.\n", - state->dn_item->dn)); + DEBUG(1, "Failed to resolve netgroup name for DN [%s], using DN.\n", + state->dn_item->dn); state->dn_item->cn = talloc_strdup(state->dn_item, state->dn_item->dn); } state->dn_idx = state->dn_item->next; ret = netgr_translate_members_ldap_step(req); if (ret != EOK && ret != EAGAIN) { - DEBUG(1, ("netgr_translate_members_ldap_step failed.\n")); + DEBUG(1, "netgr_translate_members_ldap_step failed.\n"); goto fail; } @@ -593,7 +593,7 @@ struct tevent_req *sdap_get_netgroups_send(TALLOC_CTX *memctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Netgroup lookup request without a netgroup search base\n")); + "Netgroup lookup request without a netgroup search base\n"); ret = EINVAL; goto done; } @@ -625,8 +625,8 @@ static errno_t sdap_get_netgroups_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for netgroups with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for netgroups with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -661,7 +661,7 @@ static void sdap_get_netgroups_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for netgroups, returned %zu results.\n", state->count)); + "Search for netgroups, returned %zu results.\n", state->count); if (state->count == 0) { /* No netgroups found in this search */ @@ -719,13 +719,13 @@ static void netgr_translate_members_done(struct tevent_req *subreq) &state->higher_timestamp, now); if (ret) { - DEBUG(2, ("Failed to store netgroups.\n")); + DEBUG(2, "Failed to store netgroups.\n"); tevent_req_error(req, ret); return; } } - DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Netgroups - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, "Saving %zu Netgroups - Done\n", state->count); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_async_services.c b/src/providers/ldap/sdap_async_services.c index c4245f057..8a391c328 100644 --- a/src/providers/ldap/sdap_async_services.c +++ b/src/providers/ldap/sdap_async_services.c @@ -104,7 +104,7 @@ sdap_get_services_send(TALLOC_CTX *memctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Services lookup request without a search base\n")); + "Services lookup request without a search base\n"); ret = EINVAL; goto done; } @@ -137,8 +137,8 @@ sdap_get_services_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for services with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for services with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -177,8 +177,8 @@ sdap_get_services_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for services, returned %zu results.\n", - count)); + "Search for services, returned %zu results.\n", + count); if (state->enumeration || count == 0) { /* No services found in this search or enumerating */ @@ -234,13 +234,13 @@ sdap_get_services_process(struct tevent_req *subreq) &state->higher_usn); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to store services.\n")); + "Failed to store services.\n"); tevent_req_error(req, ret); return; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("Saving %zu services - Done\n", state->count)); + "Saving %zu services - Done\n", state->count); tevent_req_done(req); } @@ -274,7 +274,7 @@ sdap_save_services(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_start(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } @@ -292,10 +292,10 @@ sdap_save_services(TALLOC_CTX *mem_ctx, * Just report the failure to save and go on */ if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to store service %zu. Ignoring.\n", i)); + "Failed to store service %zu. Ignoring.\n", i); } else { DEBUG(SSSDBG_TRACE_INTERNAL, - ("Service [%zu/%zu] processed!\n", i, num_services)); + "Service [%zu/%zu] processed!\n", i, num_services); } if (usn_value) { @@ -316,7 +316,7 @@ sdap_save_services(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to commit transaction!\n")); + "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -330,7 +330,7 @@ done: sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to cancel transaction!\n")); + "Failed to cancel transaction!\n"); } } talloc_free(tmp_ctx); @@ -360,7 +360,7 @@ sdap_save_service(TALLOC_CTX *mem_ctx, uint16_t port; uint64_t cache_timeout; - DEBUG(SSSDBG_TRACE_ALL, ("Saving service\n")); + DEBUG(SSSDBG_TRACE_ALL, "Saving service\n"); tmp_ctx = talloc_new(NULL); if (!tmp_ctx) { @@ -381,11 +381,11 @@ sdap_save_service(TALLOC_CTX *mem_ctx, &name); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not determine the primary name of the service\n")); + "Could not determine the primary name of the service\n"); goto done; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Primary name: [%s]\n", name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Primary name: [%s]\n", name); /* Handle any available aliases */ @@ -394,7 +394,7 @@ sdap_save_service(TALLOC_CTX *mem_ctx, &aliases); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to identify service aliases\n")); + "Failed to identify service aliases\n"); goto done; } @@ -402,8 +402,8 @@ sdap_save_service(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_uint16_t(attrs, SYSDB_SVC_PORT, &port); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to identify service port: [%s]\n", - strerror(ret))); + "Failed to identify service port: [%s]\n", + strerror(ret)); goto done; } @@ -412,8 +412,8 @@ sdap_save_service(TALLOC_CTX *mem_ctx, tmp_ctx, &protocols); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to identify service protocols: [%s]\n", - strerror(ret))); + "Failed to identify service protocols: [%s]\n", + strerror(ret)); goto done; } @@ -423,8 +423,8 @@ sdap_save_service(TALLOC_CTX *mem_ctx, dom->case_sensitive, &cased_protocols); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to get case_sensitive protocols names: [%s]\n", - strerror(ret))); + "Failed to get case_sensitive protocols names: [%s]\n", + strerror(ret)); goto done; } } @@ -436,22 +436,22 @@ sdap_save_service(TALLOC_CTX *mem_ctx, opts->service_map[SDAP_AT_SERVICE_USN].sys_name, &el); if (ret && ret != ENOENT) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to retrieve USN value: [%s]\n", - strerror(ret))); + "Failed to retrieve USN value: [%s]\n", + strerror(ret)); goto done; } if (ret == ENOENT || el->num_values == 0) { DEBUG(SSSDBG_TRACE_LIBS, - ("Original USN value is not available for [%s].\n", - name)); + "Original USN value is not available for [%s].\n", + name); } else { ret = sysdb_attrs_add_string(svc_attrs, opts->service_map[SDAP_AT_SERVICE_USN].sys_name, (const char*)el->values[0].data); if (ret) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to add USN value: [%s]\n", - strerror(ret))); + "Failed to add USN value: [%s]\n", + strerror(ret)); goto done; } usn_value = talloc_strdup(tmp_ctx, (const char*)el->values[0].data); @@ -468,8 +468,8 @@ sdap_save_service(TALLOC_CTX *mem_ctx, attrs, &missing); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to identify removed attributes: [%s]\n", - strerror(ret))); + "Failed to identify removed attributes: [%s]\n", + strerror(ret)); goto done; } @@ -479,8 +479,8 @@ sdap_save_service(TALLOC_CTX *mem_ctx, svc_attrs, missing, cache_timeout, now); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to store service in the sysdb: [%s]\n", - strerror(ret))); + "Failed to store service in the sysdb: [%s]\n", + strerror(ret)); goto done; } @@ -568,7 +568,7 @@ enum_services_send(TALLOC_CTX *memctx, id_ctx->opts->service_map[SDAP_AT_SERVICE_PROTOCOL].name); } if (!state->filter) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to build base filter\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to build base filter\n"); ret = ENOMEM; goto fail; } @@ -633,8 +633,8 @@ enum_services_op_done(struct tevent_req *subreq) } } - DEBUG(SSSDBG_FUNC_DATA, ("Services higher USN value: [%s]\n", - state->id_ctx->srv_opts->max_service_value)); + DEBUG(SSSDBG_FUNC_DATA, "Services higher USN value: [%s]\n", + state->id_ctx->srv_opts->max_service_value); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_async_sudo.c b/src/providers/ldap/sdap_async_sudo.c index 0d4882bd1..e91ab34f1 100644 --- a/src/providers/ldap/sdap_async_sudo.c +++ b/src/providers/ldap/sdap_async_sudo.c @@ -208,7 +208,7 @@ static int sdap_sudo_refresh_retry(struct tevent_req *req) if (state->sdap_op == NULL) { state->sdap_op = sdap_id_op_create(state, state->sdap_conn_cache); if (state->sdap_op == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_id_op_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_id_op_create() failed\n"); state->dp_error = DP_ERR_FATAL; state->error = EIO; return EIO; @@ -218,7 +218,7 @@ static int sdap_sudo_refresh_retry(struct tevent_req *req) subreq = sdap_id_op_connect_send(state->sdap_op, state, &ret); if (subreq == NULL) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sdap_id_op_connect_send() failed: %d(%s)\n", ret, strerror(ret))); + "sdap_id_op_connect_send() failed: %d(%s)\n", ret, strerror(ret)); talloc_zfree(state->sdap_op); state->dp_error = DP_ERR_FATAL; state->error = ret; @@ -251,11 +251,11 @@ static void sdap_sudo_refresh_connect_done(struct tevent_req *subreq) return; } else if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("SUDO LDAP connection failed - %s\n", strerror(ret))); + "SUDO LDAP connection failed - %s\n", strerror(ret)); goto fail; } - DEBUG(SSSDBG_TRACE_FUNC, ("SUDO LDAP connection successful\n")); + DEBUG(SSSDBG_TRACE_FUNC, "SUDO LDAP connection successful\n"); subreq = sdap_sudo_load_sudoers_send(state, state->be_ctx->ev, state->opts, @@ -306,7 +306,7 @@ static struct tevent_req * sdap_sudo_load_sudoers_send(TALLOC_CTX *mem_ctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("SUDOERS lookup request without a search base\n")); + "SUDOERS lookup request without a search base\n"); ret = EINVAL; goto done; } @@ -345,7 +345,7 @@ static errno_t sdap_sudo_load_sudoers_next_base(struct tevent_req *req) search_base = state->search_bases[state->base_iter]; if (search_base == NULL) { /* should not happen */ - DEBUG(SSSDBG_CRIT_FAILURE, ("search_base is null\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "search_base is null\n"); return EFAULT; } @@ -358,8 +358,8 @@ static errno_t sdap_sudo_load_sudoers_next_base(struct tevent_req *req) /* send request */ DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for sudo rules with base [%s]\n", - search_base->basedn)); + "Searching for sudo rules with base [%s]\n", + search_base->basedn); subreq = sdap_get_generic_send(state, state->ev, @@ -397,8 +397,8 @@ static void sdap_sudo_load_sudoers_process(struct tevent_req *subreq) search_base = state->search_bases[state->base_iter]; DEBUG(SSSDBG_TRACE_FUNC, - ("Receiving sudo rules with base [%s]\n", - search_base->basedn)); + "Receiving sudo rules with base [%s]\n", + search_base->basedn); ret = sdap_get_generic_recv(subreq, state, &count, &attrs); talloc_zfree(subreq); @@ -477,12 +477,12 @@ static void sdap_sudo_refresh_load_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Received %zu rules\n", rules_count)); + DEBUG(SSSDBG_TRACE_FUNC, "Received %zu rules\n", rules_count); /* start transaction */ ret = sysdb_transaction_start(state->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; @@ -507,12 +507,12 @@ static void sdap_sudo_refresh_load_done(struct tevent_req *subreq) /* commit transaction */ ret = sysdb_transaction_commit(state->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; - DEBUG(SSSDBG_TRACE_FUNC, ("Sudoers is successfuly stored in cache\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Sudoers is successfuly stored in cache\n"); ret = EOK; state->num_rules = rules_count; @@ -521,7 +521,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(state->sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } @@ -558,15 +558,15 @@ static int sdap_sudo_purge_sudoers(struct sysdb_ctx *sysdb_ctx, &name); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to retrieve rule name: [%s]\n", strerror(ret))); + "Failed to retrieve rule name: [%s]\n", strerror(ret)); continue; } ret = sysdb_sudo_purge_byname(sysdb_ctx, dom, name); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to delete rule %s: [%s]\n", - name, strerror(ret))); + "Failed to delete rule %s: [%s]\n", + name, strerror(ret)); continue; } } @@ -582,8 +582,8 @@ static int sdap_sudo_purge_sudoers(struct sysdb_ctx *sysdb_ctx, done: if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to purge sudo rules [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "failed to purge sudo rules [%d]: %s\n", + ret, strerror(ret)); } return ret; @@ -611,8 +611,8 @@ static int sdap_sudo_store_sudoers(TALLOC_CTX *mem_ctx, rules_count, cache_timeout, now, _usn); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("failed to save sudo rules [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "failed to save sudo rules [%d]: %s\n", + ret, strerror(ret)); return ret; } diff --git a/src/providers/ldap/sdap_async_sudo_hostinfo.c b/src/providers/ldap/sdap_async_sudo_hostinfo.c index f0c728108..fce411142 100644 --- a/src/providers/ldap/sdap_async_sudo_hostinfo.c +++ b/src/providers/ldap/sdap_async_sudo_hostinfo.c @@ -77,7 +77,7 @@ struct tevent_req * sdap_sudo_get_hostinfo_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_sudo_get_hostinfo_state); if (req == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -93,11 +93,11 @@ struct tevent_req * sdap_sudo_get_hostinfo_send(TALLOC_CTX *mem_ctx, &state->hostnames, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Unable to parse hostnames [%d]: %s\n", ret, strerror(ret))); + "Unable to parse hostnames [%d]: %s\n", ret, strerror(ret)); goto done; } else { DEBUG(SSSDBG_CONF_SETTINGS, - ("Hostnames set to: %s\n", conf_hostnames)); + "Hostnames set to: %s\n", conf_hostnames); } } @@ -106,12 +106,12 @@ struct tevent_req * sdap_sudo_get_hostinfo_send(TALLOC_CTX *mem_ctx, &state->ip_addr, NULL); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Unable to parse IP addresses [%d]: %s\n", - ret, strerror(ret))); + "Unable to parse IP addresses [%d]: %s\n", + ret, strerror(ret)); goto done; } else { - DEBUG(SSSDBG_CONF_SETTINGS, ("IP addresses set to: %s\n", - conf_ip_addr)); + DEBUG(SSSDBG_CONF_SETTINGS, "IP addresses set to: %s\n", + conf_ip_addr); } } @@ -120,8 +120,8 @@ struct tevent_req * sdap_sudo_get_hostinfo_send(TALLOC_CTX *mem_ctx, ret = sdap_sudo_get_ip_addresses(state, &state->ip_addr); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Unable to detect IP addresses [%d]: %s\n", - ret, strerror(ret))); + "Unable to detect IP addresses [%d]: %s\n", + ret, strerror(ret)); } } @@ -162,8 +162,8 @@ static void sdap_sudo_get_hostinfo_done(struct tevent_req *subreq) ret = sdap_sudo_get_hostnames_recv(state, subreq, &state->hostnames); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve hostnames [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve hostnames [%d]: %s\n", + ret, strerror(ret)); tevent_req_error(req, ret); return; } @@ -210,7 +210,7 @@ static int sdap_sudo_get_ip_addresses(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; } @@ -218,8 +218,8 @@ static int sdap_sudo_get_ip_addresses(TALLOC_CTX *mem_ctx, ret = getifaddrs(&ifaces); if (ret == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not read interfaces [%d][%s]\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not read interfaces [%d][%s]\n", + ret, strerror(ret)); goto done; } @@ -305,8 +305,8 @@ static int sdap_sudo_get_ip_addresses(TALLOC_CTX *mem_ctx, if (inet_ntop(iface->ifa_addr->sa_family, sinx_addr, ip_addr, INET6_ADDRSTRLEN) == NULL) { ret = errno; - DEBUG(SSSDBG_MINOR_FAILURE, ("inet_ntop() failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "inet_ntop() failed [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -315,8 +315,8 @@ static int sdap_sudo_get_ip_addresses(TALLOC_CTX *mem_ctx, if (inet_ntop(iface->ifa_addr->sa_family, sinx_network, network_addr, INET6_ADDRSTRLEN) == NULL) { ret = errno; - DEBUG(SSSDBG_MINOR_FAILURE, ("inet_ntop() failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "inet_ntop() failed [%d]: %s\n", + ret, strerror(ret)); goto done; } @@ -342,8 +342,8 @@ static int sdap_sudo_get_ip_addresses(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_TRACE_INTERNAL, - ("Found IP address: %s in network %s/%d\n", - ip_addr, network_addr, netmask)); + "Found IP address: %s in network %s/%d\n", + ip_addr, network_addr, netmask); } if (ip_addr_list) { @@ -386,7 +386,7 @@ static struct tevent_req *sdap_sudo_get_hostnames_send(TALLOC_CTX *mem_ctx, /* hostname, fqdn and NULL */ state->hostnames = talloc_zero_array(state, char*, 3); if (state->hostnames == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero_array() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero_array() failed\n"); ret = ENOMEM; goto done; } @@ -397,15 +397,15 @@ static struct tevent_req *sdap_sudo_get_hostnames_send(TALLOC_CTX *mem_ctx, ret = gethostname(hostname, HOST_NAME_MAX); if (ret != EOK) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve machine hostname " - "[%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve machine hostname " + "[%d]: %s\n", ret, strerror(ret)); goto done; } hostname[HOST_NAME_MAX] = '\0'; state->hostnames[0] = talloc_strdup(state->hostnames, hostname); if (state->hostnames[0] == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup() failed\n"); ret = ENOMEM; goto done; } @@ -413,14 +413,14 @@ static struct tevent_req *sdap_sudo_get_hostnames_send(TALLOC_CTX *mem_ctx, dot = strchr(hostname, '.'); if (dot != NULL) { /* already a fqdn, determine hostname and finish */ - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found fqdn: %s\n", hostname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found fqdn: %s\n", hostname); *dot = '\0'; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found hostname: %s\n", hostname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found hostname: %s\n", hostname); state->hostnames[1] = talloc_strdup(state->hostnames, hostname); if (state->hostnames[1] == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup() failed\n"); ret = ENOMEM; goto done; } @@ -428,7 +428,7 @@ static struct tevent_req *sdap_sudo_get_hostnames_send(TALLOC_CTX *mem_ctx, ret = EOK; goto done; } else { - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found hostname: %s\n", hostname)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found hostname: %s\n", hostname); } state->resolv_ctx = be_ctx->be_res->resolv; @@ -476,30 +476,30 @@ static void sdap_sudo_get_hostnames_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret == ENOENT) { /* Empty result, just quit */ - DEBUG(SSSDBG_TRACE_INTERNAL, ("No hostent found\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "No hostent found\n"); goto done; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not resolve fqdn for this machine, error [%d]: %s, " + "Could not resolve fqdn for this machine, error [%d]: %s, " "resolver returned: [%d]: %s\n", ret, strerror(ret), - resolv_status, resolv_strerror(resolv_status))); + resolv_status, resolv_strerror(resolv_status)); tevent_req_error(req, ret); return; } /* EOK */ - DEBUG(SSSDBG_TRACE_INTERNAL, ("Found fqdn: %s\n", rhostent->name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Found fqdn: %s\n", rhostent->name); if (state->hostnames == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("state->hostnames is NULL\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "state->hostnames is NULL\n"); ret = EINVAL; goto done; } state->hostnames[1] = talloc_strdup(state->hostnames, rhostent->name); if (state->hostnames[1] == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_strdup() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_strdup() failed\n"); ret = ENOMEM; goto done; } diff --git a/src/providers/ldap/sdap_async_sudo_timer.c b/src/providers/ldap/sdap_async_sudo_timer.c index 27dd41f06..035341909 100644 --- a/src/providers/ldap/sdap_async_sudo_timer.c +++ b/src/providers/ldap/sdap_async_sudo_timer.c @@ -63,7 +63,7 @@ struct tevent_req * sdap_sudo_timer_send(TALLOC_CTX *mem_ctx, /* create request */ req = tevent_req_create(mem_ctx, &state, struct sdap_sudo_timer_state); if (req == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -75,7 +75,7 @@ struct tevent_req * sdap_sudo_timer_send(TALLOC_CTX *mem_ctx, /* set timer */ timer = tevent_add_timer(ev, req, when, sdap_sudo_timer, req); if (timer == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("tevent_add_timer() failed\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "tevent_add_timer() failed\n"); ret = ENOMEM; goto immediately; } @@ -120,7 +120,7 @@ static void sdap_sudo_timer(struct tevent_context *ev, /* issue request */ state->subreq = state->fn(state, state->sudo_ctx); if (state->subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to issue timed request!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to issue timed request!\n"); tevent_req_error(req, ENOMEM); return; } @@ -137,8 +137,8 @@ static void sdap_sudo_timer(struct tevent_context *ev, * the possibility of starting another * concurrently */ - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to set timeout, " - "canceling request!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to set timeout, " + "canceling request!\n"); talloc_zfree(state->subreq); tevent_req_error(req, ENOMEM); } @@ -169,8 +169,8 @@ static void sdap_sudo_timer_timeout(struct tevent_context *ev, req = talloc_get_type(pvt, struct tevent_req); state = tevent_req_data(req, struct sdap_sudo_timer_state); - DEBUG(SSSDBG_CRIT_FAILURE, ("Request timed out. Is timeout too small?" - " (%lds)!\n", state->timeout)); + DEBUG(SSSDBG_CRIT_FAILURE, "Request timed out. Is timeout too small?" + " (%lds)!\n", state->timeout); talloc_zfree(state->subreq); diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index 65c456c8f..c63027c45 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -53,7 +53,7 @@ sdap_get_idmap_primary_gid(struct sdap_options *opts, opts->user_map[SDAP_AT_USER_PRIMARY_GROUP].sys_name, &primary_gid); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("no primary group ID provided\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "no primary group ID provided\n"); ret = EINVAL; goto done; } @@ -69,7 +69,7 @@ sdap_get_idmap_primary_gid(struct sdap_options *opts, &dom_sid_str); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not parse domain SID from [%s]\n", sid_str)); + "Could not parse domain SID from [%s]\n", sid_str); goto done; } } @@ -126,7 +126,7 @@ int sdap_save_user(TALLOC_CTX *memctx, char *dom_sid_str = NULL; struct sss_domain_info *subdomain; - DEBUG(SSSDBG_TRACE_FUNC, ("Save user\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Save user\n"); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -147,17 +147,17 @@ int sdap_save_user(TALLOC_CTX *memctx, if (ret == EOK) { ret = sysdb_attrs_add_string(user_attrs, SYSDB_SID_STR, sid_str); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not add SID string: [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not add SID string: [%s]\n", + strerror(ret)); goto done; } } else if (ret == ENOENT) { - DEBUG(SSSDBG_TRACE_ALL, ("objectSID: not available for group [%s].\n", - user_name)); + DEBUG(SSSDBG_TRACE_ALL, "objectSID: not available for group [%s].\n", + user_name); sid_str = NULL; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not identify objectSID: [%s]\n", - strerror(ret))); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not identify objectSID: [%s]\n", + strerror(ret)); sid_str = NULL; } @@ -168,17 +168,17 @@ int sdap_save_user(TALLOC_CTX *memctx, if (subdomain) { dom = subdomain; } else { - DEBUG(SSSDBG_TRACE_FUNC, ("SID %s does not belong to any known " - "domain\n", sid_str)); + DEBUG(SSSDBG_TRACE_FUNC, "SID %s does not belong to any known " + "domain\n", sid_str); } } ret = sdap_get_user_primary_name(memctx, opts, attrs, dom, &user_name); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to get user name\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to get user name\n"); goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Processing user %s\n", user_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Processing user %s\n", user_name); if (opts->schema_type == SDAP_SCHEMA_AD) { ret = sysdb_attrs_get_string(attrs, @@ -234,19 +234,19 @@ int sdap_save_user(TALLOC_CTX *memctx, if (use_id_mapping) { if (sid_str == NULL) { - DEBUG(SSSDBG_MINOR_FAILURE, ("SID not available, cannot map a " \ - "unix ID to user [%s].\n", user_name)); + DEBUG(SSSDBG_MINOR_FAILURE, "SID not available, cannot map a " \ + "unix ID to user [%s].\n", user_name); ret = ENOENT; goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Mapping user [%s] objectSID [%s] to unix ID\n", user_name, sid_str)); + "Mapping user [%s] objectSID [%s] to unix ID\n", user_name, sid_str); /* Convert the SID into a UNIX user ID */ ret = sdap_idmap_sid_to_unix(opts->idmap_ctx, sid_str, &uid); if (ret == ENOTSUP) { - DEBUG(SSSDBG_TRACE_FUNC, ("Skipping built-in object.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Skipping built-in object.\n"); ret = EOK; goto done; } else if (ret != EOK) { @@ -258,7 +258,7 @@ int sdap_save_user(TALLOC_CTX *memctx, */ ret = sdap_replace_id(attrs, SYSDB_UIDNUM, uid); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot set the id-mapped UID\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot set the id-mapped UID\n"); goto done; } } else { @@ -267,16 +267,16 @@ int sdap_save_user(TALLOC_CTX *memctx, &uid); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("no uid provided for [%s] in domain [%s].\n", - user_name, dom->name)); + "no uid provided for [%s] in domain [%s].\n", + user_name, dom->name); ret = EINVAL; goto done; } } /* check that the uid is valid for this domain */ if (OUT_OF_ID_RANGE(uid, dom->id_min, dom->id_max)) { - DEBUG(2, ("User [%s] filtered out! (uid out of range)\n", - user_name)); + DEBUG(2, "User [%s] filtered out! (uid out of range)\n", + user_name); ret = EINVAL; goto done; } @@ -286,8 +286,8 @@ int sdap_save_user(TALLOC_CTX *memctx, &gid); if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Cannot get the GID for [%s] in domain [%s].\n", - user_name, dom->name)); + "Cannot get the GID for [%s] in domain [%s].\n", + user_name, dom->name); goto done; } @@ -302,7 +302,7 @@ int sdap_save_user(TALLOC_CTX *memctx, ret = sysdb_attrs_add_uint32(user_attrs, SYSDB_PRIMARY_GROUP_GIDNUM, (uint32_t) gid); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_attrs_add_uint32 failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_attrs_add_uint32 failed.\n"); goto done; } @@ -320,8 +320,8 @@ int sdap_save_user(TALLOC_CTX *memctx, &gid); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("no gid provided for [%s] in domain [%s].\n", - user_name, dom->name)); + "no gid provided for [%s] in domain [%s].\n", + user_name, dom->name); ret = EINVAL; goto done; } @@ -331,8 +331,8 @@ int sdap_save_user(TALLOC_CTX *memctx, if (IS_SUBDOMAIN(dom) == false && OUT_OF_ID_RANGE(gid, dom->id_min, dom->id_max)) { DEBUG(SSSDBG_CRIT_FAILURE, - ("User [%s] filtered out! (primary gid out of range)\n", - user_name)); + "User [%s] filtered out! (primary gid out of range)\n", + user_name); ret = EINVAL; goto done; } @@ -343,11 +343,11 @@ int sdap_save_user(TALLOC_CTX *memctx, } if (!el || el->num_values == 0) { DEBUG(SSSDBG_MINOR_FAILURE, - ("originalDN is not available for [%s].\n", user_name)); + "originalDN is not available for [%s].\n", user_name); } else { orig_dn = (const char *) el->values[0].data; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding originalDN [%s] to attributes " - "of [%s].\n", orig_dn, user_name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Adding originalDN [%s] to attributes " + "of [%s].\n", orig_dn, user_name); ret = sysdb_attrs_add_string(user_attrs, SYSDB_ORIG_DN, orig_dn); if (ret) { @@ -361,10 +361,10 @@ int sdap_save_user(TALLOC_CTX *memctx, } if (el->num_values == 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("Original memberOf is not available for [%s].\n", user_name)); + "Original memberOf is not available for [%s].\n", user_name); } else { DEBUG(SSSDBG_TRACE_FUNC, - ("Adding original memberOf attributes to [%s].\n", user_name)); + "Adding original memberOf attributes to [%s].\n", user_name); for (i = 0; i < el->num_values; i++) { ret = sysdb_attrs_add_string(user_attrs, SYSDB_ORIG_MEMBEROF, (const char *) el->values[i].data); @@ -389,7 +389,7 @@ int sdap_save_user(TALLOC_CTX *memctx, } if (el->num_values == 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("Original USN value is not available for [%s].\n", user_name)); + "Original USN value is not available for [%s].\n", user_name); } else { ret = sysdb_attrs_add_string(user_attrs, opts->user_map[SDAP_AT_USER_USN].sys_name, @@ -411,7 +411,7 @@ int sdap_save_user(TALLOC_CTX *memctx, } if (el->num_values == 0) { DEBUG(SSSDBG_TRACE_FUNC, - ("User principal is not available for [%s].\n", user_name)); + "User principal is not available for [%s].\n", user_name); } else { upn = talloc_strdup(user_attrs, (const char*) el->values[0].data); if (!upn) { @@ -422,8 +422,8 @@ int sdap_save_user(TALLOC_CTX *memctx, make_realm_upper_case(upn); } DEBUG(SSSDBG_TRACE_FUNC, - ("Adding user principal [%s] to attributes of [%s].\n", - upn, user_name)); + "Adding user principal [%s] to attributes of [%s].\n", + upn, user_name); ret = sysdb_attrs_add_string(user_attrs, SYSDB_UPN, upn); if (ret) { goto done; @@ -451,7 +451,7 @@ int sdap_save_user(TALLOC_CTX *memctx, ret = sdap_save_all_names(user_name, attrs, dom, user_attrs); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to save user names\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to save user names\n"); goto done; } @@ -464,7 +464,7 @@ int sdap_save_user(TALLOC_CTX *memctx, goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Storing info for user %s\n", user_name)); + DEBUG(SSSDBG_TRACE_FUNC, "Storing info for user %s\n", user_name); ret = sysdb_store_user(ctx, dom, user_name, pwd, uid, gid, gecos, homedir, shell, orig_dn, @@ -481,8 +481,8 @@ int sdap_save_user(TALLOC_CTX *memctx, done: if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to save user [%s]\n", - user_name ? user_name : "Unknown")); + "Failed to save user [%s]\n", + user_name ? user_name : "Unknown"); } talloc_free(tmpctx); return ret; @@ -520,7 +520,7 @@ int sdap_save_users(TALLOC_CTX *memctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -536,9 +536,9 @@ int sdap_save_users(TALLOC_CTX *memctx, /* Do not fail completely on errors. * Just report the failure to save and go on */ if (ret) { - DEBUG(2, ("Failed to store user %d. Ignoring.\n", i)); + DEBUG(2, "Failed to store user %d. Ignoring.\n", i); } else { - DEBUG(9, ("User %d processed!\n", i)); + DEBUG(9, "User %d processed!\n", i); } if (usn_value) { @@ -558,7 +558,7 @@ int sdap_save_users(TALLOC_CTX *memctx, ret = sysdb_transaction_commit(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction!\n"); goto done; } in_transaction = false; @@ -571,7 +571,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } talloc_zfree(tmpctx); @@ -638,7 +638,7 @@ struct tevent_req *sdap_search_user_send(TALLOC_CTX *memctx, if (!state->search_bases) { DEBUG(SSSDBG_CRIT_FAILURE, - ("User lookup request without a search base\n")); + "User lookup request without a search base\n"); ret = EINVAL; goto done; } @@ -670,8 +670,8 @@ static errno_t sdap_search_user_next_base(struct tevent_req *req) } DEBUG(SSSDBG_TRACE_FUNC, - ("Searching for users with base [%s]\n", - state->search_bases[state->base_iter]->basedn)); + "Searching for users with base [%s]\n", + state->search_bases[state->base_iter]->basedn); subreq = sdap_get_generic_send( state, state->ev, state->opts, state->sh, @@ -709,7 +709,7 @@ static void sdap_search_user_process(struct tevent_req *subreq) } DEBUG(SSSDBG_TRACE_FUNC, - ("Search for users, returned %zu results.\n", count)); + "Search for users, returned %zu results.\n", count); if (state->enumeration || count == 0) { /* No users found in this search or enumerating */ @@ -760,7 +760,7 @@ static void sdap_search_user_process(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_ALL, ("Retrieved total %zu users\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, "Retrieved total %zu users\n", state->count); tevent_req_done(req); } @@ -855,7 +855,7 @@ static void sdap_get_users_done(struct tevent_req *subreq) ret = sdap_search_user_recv(state, subreq, &state->higher_usn, &state->users, &state->count); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to retrieve users\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to retrieve users\n"); tevent_req_error(req, ret); return; } @@ -865,12 +865,12 @@ static void sdap_get_users_done(struct tevent_req *subreq) state->users, state->count, &state->higher_usn); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to store users.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to store users.\n"); tevent_req_error(req, ret); return; } - DEBUG(SSSDBG_TRACE_ALL, ("Saving %zu Users - Done\n", state->count)); + DEBUG(SSSDBG_TRACE_ALL, "Saving %zu Users - Done\n", state->count); tevent_req_done(req); } diff --git a/src/providers/ldap/sdap_autofs.c b/src/providers/ldap/sdap_autofs.c index e7947c9b2..aa4b35f62 100644 --- a/src/providers/ldap/sdap_autofs.c +++ b/src/providers/ldap/sdap_autofs.c @@ -54,7 +54,7 @@ int sdap_autofs_init(struct be_ctx *be_ctx, { int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing autofs LDAP back end\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing autofs LDAP back end\n"); *ops = &sdap_autofs_ops; *pvt_data = id_ctx; @@ -84,7 +84,7 @@ void sdap_autofs_handler(struct be_req *be_req) struct tevent_req *req; int ret = EOK; - DEBUG(SSSDBG_TRACE_INTERNAL, ("sdap autofs handler called\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "sdap autofs handler called\n"); id_ctx = talloc_get_type(be_ctx->bet_info[BET_AUTOFS].pvt_bet_data, struct sdap_id_ctx); @@ -95,15 +95,15 @@ void sdap_autofs_handler(struct be_req *be_req) autofs_req = talloc_get_type(be_req_get_data(be_req), struct be_autofs_req); - DEBUG(SSSDBG_FUNC_DATA, ("Requested refresh for: %s\n", - autofs_req->mapname ? autofs_req->mapname : "<ALL>\n")); + DEBUG(SSSDBG_FUNC_DATA, "Requested refresh for: %s\n", + autofs_req->mapname ? autofs_req->mapname : "<ALL>\n"); if (autofs_req->invalidate) { ret = sysdb_invalidate_autofs_maps(id_ctx->be->domain->sysdb, id_ctx->be->domain); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not invalidate autofs maps, " - "backend might return stale entries\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not invalidate autofs maps, " + "backend might return stale entries\n"); } } @@ -156,7 +156,7 @@ sdap_autofs_get_map_send(TALLOC_CTX *mem_ctx, state->op = sdap_id_op_create(state, state->ctx->conn->conn_cache); if (!state->op) { - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); ret = ENOMEM; goto fail; } @@ -219,7 +219,7 @@ sdap_autofs_get_map_connect_done(struct tevent_req *subreq) state->map_name); if (!subreq) { DEBUG(SSSDBG_CRIT_FAILURE, - ("sdap_autofs_setautomntent_send failed\n")); + "sdap_autofs_setautomntent_send failed\n"); tevent_req_error(req, ENOMEM); return; } @@ -262,8 +262,8 @@ sdap_autofs_get_map_done(struct tevent_req *subreq) state->ctx->be->domain, state->map_name); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot delete autofs map %s [%d]: %s\n", - state->map_name, ret, strerror(ret))); + "Cannot delete autofs map %s [%d]: %s\n", + state->map_name, ret, strerror(ret)); tevent_req_error(req, ret); return; } diff --git a/src/providers/ldap/sdap_child_helpers.c b/src/providers/ldap/sdap_child_helpers.c index 9aaff785b..2a0730e39 100644 --- a/src/providers/ldap/sdap_child_helpers.c +++ b/src/providers/ldap/sdap_child_helpers.c @@ -56,15 +56,15 @@ static void sdap_close_fd(int *fd) int ret; if (*fd == -1) { - DEBUG(6, ("fd already closed\n")); + DEBUG(6, "fd already closed\n"); return; } ret = close(*fd); if (ret) { ret = errno; - DEBUG(2, ("Closing fd %d, return error %d (%s)\n", - *fd, ret, strerror(ret))); + DEBUG(2, "Closing fd %d, return error %d (%s)\n", + *fd, ret, strerror(ret)); } *fd = -1; @@ -91,13 +91,13 @@ static errno_t sdap_fork_child(struct tevent_context *ev, ret = pipe(pipefd_from_child); if (ret == -1) { err = errno; - DEBUG(1, ("pipe failed [%d][%s].\n", err, strerror(err))); + DEBUG(1, "pipe failed [%d][%s].\n", err, strerror(err)); return err; } ret = pipe(pipefd_to_child); if (ret == -1) { err = errno; - DEBUG(1, ("pipe failed [%d][%s].\n", err, strerror(err))); + DEBUG(1, "pipe failed [%d][%s].\n", err, strerror(err)); return err; } @@ -107,8 +107,8 @@ static errno_t sdap_fork_child(struct tevent_context *ev, err = exec_child(child, pipefd_to_child, pipefd_from_child, LDAP_CHILD, ldap_child_debug_fd); - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not exec LDAP child: [%d][%s].\n", - err, strerror(err))); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not exec LDAP child: [%d][%s].\n", + err, strerror(err)); return err; } else if (pid > 0) { /* parent */ child->pid = pid; @@ -126,7 +126,7 @@ static errno_t sdap_fork_child(struct tevent_context *ev, } else { /* error */ err = errno; - DEBUG(1, ("fork failed [%d][%s].\n", err, strerror(err))); + DEBUG(1, "fork failed [%d][%s].\n", err, strerror(err)); return err; } @@ -145,7 +145,7 @@ static errno_t create_tgt_req_send_buffer(TALLOC_CTX *mem_ctx, buf = talloc(mem_ctx, struct io_buffer); if (buf == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } @@ -160,11 +160,11 @@ static errno_t create_tgt_req_send_buffer(TALLOC_CTX *mem_ctx, buf->size += strlen(keytab_name); } - DEBUG(SSSDBG_TRACE_FUNC, ("buffer size: %zu\n", buf->size)); + DEBUG(SSSDBG_TRACE_FUNC, "buffer size: %zu\n", buf->size); buf->data = talloc_size(buf, buf->size); if (buf->data == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); talloc_free(buf); return ENOMEM; } @@ -227,7 +227,7 @@ static int parse_child_response(TALLOC_CTX *mem_ctx, ccn = talloc_size(mem_ctx, sizeof(char) * (len + 1)); if (ccn == NULL) { - DEBUG(1, ("talloc_size failed.\n")); + DEBUG(1, "talloc_size failed.\n"); return ENOMEM; } safealign_memcpy(ccn, buf+p, sizeof(char) * len, &p); @@ -296,19 +296,19 @@ struct tevent_req *sdap_get_tgt_send(TALLOC_CTX *mem_ctx, realm_str, princ_str, keytab_name, lifetime, &buf); if (ret != EOK) { - DEBUG(1, ("create_tgt_req_send_buffer failed.\n")); + DEBUG(1, "create_tgt_req_send_buffer failed.\n"); goto fail; } ret = sdap_fork_child(state->ev, state->child); if (ret != EOK) { - DEBUG(1, ("sdap_fork_child failed.\n")); + DEBUG(1, "sdap_fork_child failed.\n"); goto fail; } ret = set_tgt_child_timeout(req, ev, timeout); if (ret != EOK) { - DEBUG(1, ("activate_child_timeout_handler failed.\n")); + DEBUG(1, "activate_child_timeout_handler failed.\n"); goto fail; } @@ -394,11 +394,11 @@ int sdap_get_tgt_recv(struct tevent_req *req, ret = parse_child_response(mem_ctx, state->buf, state->len, &res, &krberr, &ccn, &expire_time); if (ret != EOK) { - DEBUG(1, ("Cannot parse child response: [%d][%s]\n", ret, strerror(ret))); + DEBUG(1, "Cannot parse child response: [%d][%s]\n", ret, strerror(ret)); return ret; } - DEBUG(6, ("Child responded: %d [%s], expired on [%ld]\n", res, ccn, (long)expire_time)); + DEBUG(6, "Child responded: %d [%s], expired on [%ld]\n", res, ccn, (long)expire_time); *result = res; *kerr = krberr; *ccname = ccn; @@ -417,11 +417,11 @@ static void get_tgt_timeout_handler(struct tevent_context *ev, struct sdap_get_tgt_state); int ret; - DEBUG(9, ("timeout for tgt child [%d] reached.\n", state->child->pid)); + DEBUG(9, "timeout for tgt child [%d] reached.\n", state->child->pid); ret = kill(state->child->pid, SIGKILL); if (ret == -1) { - DEBUG(1, ("kill failed [%d][%s].\n", errno, strerror(errno))); + DEBUG(1, "kill failed [%d][%s].\n", errno, strerror(errno)); } tevent_req_error(req, ETIMEDOUT); @@ -434,13 +434,13 @@ static errno_t set_tgt_child_timeout(struct tevent_req *req, struct tevent_timer *te; struct timeval tv; - DEBUG(6, ("Setting %d seconds timeout for tgt child\n", timeout)); + DEBUG(6, "Setting %d seconds timeout for tgt child\n", timeout); tv = tevent_timeval_current_ofs(timeout, 0); te = tevent_add_timer(ev, req, tv, get_tgt_timeout_handler, req); if (te == NULL) { - DEBUG(1, ("tevent_add_timer failed.\n")); + DEBUG(1, "tevent_add_timer failed.\n"); return ENOMEM; } @@ -458,14 +458,14 @@ int sdap_setup_child(void) if (debug_to_file != 0 && ldap_child_debug_fd == -1) { ret = open_debug_file_ex(LDAP_CHILD_LOG_FILE, &debug_filep, false); if (ret != EOK) { - DEBUG(0, ("Error setting up logging (%d) [%s]\n", - ret, strerror(ret))); + DEBUG(0, "Error setting up logging (%d) [%s]\n", + ret, strerror(ret)); return ret; } ldap_child_debug_fd = fileno(debug_filep); if (ldap_child_debug_fd == -1) { - DEBUG(0, ("fileno failed [%d][%s]\n", errno, strerror(errno))); + DEBUG(0, "fileno failed [%d][%s]\n", errno, strerror(errno)); ret = errno; return ret; } diff --git a/src/providers/ldap/sdap_dyndns.c b/src/providers/ldap/sdap_dyndns.c index e8702b082..e46c93f75 100644 --- a/src/providers/ldap/sdap_dyndns.c +++ b/src/providers/ldap/sdap_dyndns.c @@ -136,8 +136,8 @@ sdap_dyndns_update_send(TALLOC_CTX *mem_ctx, subreq = sdap_dyndns_get_addrs_send(state, state->ev, sdap_ctx, ifname); if (!subreq) { ret = EIO; - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_connect_send failed: [%d](%s)\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed: [%d](%s)\n", + ret, sss_strerror(ret)); goto done; } tevent_req_set_callback(subreq, sdap_dyndns_update_addrs_done, req); @@ -163,7 +163,7 @@ sdap_dyndns_update_addrs_done(struct tevent_req *subreq) ret = sdap_dyndns_get_addrs_recv(subreq, state, &state->addresses); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Can't get addresses for DNS update\n")); + DEBUG(SSSDBG_OP_FAILURE, "Can't get addresses for DNS update\n"); tevent_req_error(req, ret); return; } @@ -175,7 +175,7 @@ sdap_dyndns_update_addrs_done(struct tevent_req *subreq) subreq = nsupdate_get_addrs_send(state, state->ev, state->be_res, state->hostname); if (subreq == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("Can't initiate address check\n")); + DEBUG(SSSDBG_OP_FAILURE, "Can't initiate address check\n"); tevent_req_error(req, ret); return; } @@ -207,8 +207,8 @@ sdap_dyndns_dns_addrs_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not receive list of current addresses [%d]: %s\n", - ret, sss_strerror(ret))); + "Could not receive list of current addresses [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); return; } @@ -216,28 +216,28 @@ sdap_dyndns_dns_addrs_done(struct tevent_req *subreq) if (state->check_diff) { ret = sdap_dyndns_addrs_diff(state, &do_update); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not check the diff between DNS " - "and current addresses [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not check the diff between DNS " + "and current addresses [%d]: %s\n", ret, strerror(ret)); tevent_req_error(req, ret); return; } if (do_update == false) { DEBUG(SSSDBG_TRACE_FUNC, - ("No DNS update needed, addresses did not change\n")); + "No DNS update needed, addresses did not change\n"); tevent_req_done(req); return; } DEBUG(SSSDBG_TRACE_FUNC, - ("Detected IP addresses change, will perform an update\n")); + "Detected IP addresses change, will perform an update\n"); } /* Either we needed the addresses for updating PTR records only or * the addresses have changed (or both) */ ret = sdap_dyndns_update_step(req); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not start the update [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not start the update [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ret); } return; @@ -256,8 +256,8 @@ sdap_dyndns_addrs_diff(struct sdap_dyndns_update_state *state, bool *_do_update) state->dns_addrlist, &str_dnslist); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Converting DNS IP addresses to strings failed: [%d]: %s\n", - ret, sss_strerror(ret))); + "Converting DNS IP addresses to strings failed: [%d]: %s\n", + ret, sss_strerror(ret)); return ret; } @@ -265,8 +265,8 @@ sdap_dyndns_addrs_diff(struct sdap_dyndns_update_state *state, bool *_do_update) state->addresses, &str_local_list); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Converting local IP addresses to strings failed: [%d]: %s\n", - ret, sss_strerror(ret))); + "Converting local IP addresses to strings failed: [%d]: %s\n", + ret, sss_strerror(ret)); return ret; } @@ -275,14 +275,14 @@ sdap_dyndns_addrs_diff(struct sdap_dyndns_update_state *state, bool *_do_update) &dns_only, &local_only, NULL); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("diff_string_lists failed: [%d]: %s\n", ret, sss_strerror(ret))); + "diff_string_lists failed: [%d]: %s\n", ret, sss_strerror(ret)); return ret; } if (dns_only) { for (i=0; dns_only[i]; i++) { DEBUG(SSSDBG_TRACE_LIBS, - ("Address in DNS only: %s\n", dns_only[i])); + "Address in DNS only: %s\n", dns_only[i]); do_update = true; } } @@ -290,7 +290,7 @@ sdap_dyndns_addrs_diff(struct sdap_dyndns_update_state *state, bool *_do_update) if (local_only) { for (i=0; local_only[i]; i++) { DEBUG(SSSDBG_TRACE_LIBS, - ("Address on localhost only: %s\n", local_only[i])); + "Address on localhost only: %s\n", local_only[i]); do_update = true; } } @@ -321,7 +321,7 @@ sdap_dyndns_update_step(struct tevent_req *req) state->addresses, state->dns_addrlist, &state->update_msg); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Can't get addresses for DNS update\n")); + DEBUG(SSSDBG_OP_FAILURE, "Can't get addresses for DNS update\n"); return ret; } @@ -357,7 +357,7 @@ sdap_dyndns_update_done(struct tevent_req *subreq) WIFEXITED(child_status) && WEXITSTATUS(child_status) != 0) { state->use_server_with_nsupdate = true; DEBUG(SSSDBG_MINOR_FAILURE, - ("nsupdate failed, retrying with server name\n")); + "nsupdate failed, retrying with server name\n"); ret = sdap_dyndns_update_step(req); if (ret == EOK) { return; @@ -369,7 +369,7 @@ sdap_dyndns_update_done(struct tevent_req *subreq) } if (state->update_ptr == false) { - DEBUG(SSSDBG_TRACE_FUNC, ("No PTR update requested, done\n")); + DEBUG(SSSDBG_TRACE_FUNC, "No PTR update requested, done\n"); tevent_req_done(req); return; } @@ -405,7 +405,7 @@ sdap_dyndns_update_ptr_step(struct tevent_req *req) state->addresses, state->dns_addrlist, &state->update_msg); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Can't get addresses for DNS update\n")); + DEBUG(SSSDBG_OP_FAILURE, "Can't get addresses for DNS update\n"); return ret; } @@ -441,7 +441,7 @@ sdap_dyndns_update_ptr_done(struct tevent_req *subreq) WIFEXITED(child_status) && WEXITSTATUS(child_status) != 0) { state->use_server_with_nsupdate = true; DEBUG(SSSDBG_MINOR_FAILURE, - ("nsupdate failed, retrying with server name\n")); + "nsupdate failed, retrying with server name\n"); ret = sdap_dyndns_update_ptr_step(req); if (ret == EOK) { return; @@ -493,7 +493,7 @@ sdap_dyndns_get_addrs_send(TALLOC_CTX *mem_ctx, ret = sss_iface_addr_list_get(state, iface, &state->addresses); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot get list of addresses from interface %s\n", iface)); + "Cannot get list of addresses from interface %s\n", iface); } /* We're done. Just fake an async request completion */ goto done; @@ -503,15 +503,15 @@ sdap_dyndns_get_addrs_send(TALLOC_CTX *mem_ctx, state->sdap_op = sdap_id_op_create(state, sdap_ctx->conn->conn_cache); if (!state->sdap_op) { ret = ENOMEM; - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_create failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_create failed\n"); goto done; } subreq = sdap_id_op_connect_send(state->sdap_op, state, &ret); if (!subreq) { ret = EIO; - DEBUG(SSSDBG_OP_FAILURE, ("sdap_id_op_connect_send failed: [%d](%s)\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed: [%d](%s)\n", + ret, sss_strerror(ret)); goto done; } tevent_req_set_callback(subreq, sdap_dyndns_get_addrs_done, req); @@ -545,13 +545,13 @@ sdap_dyndns_get_addrs_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No LDAP server is available, " - "dynamic DNS update is skipped in offline mode.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No LDAP server is available, " + "dynamic DNS update is skipped in offline mode.\n"); ret = ERR_DYNDNS_OFFLINE; } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to LDAP server: [%d](%s)\n", - ret, sss_strerror(ret))); + "Failed to connect to LDAP server: [%d](%s)\n", + ret, sss_strerror(ret)); } tevent_req_error(req, ret); return; @@ -559,7 +559,7 @@ sdap_dyndns_get_addrs_done(struct tevent_req *subreq) ret = sdap_dyndns_add_ldap_conn(state, sdap_id_op_handle(state->sdap_op)); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Can't get addresses from LDAP connection\n")); + DEBUG(SSSDBG_OP_FAILURE, "Can't get addresses from LDAP connection\n"); tevent_req_error(req, ret); return; } @@ -592,7 +592,7 @@ sdap_dyndns_add_ldap_conn(struct sdap_dyndns_get_addrs_state *state, ret = getsockname(fd, (struct sockaddr *) &ss, &ss_len); if (ret == -1) { ret = errno; - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to get socket name\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to get socket name\n"); return ret; } @@ -606,7 +606,7 @@ sdap_dyndns_add_ldap_conn(struct sdap_dyndns_get_addrs_state *state, break; default: DEBUG(SSSDBG_CRIT_FAILURE, - ("Connection to LDAP is neither IPv4 nor IPv6\n")); + "Connection to LDAP is neither IPv4 nor IPv6\n"); return EIO; } @@ -666,15 +666,15 @@ sdap_dyndns_timer_conn_send(TALLOC_CTX *mem_ctx, /* Make sure to have a valid LDAP connection */ state->sdap_op = sdap_id_op_create(state, state->sdap_ctx->conn->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, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "sdap_id_op_connect_send failed: [%d](%s)\n", + ret, sss_strerror(ret)); ret = ENOMEM; goto fail; } @@ -706,14 +706,14 @@ sdap_dyndns_timer_conn_done(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { if (dp_error == DP_ERR_OFFLINE) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No server is available, " - "dynamic DNS update is skipped in offline mode.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "No server is available, " + "dynamic DNS update is skipped in offline mode.\n"); /* Another timer will be scheduled when provider goes online */ tevent_req_error(req, ERR_DYNDNS_OFFLINE); } else { DEBUG(SSSDBG_OP_FAILURE, - ("Failed to connect to LDAP server: [%d](%s)\n", - ret, sss_strerror(ret))); + "Failed to connect to LDAP server: [%d](%s)\n", + ret, sss_strerror(ret)); /* Just schedule another dyndns retry */ be_nsupdate_timer_schedule(state->ev, state->dyndns_ctx); diff --git a/src/providers/ldap/sdap_fd_events.c b/src/providers/ldap/sdap_fd_events.c index 5e4ea79b3..fc01d78ad 100644 --- a/src/providers/ldap/sdap_fd_events.c +++ b/src/providers/ldap/sdap_fd_events.c @@ -39,7 +39,7 @@ int get_fd_from_ldap(LDAP *ldap, int *fd) ret = ldap_get_option(ldap, LDAP_OPT_DESC, fd); if (ret != LDAP_OPT_SUCCESS || *fd < 0) { - DEBUG(1, ("Failed to get fd from ldap!!\n")); + DEBUG(1, "Failed to get fd from ldap!!\n"); *fd = -1; return EIO; } @@ -74,9 +74,9 @@ static int remove_connection_callback(TALLOC_CTX *mem_ctx) lret = ldap_get_option(cb_data->sh->ldap, LDAP_OPT_CONNECT_CB, conncb); if (lret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to remove connection callback.\n")); + DEBUG(1, "Failed to remove connection callback.\n"); } else { - DEBUG(9, ("Successfully removed connection callback.\n")); + DEBUG(9, "Successfully removed connection callback.\n"); } return EOK; } @@ -93,27 +93,27 @@ static int sdap_ldap_connect_callback_add(LDAP *ld, Sockbuf *sb, struct ldap_cb_data); if (cb_data == NULL) { - DEBUG(1, ("sdap_ldap_connect_callback_add called without " - "callback data.\n")); + DEBUG(1, "sdap_ldap_connect_callback_add called without " + "callback data.\n"); return EINVAL; } ret = ber_sockbuf_ctrl(sb, LBER_SB_OPT_GET_FD, &ber_fd); if (ret == -1) { - DEBUG(1, ("ber_sockbuf_ctrl failed.\n")); + DEBUG(1, "ber_sockbuf_ctrl failed.\n"); return EINVAL; } if (DEBUG_IS_SET(SSSDBG_TRACE_LIBS)) { char *uri = ldap_url_desc2str(srv); - DEBUG(7, ("New LDAP connection to [%s] with fd [%d].\n", - uri, ber_fd)); + DEBUG(7, "New LDAP connection to [%s] with fd [%d].\n", + uri, ber_fd); free(uri); } fd_event_item = talloc_zero(cb_data, struct fd_event_item); if (fd_event_item == NULL) { - DEBUG(1, ("talloc failed.\n")); + DEBUG(1, "talloc failed.\n"); return ENOMEM; } @@ -121,7 +121,7 @@ static int sdap_ldap_connect_callback_add(LDAP *ld, Sockbuf *sb, TEVENT_FD_READ, sdap_ldap_result, cb_data->sh); if (fd_event_item->fde == NULL) { - DEBUG(1, ("tevent_add_fd failed.\n")); + DEBUG(1, "tevent_add_fd failed.\n"); talloc_free(fd_event_item); return ENOMEM; } @@ -147,10 +147,10 @@ static void sdap_ldap_connect_callback_del(LDAP *ld, Sockbuf *sb, ret = ber_sockbuf_ctrl(sb, LBER_SB_OPT_GET_FD, &ber_fd); if (ret == -1) { - DEBUG(1, ("ber_sockbuf_ctrl failed.\n")); + DEBUG(1, "ber_sockbuf_ctrl failed.\n"); return; } - DEBUG(9, ("Closing LDAP connection with fd [%d].\n", ber_fd)); + DEBUG(9, "Closing LDAP connection with fd [%d].\n", ber_fd); DLIST_FOR_EACH(fd_event_item, cb_data->fd_list) { if (fd_event_item->fd == ber_fd) { @@ -158,7 +158,7 @@ static void sdap_ldap_connect_callback_del(LDAP *ld, Sockbuf *sb, } } if (fd_event_item == NULL) { - DEBUG(1, ("No event for fd [%d] found.\n", ber_fd)); + DEBUG(1, "No event for fd [%d] found.\n", ber_fd); return; } @@ -177,14 +177,14 @@ static int sdap_install_ldap_callbacks(struct sdap_handle *sh, int ret; if (sh->sdap_fd_events) { - DEBUG(1, ("sdap_install_ldap_callbacks is called with already " - "initialized sdap_fd_events.\n")); + DEBUG(1, "sdap_install_ldap_callbacks is called with already " + "initialized sdap_fd_events.\n"); return EINVAL; } sh->sdap_fd_events = talloc_zero(sh, struct sdap_fd_events); if (!sh->sdap_fd_events) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); return ENOMEM; } @@ -199,9 +199,9 @@ static int sdap_install_ldap_callbacks(struct sdap_handle *sh, return ENOMEM; } - DEBUG(8, ("Trace: sh[%p], connected[%d], ops[%p], fde[%p], ldap[%p]\n", + DEBUG(8, "Trace: sh[%p], connected[%d], ops[%p], fde[%p], ldap[%p]\n", sh, (int)sh->connected, sh->ops, sh->sdap_fd_events->fde, - sh->ldap)); + sh->ldap); return EOK; } @@ -218,7 +218,7 @@ errno_t setup_ldap_connection_callbacks(struct sdap_handle *sh, sh->sdap_fd_events = talloc_zero(sh, struct sdap_fd_events); if (sh->sdap_fd_events == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = ENOMEM; goto fail; } @@ -226,14 +226,14 @@ errno_t setup_ldap_connection_callbacks(struct sdap_handle *sh, sh->sdap_fd_events->conncb = talloc_zero(sh->sdap_fd_events, struct ldap_conncb); if (sh->sdap_fd_events->conncb == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = ENOMEM; goto fail; } cb_data = talloc_zero(sh->sdap_fd_events->conncb, struct ldap_cb_data); if (cb_data == NULL) { - DEBUG(1, ("talloc_zero failed.\n")); + DEBUG(1, "talloc_zero failed.\n"); ret = ENOMEM; goto fail; } @@ -247,7 +247,7 @@ errno_t setup_ldap_connection_callbacks(struct sdap_handle *sh, ret = ldap_set_option(sh->ldap, LDAP_OPT_CONNECT_CB, sh->sdap_fd_events->conncb); if (ret != LDAP_OPT_SUCCESS) { - DEBUG(1, ("Failed to set connection callback\n")); + DEBUG(1, "Failed to set connection callback\n"); ret = EFAULT; goto fail; } @@ -261,7 +261,7 @@ fail: talloc_zfree(sh->sdap_fd_events); return ret; #else - DEBUG(9, ("LDAP connection callbacks are not supported.\n")); + DEBUG(9, "LDAP connection callbacks are not supported.\n"); return EOK; #endif } @@ -288,13 +288,13 @@ errno_t sdap_call_conn_cb(const char *uri,int fd, struct sdap_handle *sh) sb = ber_sockbuf_alloc(); if (sb == NULL) { - DEBUG(1, ("ber_sockbuf_alloc failed.\n")); + DEBUG(1, "ber_sockbuf_alloc failed.\n"); return ENOMEM; } ret = ber_sockbuf_ctrl(sb, LBER_SB_OPT_SET_FD, &fd); if (ret != 1) { - DEBUG(1, ("ber_sockbuf_ctrl failed.\n")); + DEBUG(1, "ber_sockbuf_ctrl failed.\n"); return EFAULT; } @@ -302,8 +302,8 @@ errno_t sdap_call_conn_cb(const char *uri,int fd, struct sdap_handle *sh) if (ret != 0) { ber_sockbuf_free(sb); DEBUG(SSSDBG_CRIT_FAILURE, - ("ldap_url_parse failed to validate [%s] on fd [%d].\n", - uri, fd)); + "ldap_url_parse failed to validate [%s] on fd [%d].\n", + uri, fd); return EFAULT; } @@ -314,7 +314,7 @@ errno_t sdap_call_conn_cb(const char *uri,int fd, struct sdap_handle *sh) ber_sockbuf_free(sb); return ret; #else - DEBUG(9, ("LDAP connection callbacks are not supported.\n")); + DEBUG(9, "LDAP connection callbacks are not supported.\n"); return EOK; #endif } diff --git a/src/providers/ldap/sdap_id_op.c b/src/providers/ldap/sdap_id_op.c index 5e166e19f..1e03d7ac4 100644 --- a/src/providers/ldap/sdap_id_op.c +++ b/src/providers/ldap/sdap_id_op.c @@ -109,7 +109,7 @@ int sdap_id_conn_cache_create(TALLOC_CTX *memctx, int ret; struct sdap_id_conn_cache *conn_cache = talloc_zero(memctx, struct sdap_id_conn_cache); if (!conn_cache) { - DEBUG(1, ("talloc_zero(struct sdap_id_conn_cache) failed.\n")); + DEBUG(1, "talloc_zero(struct sdap_id_conn_cache) failed.\n"); ret = ENOMEM; goto fail; } @@ -120,7 +120,7 @@ int sdap_id_conn_cache_create(TALLOC_CTX *memctx, sdap_id_conn_cache_be_offline_cb, conn_cache, NULL); if (ret != EOK) { - DEBUG(1, ("be_add_offline_cb failed.\n")); + DEBUG(1, "be_add_offline_cb failed.\n"); goto fail; } @@ -128,7 +128,7 @@ int sdap_id_conn_cache_create(TALLOC_CTX *memctx, sdap_id_conn_cache_fo_reconnect_cb, conn_cache, NULL); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("be_add_reconnect_cb failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "be_add_reconnect_cb failed.\n"); goto fail; } @@ -179,7 +179,7 @@ static void sdap_id_release_conn_data(struct sdap_id_conn_data *conn_data) return; } - DEBUG(9, ("releasing unused connection\n")); + DEBUG(9, "releasing unused connection\n"); DLIST_REMOVE(conn_cache->connections, conn_data); talloc_zfree(conn_data); @@ -277,7 +277,7 @@ static void sdap_id_conn_data_expire_handler(struct tevent_context *ev, struct sdap_id_conn_data); struct sdap_id_conn_cache *conn_cache = conn_data->conn_cache; - DEBUG(3, ("connection is about to expire, releasing it\n")); + DEBUG(3, "connection is about to expire, releasing it\n"); if (conn_cache->cached_connection == conn_data) { conn_cache->cached_connection = NULL; @@ -304,7 +304,7 @@ struct sdap_id_op *sdap_id_op_create(TALLOC_CTX *memctx, struct sdap_id_conn_cac static void sdap_id_op_hook_conn_data(struct sdap_id_op *op, struct sdap_id_conn_data *conn_data) { if (!op) { - DEBUG(0, ("NULL op passed!!!\n")); + DEBUG(0, "NULL op passed!!!\n"); return; } @@ -334,7 +334,7 @@ static int sdap_id_op_destroy(void *pvt) struct sdap_id_op *op = talloc_get_type(pvt, struct sdap_id_op); if (op->conn_data) { - DEBUG(9, ("releasing operation connection\n")); + DEBUG(9, "releasing operation connection\n"); sdap_id_op_hook_conn_data(op, NULL); } @@ -392,14 +392,14 @@ struct tevent_req *sdap_id_op_connect_send(struct sdap_id_op *op, int ret = EOK; if (!memctx) { - DEBUG(1, ("Bug: no memory context passed.\n")); + DEBUG(1, "Bug: no memory context passed.\n"); ret = EINVAL; goto done; } if (op->connect_req) { /* Connection already in progress, invalid operation */ - DEBUG(1, ("Bug: connection request is already running or completed and leaked.\n")); + DEBUG(1, "Bug: connection request is already running or completed and leaked.\n"); ret = EINVAL; goto done; } @@ -420,7 +420,7 @@ struct tevent_req *sdap_id_op_connect_send(struct sdap_id_op *op, if (op->conn_data) { /* If the operation is already connected, * reuse existing connection regardless of its status */ - DEBUG(9, ("reusing operation connection\n")); + DEBUG(9, "reusing operation connection\n"); ret = EOK; goto done; } @@ -462,23 +462,23 @@ static int sdap_id_op_connect_step(struct tevent_req *req) conn_data = conn_cache->cached_connection; if (conn_data) { if (conn_data->connect_req) { - DEBUG(9, ("waiting for connection to complete\n")); + DEBUG(9, "waiting for connection to complete\n"); sdap_id_op_hook_conn_data(op, conn_data); goto done; } if (sdap_can_reuse_connection(conn_data)) { - DEBUG(9, ("reusing cached connection\n")); + DEBUG(9, "reusing cached connection\n"); sdap_id_op_hook_conn_data(op, conn_data); goto done; } - DEBUG(9, ("releasing expired cached connection\n")); + DEBUG(9, "releasing expired cached connection\n"); conn_cache->cached_connection = NULL; sdap_id_release_conn_data(conn_data); } - DEBUG(9, ("beginning to connect\n")); + DEBUG(9, "beginning to connect\n"); conn_data = talloc_zero(conn_cache, struct sdap_id_conn_data); if (!conn_data) { @@ -544,24 +544,24 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) conn_data->notify_lock++; if (ret == ENOTSUP) { - DEBUG(0, ("Authentication mechanism not Supported by server\n")); + DEBUG(0, "Authentication mechanism not Supported by server\n"); } if (ret == EOK && (!conn_data->sh || !conn_data->sh->connected)) { - DEBUG(0, ("sdap_cli_connect_recv returned bogus connection\n")); + DEBUG(0, "sdap_cli_connect_recv returned bogus connection\n"); ret = EFAULT; } if (ret != EOK && !can_retry) { if (conn_cache->id_conn->ignore_mark_offline) { DEBUG(SSSDBG_TRACE_FUNC, - ("Failed to connect to server, but ignore mark offline " - "is enabled.\n")); + "Failed to connect to server, but ignore mark offline " + "is enabled.\n"); } else { /* be is going offline as there is no more servers to try */ DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to connect, going offline (%d [%s])\n", - ret, strerror(ret))); + "Failed to connect, going offline (%d [%s])\n", + ret, strerror(ret)); be_mark_offline(conn_cache->id_conn->id_ctx->be); } is_offline = true; @@ -570,12 +570,12 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) if (ret == EOK) { current_srv_opts = conn_cache->id_conn->id_ctx->srv_opts; if (current_srv_opts) { - DEBUG(8, ("Old USN: %lu, New USN: %lu\n", current_srv_opts->last_usn, srv_opts->last_usn)); + DEBUG(8, "Old USN: %lu, New USN: %lu\n", current_srv_opts->last_usn, srv_opts->last_usn); if (strcmp(srv_opts->server_id, current_srv_opts->server_id) == 0 && srv_opts->supports_usn && current_srv_opts->last_usn > srv_opts->last_usn) { - DEBUG(5, ("Server was probably re-initialized\n")); + DEBUG(5, "Server was probably re-initialized\n"); current_srv_opts->max_user_value = 0; current_srv_opts->max_group_value = 0; @@ -616,7 +616,7 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) struct sdap_id_op *op; if (ret == EOK && !conn_data->sh->connected) { - DEBUG(9, ("connection was broken after %d notifies\n", notify_count)); + DEBUG(9, "connection was broken after %d notifies\n", notify_count); } DLIST_FOR_EACH(op, conn_data->ops) { @@ -646,7 +646,7 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) if (be_is_offline(conn_cache->id_conn->id_ctx->be)) { /* be is offline, no retry possible */ if (ret == EOK) { - DEBUG(9, ("skipping automatic retry on op #%d as be is offline\n", notify_count)); + DEBUG(9, "skipping automatic retry on op #%d as be is offline\n", notify_count); ret = EIO; } @@ -654,10 +654,10 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) is_offline = true; } else { if (ret == EOK) { - DEBUG(9, ("attempting automatic retry on op #%d\n", notify_count)); + DEBUG(9, "attempting automatic retry on op #%d\n", notify_count); retry = true; } else if (sdap_id_op_can_reconnect(op)) { - DEBUG(9, ("attempting failover retry on op #%d\n", notify_count)); + DEBUG(9, "attempting failover retry on op #%d\n", notify_count); op->reconnect_retry_count++; retry = true; } @@ -676,13 +676,13 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) } if (ret == EOK) { - DEBUG(9, ("notify connected to op #%d\n", notify_count)); + DEBUG(9, "notify connected to op #%d\n", notify_count); sdap_id_op_connect_req_complete(op, DP_ERR_OK, ret); } else if (is_offline) { - DEBUG(9, ("notify offline to op #%d\n", notify_count)); + DEBUG(9, "notify offline to op #%d\n", notify_count); sdap_id_op_connect_req_complete(op, DP_ERR_OFFLINE, EAGAIN); } else { - DEBUG(9, ("notify error to op #%d: %d [%s]\n", notify_count, ret, strerror(ret))); + DEBUG(9, "notify error to op #%d: %d [%s]\n", notify_count, ret, strerror(ret)); sdap_id_op_connect_req_complete(op, DP_ERR_FATAL, ret); } } @@ -695,7 +695,7 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) if ((ret == EOK) && conn_data->sh->connected && !be_is_offline(conn_cache->id_conn->id_ctx->be)) { - DEBUG(9, ("caching successful connection after %d notifies\n", notify_count)); + DEBUG(9, "caching successful connection after %d notifies\n", notify_count); conn_cache->cached_connection = conn_data; /* Run any post-connection routines */ @@ -711,14 +711,14 @@ static void sdap_id_op_connect_done(struct tevent_req *subreq) } if (reinit) { - DEBUG(SSSDBG_TRACE_FUNC, ("Server reinitialization detected. " - "Cleaning cache.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Server reinitialization detected. " + "Cleaning cache.\n"); reinit_req = sdap_reinit_cleanup_send(conn_cache->id_conn->id_ctx->be, conn_cache->id_conn->id_ctx->be, conn_cache->id_conn->id_ctx); if (reinit_req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to perform reinitialization " - "clean up.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to perform reinitialization " + "clean up.\n"); return; } @@ -734,13 +734,13 @@ static void sdap_id_op_connect_reinit_done(struct tevent_req *req) ret = sdap_reinit_cleanup_recv(req); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to perform reinitialization " - "clean up [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to perform reinitialization " + "clean up [%d]: %s\n", ret, strerror(ret)); /* not fatal */ return; } - DEBUG(SSSDBG_TRACE_FUNC, ("Reinitialization clean up completed\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Reinitialization clean up completed\n"); } /* Mark operation connection request as complete */ @@ -812,7 +812,7 @@ int sdap_id_op_done(struct sdap_id_op *op, int retval, int *dp_err_out) /* do not reuse failed connection */ op->conn_cache->cached_connection = NULL; - DEBUG(5, ("communication error on cached connection, moving to next server\n")); + DEBUG(5, "communication error on cached connection, moving to next server\n"); be_fo_try_next_server(op->conn_cache->id_conn->id_ctx->be, op->conn_cache->id_conn->service->name); } @@ -824,13 +824,13 @@ int sdap_id_op_done(struct sdap_id_op *op, int retval, int *dp_err_out) /* if backend is already offline, just report offline, do not duplicate errors */ dp_err = DP_ERR_OFFLINE; retval = EAGAIN; - DEBUG(9, ("falling back to offline data...\n")); + DEBUG(9, "falling back to offline data...\n"); } else if (communication_error) { /* communication error, can try to reconnect */ if (!sdap_id_op_can_reconnect(op)) { dp_err = DP_ERR_FATAL; - DEBUG(9, ("too many communication failures, giving up...\n")); + DEBUG(9, "too many communication failures, giving up...\n"); } else { dp_err = DP_ERR_OK; retval = EAGAIN; @@ -842,14 +842,14 @@ int sdap_id_op_done(struct sdap_id_op *op, int retval, int *dp_err_out) if (dp_err == DP_ERR_OK && retval != EOK) { /* reconnect retry */ op->reconnect_retry_count++; - DEBUG(9, ("advising for connection retry #%i\n", op->reconnect_retry_count)); + DEBUG(9, "advising for connection retry #%i\n", op->reconnect_retry_count); } else { /* end of request */ op->reconnect_retry_count = 0; } if (current_conn) { - DEBUG(9, ("releasing operation connection\n")); + DEBUG(9, "releasing operation connection\n"); sdap_id_op_hook_conn_data(op, NULL); } diff --git a/src/providers/ldap/sdap_idmap.c b/src/providers/ldap/sdap_idmap.c index 57c448fff..2df371009 100644 --- a/src/providers/ldap/sdap_idmap.c +++ b/src/providers/ldap/sdap_idmap.c @@ -43,22 +43,22 @@ sdap_idmap_get_configured_external_range(struct sdap_idmap_ctx *idmap_ctx, int_id = dp_opt_get_int(id_ctx->opts->basic, SDAP_MIN_ID); if (int_id < 0) { - DEBUG(SSSDBG_CONF_SETTINGS, ("ldap_min_id must be greater than 0.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "ldap_min_id must be greater than 0.\n"); return EINVAL; } min = int_id; int_id = dp_opt_get_int(id_ctx->opts->basic, SDAP_MAX_ID); if (int_id < 0) { - DEBUG(SSSDBG_CONF_SETTINGS, ("ldap_max_id must be greater than 0.\n")); + DEBUG(SSSDBG_CONF_SETTINGS, "ldap_max_id must be greater than 0.\n"); return EINVAL; } max = int_id; if ((min == 0 && max != 0) || (min != 0 && max == 0)) { - DEBUG(SSSDBG_CONF_SETTINGS, ("Both ldap_min_id and ldap_max_id " \ + DEBUG(SSSDBG_CONF_SETTINGS, "Both ldap_min_id and ldap_max_id " \ "either must be 0 (not set) " \ - "or positive integers.\n")); + "or positive integers.\n"); return EINVAL; } @@ -88,7 +88,7 @@ sdap_idmap_add_configured_external_range(struct sdap_idmap_ctx *idmap_ctx) ret = sdap_idmap_get_configured_external_range(idmap_ctx, &range); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_idmap_get_configured_external_range failed.\n")); + "sdap_idmap_get_configured_external_range failed.\n"); return ret; } @@ -99,8 +99,8 @@ sdap_idmap_add_configured_external_range(struct sdap_idmap_ctx *idmap_ctx) NULL, 0, true); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not add domain [%s] to the map: [%d]\n", - id_ctx->be->domain->name, err)); + "Could not add domain [%s] to the map: [%d]\n", + id_ctx->be->domain->name, err); return EIO; } @@ -118,7 +118,7 @@ errno_t sdap_idmap_find_new_domain(struct sdap_idmap_ctx *idmap_ctx, -1); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not add new domain [%s]\n", dom_name)); + "Could not add new domain [%s]\n", dom_name); return ret; } @@ -171,17 +171,17 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, || (idmap_upper-idmap_lower) < rangesize) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Invalid settings for range selection: " + "Invalid settings for range selection: " "[%"SPRIid"][%"SPRIid"][%"SPRIid"]\n", - idmap_lower, idmap_upper, rangesize)); + idmap_lower, idmap_upper, rangesize); ret = EINVAL; goto done; } if (((idmap_upper - idmap_lower) % rangesize) != 0) { DEBUG(SSSDBG_CONF_SETTINGS, - ("Range size does not divide evenly. Uppermost range will " - "not be used\n")); + "Range size does not divide evenly. Uppermost range will " + "not be used\n"); } /* Initialize the map */ @@ -190,8 +190,8 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, &idmap_ctx->map); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not initialize the ID map: [%s]\n", - idmap_error_string(err))); + "Could not initialize the ID map: [%s]\n", + idmap_error_string(err)); if (err == IDMAP_OUT_OF_MEMORY) { ret = ENOMEM; } else { @@ -206,7 +206,7 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, err |= sss_idmap_ctx_set_rangesize(idmap_ctx->map, rangesize); if (err != IDMAP_SUCCESS) { /* This should never happen */ - DEBUG(SSSDBG_CRIT_FAILURE, ("sss_idmap_ctx corrupted\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sss_idmap_ctx corrupted\n"); return EIO; } @@ -217,7 +217,7 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, ret = sdap_idmap_add_configured_external_range(idmap_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_idmap_add_configured_external_range failed.\n")); + "sdap_idmap_add_configured_external_range failed.\n"); goto done; } } @@ -226,14 +226,14 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, ret = sysdb_idmap_get_mappings(tmp_ctx, sysdb, id_ctx->be->domain, &res); if (ret != EOK && ret != ENOENT) { DEBUG(SSSDBG_FATAL_FAILURE, - ("Could not read ID mappings from the cache: [%s]\n", - strerror(ret))); + "Could not read ID mappings from the cache: [%s]\n", + strerror(ret)); goto done; } if (ret == EOK && res->count > 0) { DEBUG(SSSDBG_CONF_SETTINGS, - ("Initializing [%d] domains for ID-mapping\n", res->count)); + "Initializing [%d] domains for ID-mapping\n", res->count); for (i = 0; i < res->count; i++) { dom_name = ldb_msg_find_attr_as_string(res->msgs[i], @@ -267,9 +267,9 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, sid_str, slice_num); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not add domain [%s][%s][%"SPRIid"] " + "Could not add domain [%s][%s][%"SPRIid"] " "to ID map: [%s]\n", - dom_name, sid_str, slice_num, strerror(ret))); + dom_name, sid_str, slice_num, strerror(ret)); goto done; } } @@ -294,18 +294,18 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, sid_str, 0); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not add domain [%s][%s][%u] to ID map: [%s]\n", - dom_name, sid_str, 0, strerror(ret))); + "Could not add domain [%s][%s][%u] to ID map: [%s]\n", + dom_name, sid_str, 0, strerror(ret)); goto done; } } else { if (dp_opt_get_bool(idmap_ctx->id_ctx->opts->basic, SDAP_IDMAP_AUTORID_COMPAT)) { /* In autorid compatibility mode, we MUST have a slice 0 */ DEBUG(SSSDBG_CRIT_FAILURE, - ("WARNING: Autorid compatibility mode selected, " + "WARNING: Autorid compatibility mode selected, " "but %s is not set. UID/GID values may differ " "between clients.\n", - idmap_ctx->id_ctx->opts->basic[SDAP_IDMAP_DEFAULT_DOMAIN_SID].opt_name)); + idmap_ctx->id_ctx->opts->basic[SDAP_IDMAP_DEFAULT_DOMAIN_SID].opt_name); } /* Otherwise, we'll just fall back to hash values as they are seen */ } @@ -334,7 +334,7 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx, ret = sss_idmap_ctx_get_upper(idmap_ctx->map, &idmap_upper); if (ret != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to get upper bound of available ID range.\n")); + "Failed to get upper bound of available ID range.\n"); ret = EIO; goto done; } @@ -344,19 +344,19 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx, ret = sss_idmap_calculate_range(idmap_ctx->map, dom_sid, &slice, &range); if (ret != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Failed to calculate range for domain [%s]: [%d]\n", dom_name, - ret)); + "Failed to calculate range for domain [%s]: [%d]\n", dom_name, + ret); ret = EIO; goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Adding domain [%s] as slice [%"SPRIid"]\n", dom_sid, slice)); + "Adding domain [%s] as slice [%"SPRIid"]\n", dom_sid, slice); if (range.max > idmap_upper) { /* This should never happen */ DEBUG(SSSDBG_CRIT_FAILURE, - ("BUG: Range maximum exceeds the global maximum: " - "%u > %"SPRIid"\n", range.max, idmap_upper)); + "BUG: Range maximum exceeds the global maximum: " + "%u > %"SPRIid"\n", range.max, idmap_upper); ret = EINVAL; goto done; } @@ -364,7 +364,7 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx, ret = sdap_idmap_get_configured_external_range(idmap_ctx, &range); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("sdap_idmap_get_configured_external_range failed.\n")); + "sdap_idmap_get_configured_external_range failed.\n"); return ret; } } @@ -374,8 +374,8 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx, NULL, 0, external_mapping); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not add domain [%s] to the map: [%d]\n", - dom_name, err)); + "Could not add domain [%s] to the map: [%d]\n", + dom_name, err); ret = EIO; goto done; } @@ -388,7 +388,7 @@ sdap_idmap_add_domain(struct sdap_idmap_ctx *idmap_ctx, dom_name, dom_sid, slice); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_idmap_store_mapping failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_idmap_store_mapping failed.\n"); goto done; } } @@ -467,14 +467,14 @@ sdap_idmap_sid_to_unix(struct sdap_idmap_ctx *idmap_ctx, &dom_sid_str); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not parse domain SID from [%s]\n", sid_str)); + "Could not parse domain SID from [%s]\n", sid_str); goto done; } ret = idmap_ctx->find_new_domain(idmap_ctx, dom_sid_str, dom_sid_str); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not add new domain for sid [%s]\n", sid_str)); + "Could not add new domain for sid [%s]\n", sid_str); goto done; } @@ -484,23 +484,23 @@ sdap_idmap_sid_to_unix(struct sdap_idmap_ctx *idmap_ctx, (uint32_t *)id); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert objectSID [%s] to a UNIX ID\n", - sid_str)); + "Could not convert objectSID [%s] to a UNIX ID\n", + sid_str); ret = EIO; goto done; } break; case IDMAP_BUILTIN_SID: DEBUG(SSSDBG_TRACE_FUNC, - ("Object SID [%s] is a built-in one.\n", sid_str)); + "Object SID [%s] is a built-in one.\n", sid_str); /* ENOTSUP indicates built-in SID */ ret = ENOTSUP; goto done; break; default: DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not convert objectSID [%s] to a UNIX ID\n", - sid_str)); + "Could not convert objectSID [%s] to a UNIX ID\n", + sid_str); ret = EIO; goto done; } @@ -561,7 +561,7 @@ bool sdap_idmap_domain_has_algorithmic_mapping(struct sdap_idmap_ctx *ctx, } else { tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_OP_FAILURE, ("talloc_new failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "talloc_new failed.\n"); return false; } @@ -569,7 +569,7 @@ bool sdap_idmap_domain_has_algorithmic_mapping(struct sdap_idmap_ctx *ctx, &new_dom_sid); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not parse domain SID from [%s]\n", dom_sid)); + "Could not parse domain SID from [%s]\n", dom_sid); talloc_free(tmp_ctx); return false; } @@ -579,7 +579,7 @@ bool sdap_idmap_domain_has_algorithmic_mapping(struct sdap_idmap_ctx *ctx, talloc_free(tmp_ctx); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Could not add new domain for sid [%s]\n", dom_sid)); + "Could not add new domain for sid [%s]\n", dom_sid); return false; } diff --git a/src/providers/ldap/sdap_range.c b/src/providers/ldap/sdap_range.c index c4bf43539..d88def6fa 100644 --- a/src/providers/ldap/sdap_range.c +++ b/src/providers/ldap/sdap_range.c @@ -55,7 +55,7 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, ret = EOK; } DEBUG(SSSDBG_TRACE_INTERNAL, - ("No sub-attributes for [%s]\n", attr_desc)); + "No sub-attributes for [%s]\n", attr_desc); goto done; } @@ -67,8 +67,8 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, goto done; } DEBUG(SSSDBG_TRACE_LIBS, - ("Base attribute of [%s] is [%s]\n", - attr_desc, base)); + "Base attribute of [%s] is [%s]\n", + attr_desc, base); /* Next, determine if this is a ranged attribute */ if (strncmp(endptr+1, SDAP_RANGE_STRING, rangestringlen) != 0) { @@ -82,8 +82,8 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, ret = EOK; } DEBUG(SSSDBG_TRACE_LIBS, - ("[%s] contains sub-attribute other than a range, returning whole\n", - attr_desc)); + "[%s] contains sub-attribute other than a range, returning whole\n", + attr_desc); goto done; } else if (disable_range_retrieval) { /* This is range sub-attribute, but we want to ignore it. @@ -102,8 +102,8 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, if (!end_range) { ret = EINVAL; DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot find hyphen in [%s]\n", - endptr + rangestringlen +1)); + "Cannot find hyphen in [%s]\n", + endptr + rangestringlen +1); goto done; } end_range++; /* advance past the hyphen */ @@ -113,8 +113,8 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, *base_attr = talloc_steal(mem_ctx, base); *range_offset = 0; DEBUG(SSSDBG_TRACE_LIBS, - ("[%s] contained the last set of values for this attribute\n", - attr_desc)); + "[%s] contained the last set of values for this attribute\n", + attr_desc); ret = EOK; goto done; } @@ -124,16 +124,16 @@ errno_t sdap_parse_range(TALLOC_CTX *mem_ctx, *range_offset = 0; ret = errno; DEBUG(SSSDBG_MINOR_FAILURE, - ("[%s] did not parse as an unsigned integer: [%s]\n", - end_range, strerror(ret))); + "[%s] did not parse as an unsigned integer: [%s]\n", + end_range, strerror(ret)); goto done; } (*range_offset)++; *base_attr = talloc_steal(mem_ctx, base); DEBUG(SSSDBG_TRACE_LIBS, - ("Parsed range values: [%s][%d]\n", - base, *range_offset)); + "Parsed range values: [%s][%d]\n", + base, *range_offset); ret = EAGAIN; done: diff --git a/src/providers/ldap/sdap_refresh.c b/src/providers/ldap/sdap_refresh.c index 819ee4fce..fb2dbc781 100644 --- a/src/providers/ldap/sdap_refresh.c +++ b/src/providers/ldap/sdap_refresh.c @@ -47,7 +47,7 @@ struct tevent_req *sdap_refresh_netgroups_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_refresh_netgroups_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -63,11 +63,11 @@ struct tevent_req *sdap_refresh_netgroups_send(TALLOC_CTX *mem_ctx, ret = sdap_refresh_netgroups_step(req); if (ret == EOK) { - DEBUG(SSSDBG_TRACE_FUNC, ("Nothing to refresh\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Nothing to refresh\n"); goto immediately; } else if (ret != EAGAIN) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sdap_refresh_netgroups_step() failed " - "[%d]: %s\n", ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "sdap_refresh_netgroups_step() failed " + "[%d]: %s\n", ret, sss_strerror(ret)); goto immediately; } @@ -104,7 +104,7 @@ static errno_t sdap_refresh_netgroups_step(struct tevent_req *req) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Issuing refresh of netgroup %s\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Issuing refresh of netgroup %s\n", name); subreq = ldap_netgroup_get_send(state, state->ev, state->id_ctx, state->id_ctx->opts->sdom, @@ -136,9 +136,9 @@ static void sdap_refresh_netgroups_done(struct tevent_req *subreq) ret = ldap_netgroup_get_recv(subreq, &dp_error, &sdap_ret); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to refresh netgroup [dp_error: %d, " + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to refresh netgroup [dp_error: %d, " "sdap_ret: %d, errno: %d]: %s\n", - dp_error, sdap_ret, ret, sss_strerror(ret))); + dp_error, sdap_ret, ret, sss_strerror(ret)); goto done; } diff --git a/src/providers/ldap/sdap_reinit.c b/src/providers/ldap/sdap_reinit.c index 6a7f02cb3..41044aaca 100644 --- a/src/providers/ldap/sdap_reinit.c +++ b/src/providers/ldap/sdap_reinit.c @@ -75,15 +75,15 @@ struct tevent_req* sdap_reinit_cleanup_send(TALLOC_CTX *mem_ctx, ret = sdap_reinit_clear_usn(state->sysdb, state->domain); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to clear USN attributes [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to clear USN attributes [%d]: %s\n", + ret, strerror(ret)); goto immediately; } subreq = sdap_dom_enum_send(id_ctx, be_ctx->ev, id_ctx, id_ctx->opts->sdom, id_ctx->conn); if (subreq == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to issue enumeration request\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to issue enumeration request\n"); ret = ENOMEM; goto immediately; } @@ -115,8 +115,8 @@ static void sdap_delete_msgs_usn(struct sysdb_ctx *sysdb, for (i = 0; i < msgs_num; i++) { ret = sysdb_set_entry_attr(sysdb, msgs[i]->dn, &usn_el, SYSDB_MOD_DEL); if (ret) { - DEBUG(SSSDBG_TRACE_FUNC, ("Failed to clean USN on entry: [%s]\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(SSSDBG_TRACE_FUNC, "Failed to clean USN on entry: [%s]\n", + ldb_dn_get_linearized(msgs[i]->dn)); } } } @@ -134,7 +134,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, 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; } @@ -169,7 +169,7 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, "", attrs, &msgs_num, &msgs); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot search services [%d]: %s\n", ret, strerror(ret))); + "Cannot search services [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -181,14 +181,14 @@ static errno_t sdap_reinit_clear_usn(struct sysdb_ctx *sysdb, if (ret == EOK) { in_transaction = false; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not commit transaction\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not commit transaction\n"); } done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } @@ -209,8 +209,8 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) ret = sdap_dom_enum_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Domain enumeration failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Domain enumeration failed [%d]: %s\n", + ret, strerror(ret)); goto fail; } @@ -221,8 +221,8 @@ static void sdap_reinit_cleanup_done(struct tevent_req *subreq) */ ret = sysdb_set_enumerated(state->sysdb, state->domain, true); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not mark domain as having " - "enumerated.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not mark domain as having " + "enumerated.\n"); /* This error is non-fatal, so continue */ } @@ -248,8 +248,8 @@ static void sdap_delete_msgs_dn(struct sysdb_ctx *sysdb, for (i = 0; i < msgs_num; i++) { ret = sysdb_delete_entry(sysdb, msgs[i]->dn, true); if (ret) { - DEBUG(SSSDBG_TRACE_FUNC, ("Failed to delete entry: [%s]\n", - ldb_dn_get_linearized(msgs[i]->dn))); + DEBUG(SSSDBG_TRACE_FUNC, "Failed to delete entry: [%s]\n", + ldb_dn_get_linearized(msgs[i]->dn)); } } } @@ -267,7 +267,7 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb, 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; } @@ -308,14 +308,14 @@ static errno_t sdap_reinit_delete_records(struct sysdb_ctx *sysdb, if (ret == EOK) { in_transaction = false; } else { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not commit transaction\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not commit transaction\n"); } done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not cancel transaction\n"); } } diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c index b8bc409ef..adbc37b6d 100644 --- a/src/providers/ldap/sdap_sudo.c +++ b/src/providers/ldap/sdap_sudo.c @@ -128,11 +128,11 @@ int sdap_sudo_init(struct be_ctx *be_ctx, struct tevent_req *req = NULL; int ret; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Initializing sudo LDAP back end\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Initializing sudo LDAP back end\n"); sudo_ctx = talloc_zero(be_ctx, struct sdap_sudo_ctx); if (sudo_ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc() failed\n"); return ENOMEM; } @@ -150,23 +150,23 @@ int sdap_sudo_init(struct be_ctx *be_ctx, &sudo_ctx->include_regexp, &sudo_ctx->include_netgroups); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot get SUDO options [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Cannot get SUDO options [%d]: %s\n", + ret, strerror(ret)); return ret; } req = sdap_sudo_get_hostinfo_send(sudo_ctx, id_ctx->opts, be_ctx); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve host information - " - "(host filter will be disabled)\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve host information - " + "(host filter will be disabled)\n"); sudo_ctx->use_host_filter = false; ret = sdap_sudo_setup_periodical_refresh(sudo_ctx); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Unable to setup periodical refresh" - "of sudo rules [%d]: %s\n", ret, strerror(ret))); + "Unable to setup periodical refresh" + "of sudo rules [%d]: %s\n", ret, strerror(ret)); /* periodical updates will not work, but specific-rule update * is no affected by this, therefore we don't have to fail here */ } @@ -189,8 +189,8 @@ static void sdap_sudo_get_hostinfo_done(struct tevent_req *req) ret = sdap_sudo_get_hostinfo_recv(sudo_ctx, req, &hostnames, &ip_addr); talloc_zfree(req); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to retrieve host information - " - "(host filter will be disabled) [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to retrieve host information - " + "(host filter will be disabled) [%d]: %s\n", ret, strerror(ret)); sudo_ctx->use_host_filter = false; } @@ -202,8 +202,8 @@ static void sdap_sudo_get_hostinfo_done(struct tevent_req *req) ret = sdap_sudo_setup_periodical_refresh(sudo_ctx); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to setup periodical refresh" - "of sudo rules [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Unable to setup periodical refresh" + "of sudo rules [%d]: %s\n", ret, strerror(ret)); } } @@ -226,9 +226,9 @@ static int sdap_sudo_setup_periodical_refresh(struct sdap_sudo_ctx *sudo_ctx) if (smart_interval == 0 && full_interval == 0) { smart_default = id_ctx->opts->basic[SDAP_SUDO_SMART_REFRESH_INTERVAL].def_val.number; - DEBUG(SSSDBG_MINOR_FAILURE, ("At least one periodical update has to be " + DEBUG(SSSDBG_MINOR_FAILURE, "At least one periodical update has to be " "enabled. Setting smart refresh interval to default value (%ld).\n", - smart_default)); + smart_default); ret = dp_opt_set_int(id_ctx->opts->basic, SDAP_SUDO_SMART_REFRESH_INTERVAL, @@ -239,9 +239,9 @@ static int sdap_sudo_setup_periodical_refresh(struct sdap_sudo_ctx *sudo_ctx) } if (full_interval <= smart_interval) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Full refresh interval has to be greater" + DEBUG(SSSDBG_MINOR_FAILURE, "Full refresh interval has to be greater" "than smart refresh interval. Periodical full refresh will be " - "disabled.\n")); + "disabled.\n"); ret = dp_opt_set_int(id_ctx->opts->basic, SDAP_SUDO_FULL_REFRESH_INTERVAL, 0); @@ -281,8 +281,8 @@ static int sdap_sudo_setup_periodical_refresh(struct sdap_sudo_ctx *sudo_ctx) sdap_sudo_periodical_first_refresh_done, delay, full_interval, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to schedule full refresh of sudo " - "rules! Periodical updates will not work!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to schedule full refresh of sudo " + "rules! Periodical updates will not work!\n"); return ret; } @@ -304,10 +304,10 @@ static void sdap_sudo_set_usn(struct sdap_server_opts *srv_opts, char *usn) srv_opts->last_usn = usn_number; } - DEBUG(SSSDBG_FUNC_DATA, ("SUDO higher USN value: [%s]\n", - srv_opts->max_sudo_value)); + DEBUG(SSSDBG_FUNC_DATA, "SUDO higher USN value: [%s]\n", + srv_opts->max_sudo_value); } else { - DEBUG(SSSDBG_TRACE_FUNC, ("srv_opts is NULL\n")); + DEBUG(SSSDBG_TRACE_FUNC, "srv_opts is NULL\n"); } } @@ -324,7 +324,7 @@ static char *sdap_sudo_build_host_filter(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 NULL; } @@ -426,7 +426,7 @@ static char *sdap_sudo_get_filter(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 NULL; } @@ -470,8 +470,8 @@ static void sdap_sudo_reply(struct tevent_req *req) ret = sdap_sudo_rules_refresh_recv(req, &dp_error, &error); break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid request type: %d\n", - sudo_req->type)); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid request type: %d\n", + sudo_req->type); ret = EINVAL; } @@ -501,25 +501,25 @@ void sdap_sudo_handler(struct be_req *be_req) switch (sudo_req->type) { case BE_REQ_SUDO_FULL: - DEBUG(SSSDBG_TRACE_FUNC, ("Issuing a full refresh of sudo rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Issuing a full refresh of sudo rules\n"); req = sdap_sudo_full_refresh_send(be_req, sudo_ctx); break; case BE_REQ_SUDO_RULES: - DEBUG(SSSDBG_TRACE_FUNC, ("Issuing a refresh of specific sudo rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Issuing a refresh of specific sudo rules\n"); req = sdap_sudo_rules_refresh_send(be_req, sudo_ctx, id_ctx->be, id_ctx->opts, id_ctx->conn->conn_cache, sudo_req->rules); break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid request type: %d\n", - sudo_req->type)); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid request type: %d\n", + sudo_req->type); ret = EINVAL; goto fail; } if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to send request: %d\n", - sudo_req->type)); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to send request: %d\n", + sudo_req->type); ret = ENOMEM; goto fail; } @@ -547,7 +547,7 @@ static struct tevent_req *sdap_sudo_full_refresh_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_sudo_full_refresh_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -581,7 +581,7 @@ static struct tevent_req *sdap_sudo_full_refresh_send(TALLOC_CTX *mem_ctx, goto immediately; } - DEBUG(SSSDBG_TRACE_FUNC, ("Issuing a full refresh of sudo rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Issuing a full refresh of sudo rules\n"); subreq = sdap_sudo_refresh_send(state, id_ctx->be, id_ctx->opts, id_ctx->conn->conn_cache, @@ -634,14 +634,14 @@ static void sdap_sudo_full_refresh_done(struct tevent_req *subreq) ret = sysdb_sudo_set_last_full_refresh(state->sysdb, state->domain, time(NULL)); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Unable to save time of " - "a successful full refresh\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Unable to save time of " + "a successful full refresh\n"); /* this is only a minor error that does not affect the functionality, * therefore there is no need to report it with tevent_req_error() * which would cause problems in the consumers */ } - DEBUG(SSSDBG_TRACE_FUNC, ("Successful full refresh of sudo rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Successful full refresh of sudo rules\n"); /* set highest usn */ if (highest_usn != NULL) { @@ -699,13 +699,13 @@ static struct tevent_req *sdap_sudo_rules_refresh_send(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 NULL; } req = tevent_req_create(mem_ctx, &state, struct sdap_sudo_rules_refresh_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } @@ -853,15 +853,15 @@ static struct tevent_req *sdap_sudo_smart_refresh_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct sdap_sudo_smart_refresh_state); if (req == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("tevent_req_create() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "tevent_req_create() failed\n"); return NULL; } if (!sudo_ctx->full_refresh_done && (srv_opts == NULL || srv_opts->max_sudo_value == 0)) { /* Perform full refresh first */ - DEBUG(SSSDBG_TRACE_FUNC, ("USN value is unknown, " - "waiting for full refresh!\n")); + DEBUG(SSSDBG_TRACE_FUNC, "USN value is unknown, " + "waiting for full refresh!\n"); ret = EINVAL; goto immediately; } @@ -896,8 +896,8 @@ static struct tevent_req *sdap_sudo_smart_refresh_send(TALLOC_CTX *mem_ctx, /* Do not remove any rules that are already in the sysdb * sysdb_filter = NULL; */ - DEBUG(SSSDBG_TRACE_FUNC, ("Issuing a smart refresh of sudo rules " - "(USN > %s)\n", (usn == NULL ? "0" : usn))); + DEBUG(SSSDBG_TRACE_FUNC, "Issuing a smart refresh of sudo rules " + "(USN > %s)\n", (usn == NULL ? "0" : usn)); subreq = sdap_sudo_refresh_send(state, id_ctx->be, id_ctx->opts, id_ctx->conn->conn_cache, @@ -945,7 +945,7 @@ static void sdap_sudo_smart_refresh_done(struct tevent_req *subreq) goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Successful smart refresh of sudo rules\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Successful smart refresh of sudo rules\n"); /* set highest usn */ if (highest_usn != NULL) { @@ -999,8 +999,8 @@ static void sdap_sudo_full_refresh_online_cb(void *pvt) SDAP_SUDO_FULL_REFRESH_INTERVAL); if (timeout == 0) { /* runtime configuration change? */ - DEBUG(SSSDBG_TRACE_FUNC, ("Periodical full refresh of sudo rules " - "is disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Periodical full refresh of sudo rules " + "is disabled\n"); return; } @@ -1009,8 +1009,8 @@ static void sdap_sudo_full_refresh_online_cb(void *pvt) sdap_sudo_periodical_first_refresh_done, 0, timeout, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to schedule full refresh of sudo " - "rules! Periodical updates will not work!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to schedule full refresh of sudo " + "rules! Periodical updates will not work!\n"); } } @@ -1027,21 +1027,21 @@ static void sdap_sudo_periodical_first_refresh_done(struct tevent_req *req) ret = sdap_sudo_timer_recv(req, req, &subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Sudo timer failed [%d]: %s\n", ret, strerror(ret))); + "Sudo timer failed [%d]: %s\n", ret, strerror(ret)); goto schedule; } ret = sdap_sudo_full_refresh_recv(subreq, &dp_error, &error); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical full refresh of sudo rules " - "failed [%d]: %s)\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Periodical full refresh of sudo rules " + "failed [%d]: %s)\n", ret, strerror(ret)); goto schedule; } if (dp_error != DP_ERR_OK || error != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical full refresh of sudo rules " + DEBUG(SSSDBG_OP_FAILURE, "Periodical full refresh of sudo rules " "failed [dp_error: %d] ([%d]: %s)\n", - dp_error, error, strerror(error))); + dp_error, error, strerror(error)); goto schedule; } @@ -1057,8 +1057,8 @@ schedule: SDAP_SUDO_FULL_REFRESH_INTERVAL); if (delay == 0) { /* runtime configuration change? */ - DEBUG(SSSDBG_TRACE_FUNC, ("Periodical full refresh of sudo rules " - "is disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Periodical full refresh of sudo rules " + "is disabled\n"); return; } @@ -1071,8 +1071,8 @@ schedule: delay = SUDO_MAX_FIRST_REFRESH_DELAY; } - DEBUG(SSSDBG_TRACE_FUNC, ("Data provider is offline. " - "Scheduling another full refresh in %ld minutes.\n", delay)); + DEBUG(SSSDBG_TRACE_FUNC, "Data provider is offline. " + "Scheduling another full refresh in %ld minutes.\n", delay); ret = sdap_sudo_schedule_refresh(sudo_ctx, sudo_ctx, SDAP_SUDO_REFRESH_FULL, @@ -1080,8 +1080,8 @@ schedule: delay * 60, timeout, &sudo_ctx->first_refresh_timer); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to schedule full refresh of sudo " - "rules! Periodical updates will not work!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to schedule full refresh of sudo " + "rules! Periodical updates will not work!\n"); } /* also setup online callback to make sure the refresh is fired as soon @@ -1090,7 +1090,7 @@ schedule: sdap_sudo_full_refresh_online_cb, sudo_ctx, &sudo_ctx->first_refresh_online_cb); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set up online callback\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not set up online callback\n"); } return; @@ -1098,7 +1098,7 @@ schedule: ret = sdap_sudo_schedule_full_refresh(sudo_ctx, delay); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Full periodical refresh will not work.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Full periodical refresh will not work.\n"); } /* smart refresh */ @@ -1106,14 +1106,14 @@ schedule: SDAP_SUDO_SMART_REFRESH_INTERVAL); if (delay == 0) { /* runtime configuration change? */ - DEBUG(SSSDBG_TRACE_FUNC, ("Periodical smart refresh of sudo rules " - "is disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Periodical smart refresh of sudo rules " + "is disabled\n"); return; } ret = sdap_sudo_schedule_smart_refresh(sudo_ctx, delay); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Smart periodical refresh will not work.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Smart periodical refresh will not work.\n"); } } @@ -1129,21 +1129,21 @@ static void sdap_sudo_periodical_full_refresh_done(struct tevent_req *req) ret = sdap_sudo_timer_recv(req, req, &subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Sudo timer failed [%d]: %s\n", ret, strerror(ret))); + "Sudo timer failed [%d]: %s\n", ret, strerror(ret)); goto schedule; } ret = sdap_sudo_full_refresh_recv(subreq, &dp_error, &error); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical full refresh of sudo rules " - "failed [%d]: %s)\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Periodical full refresh of sudo rules " + "failed [%d]: %s)\n", ret, strerror(ret)); goto schedule; } if (dp_error != DP_ERR_OK || error != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical full refresh of sudo rules " + DEBUG(SSSDBG_OP_FAILURE, "Periodical full refresh of sudo rules " "failed [dp_error: %d] ([%d]: %s)\n", - dp_error, error, strerror(error))); + dp_error, error, strerror(error)); goto schedule; } @@ -1155,14 +1155,14 @@ schedule: SDAP_SUDO_FULL_REFRESH_INTERVAL); if (delay == 0) { /* runtime configuration change? */ - DEBUG(SSSDBG_TRACE_FUNC, ("Periodical full refresh of sudo rules " - "is disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Periodical full refresh of sudo rules " + "is disabled\n"); return; } ret = sdap_sudo_schedule_full_refresh(sudo_ctx, delay); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Full periodical refresh will not work.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Full periodical refresh will not work.\n"); } } @@ -1178,20 +1178,20 @@ static void sdap_sudo_periodical_smart_refresh_done(struct tevent_req *req) ret = sdap_sudo_timer_recv(req, req, &subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Sudo timer failed [%d]: %s\n", ret, strerror(ret))); + "Sudo timer failed [%d]: %s\n", ret, strerror(ret)); goto schedule; } ret = sdap_sudo_smart_refresh_recv(subreq, &dp_error, &error); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical smart refresh of sudo rules " - "failed [%d]: %s\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Periodical smart refresh of sudo rules " + "failed [%d]: %s\n", ret, strerror(ret)); } if (dp_error != DP_ERR_OK || error != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Periodical smart refresh of sudo rules " + DEBUG(SSSDBG_OP_FAILURE, "Periodical smart refresh of sudo rules " "failed [dp_error: %d] ([%d]: %s)\n", - dp_error, error, strerror(error))); + dp_error, error, strerror(error)); goto schedule; } @@ -1203,14 +1203,14 @@ schedule: SDAP_SUDO_SMART_REFRESH_INTERVAL); if (delay == 0) { /* runtime configuration change? */ - DEBUG(SSSDBG_TRACE_FUNC, ("Periodical smart refresh of sudo rules " - "is disabled\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Periodical smart refresh of sudo rules " + "is disabled\n"); return; } ret = sdap_sudo_schedule_smart_refresh(sudo_ctx, delay); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Smart periodical refresh will not work.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Smart periodical refresh will not work.\n"); } } @@ -1239,10 +1239,10 @@ static int sdap_sudo_schedule_refresh(TALLOC_CTX *mem_ctx, name = "Smart refresh"; break; case SDAP_SUDO_REFRESH_RULES: - DEBUG(SSSDBG_OP_FAILURE, ("Rules refresh can't be scheduled!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Rules refresh can't be scheduled!\n"); return EINVAL; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unknown refresh type [%d].\n", refresh)); + DEBUG(SSSDBG_CRIT_FAILURE, "Unknown refresh type [%d].\n", refresh); return EINVAL; } @@ -1256,8 +1256,8 @@ static int sdap_sudo_schedule_refresh(TALLOC_CTX *mem_ctx, tevent_req_set_callback(req, callback, sudo_ctx); - DEBUG(SSSDBG_TRACE_FUNC, ("%s scheduled at: %lld\n", - name, (long long)when.tv_sec)); + DEBUG(SSSDBG_TRACE_FUNC, "%s scheduled at: %lld\n", + name, (long long)when.tv_sec); if (_req != NULL) { *_req = req; @@ -1276,8 +1276,8 @@ static int sdap_sudo_schedule_full_refresh(struct sdap_sudo_ctx *sudo_ctx, sdap_sudo_periodical_full_refresh_done, delay, delay, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to schedule full refresh of sudo " - "rules!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to schedule full refresh of sudo " + "rules!\n"); return ret; } @@ -1294,8 +1294,8 @@ static int sdap_sudo_schedule_smart_refresh(struct sdap_sudo_ctx *sudo_ctx, sdap_sudo_periodical_smart_refresh_done, delay, delay, NULL); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Unable to schedule smart refresh of sudo " - "rules!\n")); + DEBUG(SSSDBG_OP_FAILURE, "Unable to schedule smart refresh of sudo " + "rules!\n"); return ret; } diff --git a/src/providers/ldap/sdap_sudo_cache.c b/src/providers/ldap/sdap_sudo_cache.c index de4f65c41..7390d852e 100644 --- a/src/providers/ldap/sdap_sudo_cache.c +++ b/src/providers/ldap/sdap_sudo_cache.c @@ -41,7 +41,7 @@ static errno_t sdap_sudo_get_usn(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(attrs, map[SDAP_AT_SUDO_USN].sys_name, &usn); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to retrieve USN value: [%s]\n", strerror(ret))); + "Failed to retrieve USN value: [%s]\n", strerror(ret)); return ret; } @@ -70,33 +70,33 @@ sdap_save_native_sudorule(TALLOC_CTX *mem_ctx, ret = sysdb_attrs_get_string(attrs, map[SDAP_AT_SUDO_NAME].sys_name, &rule_name); if (ret == ERANGE) { - DEBUG(SSSDBG_OP_FAILURE, ("Warning: found rule that contains none " - "or multiple CN values. It will be skipped.\n")); + DEBUG(SSSDBG_OP_FAILURE, "Warning: found rule that contains none " + "or multiple CN values. It will be skipped.\n"); return ret; } else if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not get rule name [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not get rule name [%d]: %s\n", + ret, strerror(ret)); return ret; } ret = sysdb_attrs_add_time_t(attrs, SYSDB_CACHE_EXPIRE, (cache_timeout ? (now + cache_timeout) : 0)); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not set sysdb cache expire [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not set sysdb cache expire [%d]: %s\n", + ret, strerror(ret)); return ret; } ret = sdap_sudo_get_usn(mem_ctx, attrs, map, rule_name, _usn); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Could not read USN from %s\n", rule_name)); + DEBUG(SSSDBG_MINOR_FAILURE, "Could not read USN from %s\n", rule_name); *_usn = NULL; /* but we will store the rule anyway */ } ret = sysdb_save_sudorule(sysdb_ctx, domain, rule_name, attrs); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not save sudorule %s\n", rule_name)); + DEBUG(SSSDBG_OP_FAILURE, "Could not save sudorule %s\n", rule_name); return ret; } @@ -123,13 +123,13 @@ sdap_save_native_sudorule_list(TALLOC_CTX *mem_ctx, tmp_ctx = talloc_new(NULL); if (tmp_ctx == NULL) { - DEBUG(SSSDBG_FATAL_FAILURE, ("talloc_new() failed\n")); + DEBUG(SSSDBG_FATAL_FAILURE, "talloc_new() failed\n"); return ENOMEM; } ret = sysdb_transaction_start(sysdb_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not start transaction\n"); goto fail; } in_transaction = true; @@ -140,8 +140,8 @@ sdap_save_native_sudorule_list(TALLOC_CTX *mem_ctx, domain, map, replies[i], cache_timeout, now, &usn_value); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to save sudo rule, " - "will continue with next...\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to save sudo rule, " + "will continue with next...\n"); continue; } @@ -163,7 +163,7 @@ sdap_save_native_sudorule_list(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_commit(sysdb_ctx); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -177,7 +177,7 @@ fail: if (in_transaction) { tret = sysdb_transaction_cancel(sysdb_ctx); if (tret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Could not cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Could not cancel transaction\n"); } } diff --git a/src/providers/proxy/proxy_auth.c b/src/providers/proxy/proxy_auth.c index 61fec63aa..2e9d452bc 100644 --- a/src/providers/proxy/proxy_auth.c +++ b/src/providers/proxy/proxy_auth.c @@ -64,7 +64,7 @@ void proxy_pam_handler(struct be_req *req) be_req_terminate(req, DP_ERR_OK, EOK, NULL); return; default: - DEBUG(1, ("Unsupported PAM task.\n")); + DEBUG(1, "Unsupported PAM task.\n"); pd->pam_status = PAM_MODULE_UNKNOWN; be_req_terminate(req, DP_ERR_OK, EINVAL, "Unsupported PAM task"); return; @@ -102,13 +102,13 @@ static int proxy_child_destructor(TALLOC_CTX *ctx) hash_key_t key; int hret; - DEBUG(8, ("Removing proxy child id [%d]\n", child_ctx->id)); + DEBUG(8, "Removing proxy child id [%d]\n", child_ctx->id); key.type = HASH_KEY_ULONG; key.ul = child_ctx->id; hret = hash_delete(child_ctx->auth_ctx->request_table, &key); if (!(hret == HASH_SUCCESS || hret == HASH_ERROR_KEY_NOT_FOUND)) { - DEBUG(1, ("Hash error [%d][%s]\n", hret, hash_error_string(hret))); + DEBUG(1, "Hash error [%d][%s]\n", hret, hash_error_string(hret)); /* Nothing we can do about this, so just continue */ } return 0; @@ -132,7 +132,7 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct proxy_child_ctx); if (req == NULL) { - DEBUG(1, ("Could not send PAM request to child\n")); + DEBUG(1, "Could not send PAM request to child\n"); return NULL; } @@ -156,7 +156,7 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx, if (auth_ctx->next_id == first) { /* We've looped through all possible integers! */ - DEBUG(0, ("Serious error: queue is too long!\n")); + DEBUG(0, "Serious error: queue is too long!\n"); talloc_zfree(req); return NULL; } @@ -167,11 +167,11 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx, value.type = HASH_VALUE_PTR; value.ptr = req; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Queueing request [%lu]\n", key.ul)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Queueing request [%lu]\n", key.ul); hret = hash_enter(auth_ctx->request_table, &key, &value); if (hret != HASH_SUCCESS) { - DEBUG(1, ("Could not add request to the queue\n")); + DEBUG(1, "Could not add request to the queue\n"); talloc_zfree(req); return NULL; } @@ -187,7 +187,7 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx, auth_ctx->running++; subreq = proxy_child_init_send(auth_ctx, state, auth_ctx); if (!subreq) { - DEBUG(1, ("Could not fork child process\n")); + DEBUG(1, "Could not fork child process\n"); auth_ctx->running--; talloc_zfree(req); return NULL; @@ -200,7 +200,7 @@ static struct tevent_req *proxy_child_send(TALLOC_CTX *mem_ctx, /* If there was no available slot, it will be queued * until a slot is available */ - DEBUG(8, ("All available child slots are full, queuing request\n")); + DEBUG(8, "All available child slots are full, queuing request\n"); } return req; } @@ -234,7 +234,7 @@ static struct tevent_req *proxy_child_init_send(TALLOC_CTX *mem_ctx, req = tevent_req_create(mem_ctx, &state, struct pc_init_ctx); if (req == NULL) { - DEBUG(1, ("Could not create tevent_req\n")); + DEBUG(1, "Could not create tevent_req\n"); return NULL; } @@ -248,16 +248,16 @@ static struct tevent_req *proxy_child_init_send(TALLOC_CTX *mem_ctx, auth_ctx->be->domain->name, child_ctx->id); if (state->command == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return NULL; } - DEBUG(7, ("Starting proxy child with args [%s]\n", state->command)); + DEBUG(7, "Starting proxy child with args [%s]\n", state->command); pid = fork(); if (pid < 0) { ret = errno; - DEBUG(1, ("fork failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "fork failed [%d][%s].\n", ret, strerror(ret)); talloc_zfree(req); return NULL; } @@ -267,8 +267,8 @@ static struct tevent_req *proxy_child_init_send(TALLOC_CTX *mem_ctx, execvp(proxy_child_args[0], proxy_child_args); ret = errno; - DEBUG(0, ("Could not start proxy child [%s]: [%d][%s].\n", - state->command, ret, strerror(ret))); + DEBUG(0, "Could not start proxy child [%s]: [%d][%s].\n", + state->command, ret, strerror(ret)); _exit(1); } @@ -282,7 +282,7 @@ static struct tevent_req *proxy_child_init_send(TALLOC_CTX *mem_ctx, SIGCHLD, SA_SIGINFO, pc_init_sig_handler, req); if (state->sige == NULL) { - DEBUG(1, ("tevent_add_signal failed.\n")); + DEBUG(1, "tevent_add_signal failed.\n"); talloc_zfree(req); return NULL; } @@ -322,42 +322,42 @@ static void pc_init_sig_handler(struct tevent_context *ev, struct pc_init_ctx *init_ctx; if (count <= 0) { - DEBUG(0, ("SIGCHLD handler called with invalid child count\n")); + DEBUG(0, "SIGCHLD handler called with invalid child count\n"); return; } req = talloc_get_type(pvt, struct tevent_req); init_ctx = tevent_req_data(req, struct pc_init_ctx); - DEBUG(7, ("Waiting for child [%d].\n", init_ctx->pid)); + DEBUG(7, "Waiting for child [%d].\n", init_ctx->pid); errno = 0; ret = waitpid(init_ctx->pid, &child_status, WNOHANG); if (ret == -1) { ret = errno; - DEBUG(1, ("waitpid failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "waitpid failed [%d][%s].\n", ret, strerror(ret)); } else if (ret == 0) { - DEBUG(1, ("waitpid did not find a child with changed status.\n")); + DEBUG(1, "waitpid did not find a child with changed status.\n"); } else { if (WIFEXITED(child_status)) { - DEBUG(4, ("child [%d] exited with status [%d].\n", ret, - WEXITSTATUS(child_status))); + DEBUG(4, "child [%d] exited with status [%d].\n", ret, + WEXITSTATUS(child_status)); tevent_req_error(req, EIO); } else if (WIFSIGNALED(child_status)) { - DEBUG(4, ("child [%d] was terminate by signal [%d].\n", ret, - WTERMSIG(child_status))); + DEBUG(4, "child [%d] was terminate by signal [%d].\n", ret, + WTERMSIG(child_status)); tevent_req_error(req, EIO); } else { if (WIFSTOPPED(child_status)) { - DEBUG(1, ("child [%d] was stopped by signal [%d].\n", ret, - WSTOPSIG(child_status))); + DEBUG(1, "child [%d] was stopped by signal [%d].\n", ret, + WSTOPSIG(child_status)); } if (WIFCONTINUED(child_status)) { - DEBUG(1, ("child [%d] was resumed by delivery of SIGCONT.\n", - ret)); + DEBUG(1, "child [%d] was resumed by delivery of SIGCONT.\n", + ret); } - DEBUG(1, ("Child is still running, no new child is started.\n")); + DEBUG(1, "Child is still running, no new child is started.\n"); return; } } @@ -369,7 +369,7 @@ static void pc_init_timeout(struct tevent_context *ev, { struct tevent_req *req; - DEBUG(2, ("Client timed out before Identification!\n")); + DEBUG(2, "Client timed out before Identification!\n"); req = talloc_get_type(ptr, struct tevent_req); tevent_req_error(req, ETIMEDOUT); } @@ -421,7 +421,7 @@ static void proxy_child_init_done(struct tevent_req *subreq) { ret = proxy_child_init_recv(subreq, &child_ctx->pid, &child_ctx->conn); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(6, ("Proxy child init failed [%d]\n", ret)); + DEBUG(6, "Proxy child init failed [%d]\n", ret); tevent_req_error(req, ret); return; } @@ -431,7 +431,7 @@ static void proxy_child_init_done(struct tevent_req *subreq) { child_ctx->conn, child_ctx->pd, child_ctx->pid); if (!subreq) { - DEBUG(1,("Could not start PAM conversation\n")); + DEBUG(1,"Could not start PAM conversation\n"); tevent_req_error(req, EIO); return; } @@ -443,7 +443,7 @@ static void proxy_child_init_done(struct tevent_req *subreq) { */ sig_ctx = talloc_zero(child_ctx->auth_ctx, struct proxy_child_sig_ctx); if(sig_ctx == NULL) { - DEBUG(1, ("tevent_add_signal failed.\n")); + DEBUG(1, "tevent_add_signal failed.\n"); tevent_req_error(req, ENOMEM); return; } @@ -456,7 +456,7 @@ static void proxy_child_init_done(struct tevent_req *subreq) { proxy_child_sig_handler, sig_ctx); if (sige == NULL) { - DEBUG(1, ("tevent_add_signal failed.\n")); + DEBUG(1, "tevent_add_signal failed.\n"); tevent_req_error(req, ENOMEM); return; } @@ -485,44 +485,44 @@ static void proxy_child_sig_handler(struct tevent_context *ev, struct tevent_immediate *imm2; if (count <= 0) { - DEBUG(0, ("SIGCHLD handler called with invalid child count\n")); + DEBUG(0, "SIGCHLD handler called with invalid child count\n"); return; } sig_ctx = talloc_get_type(pvt, struct proxy_child_sig_ctx); - DEBUG(7, ("Waiting for child [%d].\n", sig_ctx->pid)); + DEBUG(7, "Waiting for child [%d].\n", sig_ctx->pid); errno = 0; ret = waitpid(sig_ctx->pid, &child_status, WNOHANG); if (ret == -1) { ret = errno; - DEBUG(1, ("waitpid failed [%d][%s].\n", ret, strerror(ret))); + DEBUG(1, "waitpid failed [%d][%s].\n", ret, strerror(ret)); } else if (ret == 0) { - DEBUG(1, ("waitpid did not found a child with changed status.\n")); + DEBUG(1, "waitpid did not found a child with changed status.\n"); } else { if (WIFEXITED(child_status)) { - DEBUG(4, ("child [%d] exited with status [%d].\n", ret, - WEXITSTATUS(child_status))); + DEBUG(4, "child [%d] exited with status [%d].\n", ret, + WEXITSTATUS(child_status)); } else if (WIFSIGNALED(child_status)) { - DEBUG(4, ("child [%d] was terminated by signal [%d].\n", ret, - WTERMSIG(child_status))); + DEBUG(4, "child [%d] was terminated by signal [%d].\n", ret, + WTERMSIG(child_status)); } else { if (WIFSTOPPED(child_status)) { - DEBUG(1, ("child [%d] was stopped by signal [%d].\n", ret, - WSTOPSIG(child_status))); + DEBUG(1, "child [%d] was stopped by signal [%d].\n", ret, + WSTOPSIG(child_status)); } if (WIFCONTINUED(child_status)) { - DEBUG(1, ("child [%d] was resumed by delivery of SIGCONT.\n", - ret)); + DEBUG(1, "child [%d] was resumed by delivery of SIGCONT.\n", + ret); } - DEBUG(1, ("Child is still running, no new child is started.\n")); + DEBUG(1, "Child is still running, no new child is started.\n"); return; } imm = tevent_create_immediate(ev); if (imm == NULL) { - DEBUG(1, ("tevent_create_immediate failed.\n")); + DEBUG(1, "tevent_create_immediate failed.\n"); return; } @@ -532,7 +532,7 @@ static void proxy_child_sig_handler(struct tevent_context *ev, /* schedule another immediate timer to delete the sigchld handler */ imm2 = tevent_create_immediate(ev); if (imm2 == NULL) { - DEBUG(1, ("tevent_create_immediate failed.\n")); + DEBUG(1, "tevent_create_immediate failed.\n"); return; } @@ -583,17 +583,17 @@ static struct tevent_req *proxy_pam_conv_send(TALLOC_CTX *mem_ctx, DP_INTERFACE, DP_METHOD_PAMHANDLER); if (msg == NULL) { - DEBUG(1, ("dbus_message_new_method_call failed.\n")); + DEBUG(1, "dbus_message_new_method_call failed.\n"); talloc_zfree(req); return NULL; } - DEBUG(4, ("Sending request with the following data:\n")); + DEBUG(4, "Sending request with the following data:\n"); DEBUG_PAM_DATA(4, pd); dp_ret = dp_pack_pam_request(msg, pd); if (!dp_ret) { - DEBUG(1, ("Failed to build message\n")); + DEBUG(1, "Failed to build message\n"); dbus_message_unref(msg); talloc_zfree(req); return NULL; @@ -620,7 +620,7 @@ static void proxy_pam_conv_reply(DBusPendingCall *pending, void *ptr) int type; int ret; - DEBUG(8, ("Handling pam conversation reply\n")); + DEBUG(8, "Handling pam conversation reply\n"); req = talloc_get_type(ptr, struct tevent_req); state = tevent_req_data(req, struct proxy_conv_ctx); @@ -630,8 +630,8 @@ static void proxy_pam_conv_reply(DBusPendingCall *pending, void *ptr) reply = dbus_pending_call_steal_reply(pending); dbus_pending_call_unref(pending); if (reply == NULL) { - DEBUG(0, ("Severe error. A reply callback was called but no reply was" - "received and no timeout occurred\n")); + DEBUG(0, "Severe error. A reply callback was called but no reply was" + "received and no timeout occurred\n"); state->pd->pam_status = PAM_SYSTEM_ERR; tevent_req_error(req, EIO); } @@ -641,23 +641,23 @@ static void proxy_pam_conv_reply(DBusPendingCall *pending, void *ptr) case DBUS_MESSAGE_TYPE_METHOD_RETURN: ret = dp_unpack_pam_response(reply, state->pd, &dbus_error); if (!ret) { - DEBUG(0, ("Failed to parse reply.\n")); + DEBUG(0, "Failed to parse reply.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; dbus_message_unref(reply); tevent_req_error(req, EIO); return; } - DEBUG(4, ("received: [%d][%s]\n", + DEBUG(4, "received: [%d][%s]\n", state->pd->pam_status, - state->pd->domain)); + state->pd->domain); break; case DBUS_MESSAGE_TYPE_ERROR: - DEBUG(0, ("Reply error [%s].\n", - dbus_message_get_error_name(reply))); + DEBUG(0, "Reply error [%s].\n", + dbus_message_get_error_name(reply)); state->pd->pam_status = PAM_SYSTEM_ERR; break; default: - DEBUG(0, ("Default... what now?.\n")); + DEBUG(0, "Default... what now?.\n"); state->pd->pam_status = PAM_SYSTEM_ERR; } dbus_message_unref(reply); @@ -686,7 +686,7 @@ static void proxy_pam_conv_done(struct tevent_req *subreq) ret = proxy_pam_conv_recv(subreq); talloc_zfree(subreq); if (ret != EOK) { - DEBUG(6, ("Proxy PAM conversation failed [%d]\n", ret)); + DEBUG(6, "Proxy PAM conversation failed [%d]\n", ret); tevent_req_error(req, ret); return; } @@ -725,7 +725,7 @@ static void proxy_child_done(struct tevent_req *req) client_ctx->auth_ctx->running--; imm = tevent_create_immediate(be_ctx->ev); if (imm == NULL) { - DEBUG(1, ("tevent_create_immediate failed.\n")); + DEBUG(1, "tevent_create_immediate failed.\n"); /* We'll still finish the current request, but we're * likely to have problems if there are queued events * if we've gotten into this state. @@ -753,7 +753,7 @@ static void proxy_child_done(struct tevent_req *req) ret = sss_authtok_get_password(pd->authtok, &password, NULL); if (ret) { /* password caching failures are not fatal errors */ - DEBUG(2, ("Failed to cache password\n")); + DEBUG(2, "Failed to cache password\n"); goto done; } @@ -763,8 +763,8 @@ static void proxy_child_done(struct tevent_req *req) /* password caching failures are not fatal errors */ /* so we just log it any return */ if (ret != EOK) { - DEBUG(2, ("Failed to cache password (%d)[%s]!?\n", - ret, strerror(ret))); + DEBUG(2, "Failed to cache password (%d)[%s]!?\n", + ret, strerror(ret)); } } @@ -808,7 +808,7 @@ static void run_proxy_child_queue(struct tevent_context *ev, auth_ctx->running++; subreq = proxy_child_init_send(auth_ctx, state, auth_ctx); if (!subreq) { - DEBUG(1, ("Could not fork child process\n")); + DEBUG(1, "Could not fork child process\n"); auth_ctx->running--; talloc_zfree(req); return; diff --git a/src/providers/proxy/proxy_child.c b/src/providers/proxy/proxy_child.c index 66afcfb64..09a3b4b3b 100644 --- a/src/providers/proxy/proxy_child.c +++ b/src/providers/proxy/proxy_child.c @@ -95,7 +95,7 @@ static int proxy_internal_conv(int num_msg, const struct pam_message **msgm, for (i=0; i < num_msg; i++) { switch( msgm[i]->msg_style ) { case PAM_PROMPT_ECHO_OFF: - DEBUG(4, ("Conversation message: [%s]\n", msgm[i]->msg)); + DEBUG(4, "Conversation message: [%s]\n", msgm[i]->msg); reply[i].resp_retcode = 0; ret = sss_authtok_get_password(auth_data->authtok, @@ -107,8 +107,8 @@ static int proxy_internal_conv(int num_msg, const struct pam_message **msgm, break; default: - DEBUG(1, ("Conversation style %d not supported.\n", - msgm[i]->msg_style)); + DEBUG(1, "Conversation style %d not supported.\n", + msgm[i]->msg_style); goto failed; } } @@ -144,7 +144,7 @@ static int proxy_chauthtok_conv(int num_msg, const struct pam_message **msgm, for (i=0; i < num_msg; i++) { switch( msgm[i]->msg_style ) { case PAM_PROMPT_ECHO_OFF: - DEBUG(4, ("Conversation message: [%s]\n", msgm[i]->msg)); + DEBUG(4, "Conversation message: [%s]\n", msgm[i]->msg); reply[i].resp_retcode = 0; if (!auth_data->sent_old) { @@ -170,8 +170,8 @@ static int proxy_chauthtok_conv(int num_msg, const struct pam_message **msgm, break; default: - DEBUG(1, ("Conversation style %d not supported.\n", - msgm[i]->msg_style)); + DEBUG(1, "Conversation style %d not supported.\n", + msgm[i]->msg_style); goto failed; } } @@ -202,18 +202,18 @@ static errno_t call_pam_stack(const char *pam_target, struct pam_data *pd) } auth_data = talloc_zero(pd, struct authtok_conv); if (auth_data == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } auth_data->authtok = sss_authtok_new(auth_data); if (auth_data->authtok == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sss_authtok_new failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sss_authtok_new failed.\n"); ret = ENOMEM; goto fail; } auth_data->newauthtok = sss_authtok_new(auth_data); if (auth_data->newauthtok == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sss_authtok_new failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sss_authtok_new failed.\n"); ret = ENOMEM; goto fail; } @@ -222,22 +222,22 @@ static errno_t call_pam_stack(const char *pam_target, struct pam_data *pd) ret = pam_start(pam_target, pd->user, &conv, &pamh); if (ret == PAM_SUCCESS) { - DEBUG(7, ("Pam transaction started with service name [%s].\n", - pam_target)); + DEBUG(7, "Pam transaction started with service name [%s].\n", + pam_target); ret = pam_set_item(pamh, PAM_TTY, pd->tty); if (ret != PAM_SUCCESS) { - DEBUG(1, ("Setting PAM_TTY failed: %s.\n", - pam_strerror(pamh, ret))); + DEBUG(1, "Setting PAM_TTY failed: %s.\n", + pam_strerror(pamh, ret)); } ret = pam_set_item(pamh, PAM_RUSER, pd->ruser); if (ret != PAM_SUCCESS) { - DEBUG(1, ("Setting PAM_RUSER failed: %s.\n", - pam_strerror(pamh, ret))); + DEBUG(1, "Setting PAM_RUSER failed: %s.\n", + pam_strerror(pamh, ret)); } ret = pam_set_item(pamh, PAM_RHOST, pd->rhost); if (ret != PAM_SUCCESS) { - DEBUG(1, ("Setting PAM_RHOST failed: %s.\n", - pam_strerror(pamh, ret))); + DEBUG(1, "Setting PAM_RHOST failed: %s.\n", + pam_strerror(pamh, ret)); } switch (pd->cmd) { case SSS_PAM_AUTHENTICATE: @@ -275,21 +275,21 @@ static errno_t call_pam_stack(const char *pam_target, struct pam_data *pd) } break; default: - DEBUG(1, ("unknown PAM call\n")); + DEBUG(1, "unknown PAM call\n"); pam_status=PAM_ABORT; } - DEBUG(4, ("Pam result: [%d][%s]\n", pam_status, - pam_strerror(pamh, pam_status))); + DEBUG(4, "Pam result: [%d][%s]\n", pam_status, + pam_strerror(pamh, pam_status)); ret = pam_end(pamh, pam_status); if (ret != PAM_SUCCESS) { pamh=NULL; - DEBUG(1, ("Cannot terminate pam transaction.\n")); + DEBUG(1, "Cannot terminate pam transaction.\n"); } } else { - DEBUG(1, ("Failed to initialize pam transaction.\n")); + DEBUG(1, "Failed to initialize pam transaction.\n"); pam_status = PAM_SYSTEM_ERR; } @@ -323,8 +323,8 @@ static int pc_pam_handler(DBusMessage *message, struct sbus_connection *conn) reply = dbus_message_new_method_return(message); if (!reply) { - DEBUG(1, ("dbus_message_new_method_return failed, " - "cannot send reply.\n")); + DEBUG(1, "dbus_message_new_method_return failed, " + "cannot send reply.\n"); ret = ENOMEM; goto done; } @@ -333,7 +333,7 @@ static int pc_pam_handler(DBusMessage *message, struct sbus_connection *conn) ret = dp_unpack_pam_request(message, pc_ctx, &pd, &dbus_error); if (!ret) { - DEBUG(1,("Failed, to parse message!\n")); + DEBUG(1,"Failed, to parse message!\n"); ret = EIO; goto done; } @@ -346,20 +346,20 @@ static int pc_pam_handler(DBusMessage *message, struct sbus_connection *conn) goto done; } - DEBUG(4, ("Got request with the following data\n")); + DEBUG(4, "Got request with the following data\n"); DEBUG_PAM_DATA(4, pd); ret = call_pam_stack(pc_ctx->pam_target, pd); if (ret != EOK) { - DEBUG(1, ("call_pam_stack failed.\n")); + DEBUG(1, "call_pam_stack failed.\n"); } - DEBUG(4, ("Sending result [%d][%s]\n", - pd->pam_status, pd->domain)); + DEBUG(4, "Sending result [%d][%s]\n", + pd->pam_status, pd->domain); ret = dp_pack_pam_response(reply, pd); if (!ret) { - DEBUG(1, ("Failed to generate dbus reply\n")); + DEBUG(1, "Failed to generate dbus reply\n"); talloc_free(pd); dbus_message_unref(reply); ret = EIO; @@ -391,7 +391,7 @@ static int proxy_cli_init(struct pc_ctx *ctx) PIPE_PATH, PROXY_CHILD_PIPE, ctx->domain->name); if (sbus_address == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } @@ -399,13 +399,13 @@ static int proxy_cli_init(struct pc_ctx *ctx) &pc_interface, &ctx->conn, NULL, ctx); if (ret != EOK) { - DEBUG(1, ("sbus_client_init failed.\n")); + DEBUG(1, "sbus_client_init failed.\n"); return ret; } ret = proxy_child_send_id(ctx->conn, DATA_PROVIDER_VERSION, ctx->id); if (ret != EOK) { - DEBUG(0, ("dp_common_send_id failed.\n")); + DEBUG(0, "dp_common_send_id failed.\n"); return ret; } @@ -426,19 +426,19 @@ int proxy_child_send_id(struct sbus_connection *conn, DP_INTERFACE, DP_METHOD_REGISTER); if (msg == NULL) { - DEBUG(0, ("Out of memory?!\n")); + DEBUG(0, "Out of memory?!\n"); return ENOMEM; } - DEBUG(SSSDBG_FUNC_DATA, ("Sending ID to Proxy Backend: (%d,%"PRIu32")\n", - version, id)); + DEBUG(SSSDBG_FUNC_DATA, "Sending ID to Proxy Backend: (%d,%"PRIu32")\n", + version, id); ret = dbus_message_append_args(msg, DBUS_TYPE_UINT16, &version, DBUS_TYPE_UINT32, &id, DBUS_TYPE_INVALID); if (!ret) { - DEBUG(1, ("Failed to build message\n")); + DEBUG(1, "Failed to build message\n"); return EIO; } @@ -457,7 +457,7 @@ int proxy_child_process_init(TALLOC_CTX *mem_ctx, const char *domain, ctx = talloc_zero(mem_ctx, struct pc_ctx); if (!ctx) { - DEBUG(0, ("fatal error initializing pc_ctx\n")); + DEBUG(0, "fatal error initializing pc_ctx\n"); return ENOMEM; } ctx->ev = ev; @@ -466,19 +466,19 @@ int proxy_child_process_init(TALLOC_CTX *mem_ctx, const char *domain, ctx->id = id; ctx->conf_path = talloc_asprintf(ctx, CONFDB_DOMAIN_PATH_TMPL, domain); if (!ctx->conf_path) { - DEBUG(0, ("Out of memory!?\n")); + DEBUG(0, "Out of memory!?\n"); return ENOMEM; } ret = confdb_get_domain(cdb, domain, &ctx->domain); if (ret != EOK) { - DEBUG(0, ("fatal error retrieving domain configuration\n")); + DEBUG(0, "fatal error retrieving domain configuration\n"); return ret; } ret = proxy_cli_init(ctx); if (ret != EOK) { - DEBUG(0, ("fatal error setting up server bus\n")); + DEBUG(0, "fatal error setting up server bus\n"); return ret; } @@ -551,43 +551,43 @@ int main(int argc, const char *argv[]) ret = server_setup(srv_name, 0, conf_entry, &main_ctx); if (ret != EOK) { - DEBUG(0, ("Could not set up mainloop [%d]\n", ret)); + DEBUG(0, "Could not set up mainloop [%d]\n", ret); return 2; } ret = unsetenv("_SSS_LOOPS"); if (ret != EOK) { - DEBUG(1, ("Failed to unset _SSS_LOOPS, " - "pam modules might not work as expected.\n")); + DEBUG(1, "Failed to unset _SSS_LOOPS, " + "pam modules might not work as expected.\n"); } ret = confdb_get_string(main_ctx->confdb_ctx, main_ctx, conf_entry, CONFDB_PROXY_PAM_TARGET, NULL, &pam_target); if (ret != EOK) { - DEBUG(0, ("Error reading from confdb (%d) [%s]\n", - ret, strerror(ret))); + DEBUG(0, "Error reading from confdb (%d) [%s]\n", + ret, strerror(ret)); return 4; } if (pam_target == NULL) { - DEBUG(1, ("Missing option proxy_pam_target.\n")); + DEBUG(1, "Missing option proxy_pam_target.\n"); return 4; } ret = die_if_parent_died(); if (ret != EOK) { /* This is not fatal, don't return */ - DEBUG(2, ("Could not set up to exit when parent process does\n")); + DEBUG(2, "Could not set up to exit when parent process does\n"); } ret = proxy_child_process_init(main_ctx, domain, main_ctx->event_ctx, main_ctx->confdb_ctx, pam_target, (uint32_t)id); if (ret != EOK) { - DEBUG(0, ("Could not initialize proxy child [%d].\n", ret)); + DEBUG(0, "Could not initialize proxy child [%d].\n", ret); return 3; } - DEBUG(1, ("Proxy child for domain [%s] started!\n", domain)); + DEBUG(1, "Proxy child for domain [%s] started!\n", domain); /* loop on main */ server_loop(main_ctx); diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 2c01aad5a..26777fae8 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -60,7 +60,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, struct ldb_result *cached_pwd = NULL; const char *real_name = NULL; - DEBUG(SSSDBG_TRACE_FUNC, ("Searching user by name (%s)\n", name)); + DEBUG(SSSDBG_TRACE_FUNC, "Searching user by name (%s)\n", name); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -86,7 +86,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, ret = handle_getpw_result(status, pwd, dom, &del_user); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("getpwnam failed [%d]: %s\n", ret, strerror(ret))); + "getpwnam failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -103,15 +103,15 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ - DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_TRACE_FUNC, "Request to cache failed [%d]: %s\n", + ret, strerror(ret)); } if (ret == EOK && cached_pwd->count == 1) { real_name = ldb_msg_find_attr_as_string(cached_pwd->msgs[0], SYSDB_NAME, NULL); if (!real_name) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Cached user has no name?\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Cached user has no name?\n"); } } } @@ -123,7 +123,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, ret = handle_getpw_result(status, pwd, dom, &del_user); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("getpwuid failed [%d]: %s\n", ret, strerror(ret))); + "getpwuid failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -143,8 +143,8 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("proxy -> getpwnam_r failed for '%s' <%d>: %s\n", - name, ret, strerror(ret))); + "proxy -> getpwnam_r failed for '%s' <%d>: %s\n", + name, ret, strerror(ret)); } return ret; } @@ -163,14 +163,14 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd, switch (status) { case NSS_STATUS_NOTFOUND: - DEBUG(SSSDBG_MINOR_FAILURE, ("User not found.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "User not found.\n"); *del_user = true; break; case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_FUNC, ("User found: (%s, %"SPRIuid", %"SPRIgid")\n", - pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); + DEBUG(SSSDBG_TRACE_FUNC, "User found: (%s, %"SPRIuid", %"SPRIgid")\n", + pwd->pw_name, pwd->pw_uid, pwd->pw_gid); /* uid=0 or gid=0 are invalid values */ /* also check that the id is in the valid range for this domain */ @@ -178,7 +178,7 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd, OUT_OF_ID_RANGE(pwd->pw_gid, dom->id_min, dom->id_max)) { DEBUG(SSSDBG_MINOR_FAILURE, - ("User filtered out! (id out of range)\n")); + "User filtered out! (id out of range)\n"); *del_user = true; break; } @@ -186,12 +186,12 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd, case NSS_STATUS_UNAVAIL: DEBUG(SSSDBG_MINOR_FAILURE, - ("Remote back end is not available. Entering offline mode\n")); + "Remote back end is not available. Entering offline mode\n"); ret = ENXIO; break; default: - DEBUG(SSSDBG_OP_FAILURE, ("Unknown return code %d\n", status)); + DEBUG(SSSDBG_OP_FAILURE, "Unknown return code %d\n", status); ret = EIO; break; } @@ -207,8 +207,8 @@ delete_user(struct sysdb_ctx *sysdb, int ret = EOK; DEBUG(SSSDBG_TRACE_FUNC, - ("User %s does not exist (or is invalid) on remote server," - " deleting!\n", name)); + "User %s does not exist (or is invalid) on remote server," + " deleting!\n", name); ret = sysdb_delete_user(sysdb, domain, name, uid); if (ret == ENOENT) { ret = EOK; @@ -242,7 +242,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, if (lowercase || alias) { attrs = sysdb_new_attrs(NULL); if (!attrs) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Allocation error ?!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Allocation error ?!\n"); return ENOMEM; } } @@ -250,7 +250,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, if (lowercase) { ret = sysdb_attrs_add_lc_name_alias(attrs, pwd->pw_name); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add name alias\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add name alias\n"); talloc_zfree(attrs); return ret; } @@ -265,7 +265,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, ret = sysdb_attrs_add_string(attrs, SYSDB_NAME_ALIAS, cased_alias); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add name alias\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add name alias\n"); talloc_zfree(attrs); return ret; } @@ -286,7 +286,7 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, 0); talloc_zfree(attrs); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add user to cache\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add user to cache\n"); return ret; } @@ -309,7 +309,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx, bool del_user = false; int ret; - DEBUG(SSSDBG_TRACE_FUNC, ("Searching user by uid (%"SPRIuid")\n", uid)); + DEBUG(SSSDBG_TRACE_FUNC, "Searching user by uid (%"SPRIuid")\n", uid); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -333,7 +333,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx, ret = handle_getpw_result(status, pwd, dom, &del_user); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("getpwuid failed [%d]: %s\n", ret, strerror(ret))); + "getpwuid failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -349,8 +349,8 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_CRIT_FAILURE, - ("proxy -> getpwuid_r failed for '%"SPRIuid"' <%d>: %s\n", - uid, ret, strerror(ret))); + "proxy -> getpwuid_r failed for '%"SPRIuid"' <%d>: %s\n", + uid, ret, strerror(ret)); } return ret; } @@ -373,7 +373,7 @@ static int enum_users(TALLOC_CTX *mem_ctx, errno_t sret; bool again; - DEBUG(SSSDBG_TRACE_LIBS, ("Enumerating users\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Enumerating users\n"); tmpctx = talloc_new(mem_ctx); if (!tmpctx) { @@ -395,7 +395,7 @@ static int enum_users(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -436,11 +436,11 @@ static int enum_users(TALLOC_CTX *mem_ctx, case NSS_STATUS_NOTFOUND: /* we are done here */ - DEBUG(SSSDBG_TRACE_LIBS, ("Enumeration completed.\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Enumeration completed.\n"); ret = sysdb_transaction_commit(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; @@ -449,8 +449,8 @@ static int enum_users(TALLOC_CTX *mem_ctx, case NSS_STATUS_SUCCESS: DEBUG(SSSDBG_TRACE_LIBS, - ("User found (%s, %"SPRIuid", %"SPRIgid")\n", - pwd->pw_name, pwd->pw_uid, pwd->pw_gid)); + "User found (%s, %"SPRIuid", %"SPRIgid")\n", + pwd->pw_name, pwd->pw_uid, pwd->pw_gid); /* uid=0 or gid=0 are invalid values */ /* also check that the id is in the valid range for this domain @@ -458,8 +458,8 @@ static int enum_users(TALLOC_CTX *mem_ctx, if (OUT_OF_ID_RANGE(pwd->pw_uid, dom->id_min, dom->id_max) || OUT_OF_ID_RANGE(pwd->pw_gid, dom->id_min, dom->id_max)) { - DEBUG(SSSDBG_OP_FAILURE, ("User [%s] filtered out! (id out" - " of range)\n", pwd->pw_name)); + DEBUG(SSSDBG_OP_FAILURE, "User [%s] filtered out! (id out" + " of range)\n", pwd->pw_name); again = true; break; @@ -470,8 +470,8 @@ static int enum_users(TALLOC_CTX *mem_ctx, if (ret) { /* Do not fail completely on errors. * Just report the failure to save and go on */ - DEBUG(SSSDBG_OP_FAILURE, ("Failed to store user %s." - " Ignoring.\n", pwd->pw_name)); + DEBUG(SSSDBG_OP_FAILURE, "Failed to store user %s." + " Ignoring.\n", pwd->pw_name); } again = true; break; @@ -483,8 +483,8 @@ static int enum_users(TALLOC_CTX *mem_ctx, default: ret = EIO; - DEBUG(SSSDBG_OP_FAILURE, ("proxy -> getpwent_r failed (%d)[%s]" - "\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "proxy -> getpwent_r failed (%d)[%s]" + "\n", ret, strerror(ret)); break; } } while (again); @@ -494,7 +494,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } ctx->ops.endpwent(); @@ -506,16 +506,16 @@ done: do { \ if (DEBUG_IS_SET(debug_get_level(level))) { \ if (!grp->gr_mem || !grp->gr_mem[0]) { \ - DEBUG(level, ("Group %s has no members!\n", \ - grp->gr_name)); \ + DEBUG(level, "Group %s has no members!\n", \ + grp->gr_name); \ } else { \ int i = 0; \ while (grp->gr_mem[i]) { \ /* count */ \ i++; \ } \ - DEBUG(level, ("Group %s has %d members!\n", \ - grp->gr_name, i)); \ + DEBUG(level, "Group %s has %d members!\n", \ + grp->gr_name, i); \ } \ } \ } while(0) @@ -546,7 +546,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, ret = sysdb_transaction_start(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; @@ -554,7 +554,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, if (grp->gr_mem && grp->gr_mem[0]) { attrs = sysdb_new_attrs(tmp_ctx); if (!attrs) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Allocation error ?!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Allocation error ?!\n"); ret = ENOMEM; goto done; } @@ -563,14 +563,14 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, attrs, SYSDB_MEMBER, dom->name, (const char *const *)grp->gr_mem); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add group members\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add group members\n"); goto done; } /* Create ghost users */ ret = proxy_process_missing_users(sysdb, dom, attrs, grp, now); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add missing members\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add missing members\n"); goto done; } } @@ -579,7 +579,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, if (!attrs) { attrs = sysdb_new_attrs(tmp_ctx); if (!attrs) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Allocation error ?!\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Allocation error ?!\n"); ret = ENOMEM; goto done; } @@ -588,7 +588,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, if (dom->case_sensitive == false) { ret = sysdb_attrs_add_lc_name_alias(attrs, grp->gr_name); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add name alias\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add name alias\n"); ret = ENOMEM; goto done; } @@ -603,7 +603,7 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, ret = sysdb_attrs_add_string(attrs, SYSDB_NAME_ALIAS, cased_alias); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add name alias\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add name alias\n"); ret = ENOMEM; goto done; } @@ -617,15 +617,15 @@ static int save_group(struct sysdb_ctx *sysdb, struct sss_domain_info *dom, cache_timeout, now); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add group to cache\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add group to cache\n"); goto done; } ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not commit transaction: [%s]\n", - strerror(ret))); + "Could not commit transaction: [%s]\n", + strerror(ret)); goto done; } in_transaction = false; @@ -634,7 +634,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(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); @@ -663,28 +663,28 @@ static errno_t proxy_process_missing_users(struct sysdb_ctx *sysdb, if (ret == EOK) { /* Member already exists in the cache */ DEBUG(SSSDBG_TRACE_INTERNAL, - ("Member [%s] already cached\n", grp->gr_mem[i])); + "Member [%s] already cached\n", grp->gr_mem[i]); /* clean up */ talloc_zfree(msg); continue; } else if (ret == ENOENT) { /* No entry for this user. Create a ghost user */ DEBUG(SSSDBG_TRACE_LIBS, - ("Member [%s] not cached, creating ghost user entry\n", - grp->gr_mem[i])); + "Member [%s] not cached, creating ghost user entry\n", + grp->gr_mem[i]); ret = sysdb_attrs_add_string(group_attrs, SYSDB_GHOST, grp->gr_mem[i]); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot store ghost user entry: [%d]: %s\n", - ret, strerror(ret))); + "Cannot store ghost user entry: [%d]: %s\n", + ret, strerror(ret)); goto done; } } else { /* Unexpected error */ DEBUG(SSSDBG_MINOR_FAILURE, - ("Error searching cache for user [%s]: [%s]\n", - grp->gr_mem[i], strerror(ret))); + "Error searching cache for user [%s]: [%s]\n", + grp->gr_mem[i], strerror(ret)); goto done; } } @@ -728,23 +728,23 @@ handle_getgr_result(enum nss_status status, struct group *grp, { switch (status) { case NSS_STATUS_TRYAGAIN: - DEBUG(SSSDBG_MINOR_FAILURE, ("Buffer too small\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Buffer too small\n"); return EAGAIN; case NSS_STATUS_NOTFOUND: - DEBUG(SSSDBG_MINOR_FAILURE, ("Group not found.\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Group not found.\n"); *delete_group = true; break; case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_FUNC_DATA, ("Group found: (%s, %"SPRIgid")\n", - grp->gr_name, grp->gr_gid)); + DEBUG(SSSDBG_FUNC_DATA, "Group found: (%s, %"SPRIgid")\n", + grp->gr_name, grp->gr_gid); /* gid=0 is an invalid value */ /* also check that the id is in the valid range for this domain */ if (OUT_OF_ID_RANGE(grp->gr_gid, dom->id_min, dom->id_max)) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Group filtered out! (id out of range)\n")); + "Group filtered out! (id out of range)\n"); *delete_group = true; break; } @@ -752,11 +752,11 @@ handle_getgr_result(enum nss_status status, struct group *grp, case NSS_STATUS_UNAVAIL: DEBUG(SSSDBG_MINOR_FAILURE, - ("Remote back end is not available. Entering offline mode\n")); + "Remote back end is not available. Entering offline mode\n"); return ENXIO; default: - DEBUG(SSSDBG_OP_FAILURE, ("Unknown return code %d\n", status)); + DEBUG(SSSDBG_OP_FAILURE, "Unknown return code %d\n", status); return EIO; } @@ -780,7 +780,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, struct ldb_result *cached_grp = NULL; const char *real_name = NULL; - DEBUG(SSSDBG_FUNC_DATA, ("Searching group by name (%s)\n", name)); + DEBUG(SSSDBG_FUNC_DATA, "Searching group by name (%s)\n", name); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -791,8 +791,8 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, if (!grp) { ret = ENOMEM; DEBUG(SSSDBG_CRIT_FAILURE, - ("proxy -> getgrnam_r failed for '%s': [%d] %s\n", - name, ret, strerror(ret))); + "proxy -> getgrnam_r failed for '%s': [%d] %s\n", + name, ret, strerror(ret)); goto done; } @@ -812,7 +812,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("getgrnam failed [%d]: %s\n", ret, strerror(ret))); + "getgrnam failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -823,15 +823,15 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, ret = sysdb_getgrgid(tmpctx, sysdb, dom, gid, &cached_grp); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ - DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_TRACE_FUNC, "Request to cache failed [%d]: %s\n", + ret, strerror(ret)); } if (ret == EOK && cached_grp->count == 1) { real_name = ldb_msg_find_attr_as_string(cached_grp->msgs[0], SYSDB_NAME, NULL); if (!real_name) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Cached group has no name?\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Cached group has no name?\n"); } } } @@ -855,7 +855,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("getgrgid failed [%d]: %s\n", ret, strerror(ret))); + "getgrgid failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -864,8 +864,8 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, if (delete_group) { DEBUG(SSSDBG_TRACE_FUNC, - ("Group %s does not exist (or is invalid) on remote server," - " deleting!\n", name)); + "Group %s does not exist (or is invalid) on remote server," + " deleting!\n", name); ret = sysdb_delete_group(sysdb, dom, NULL, gid); if (ret == ENOENT) { @@ -877,7 +877,7 @@ static int get_gr_name(TALLOC_CTX *mem_ctx, ret = save_group(sysdb, dom, grp, real_name, name, dom->group_timeout); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot save group [%d]: %s\n", ret, strerror(ret))); + "Cannot save group [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -885,8 +885,8 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("proxy -> getgrnam_r failed for '%s' <%d>: %s\n", - name, ret, strerror(ret))); + "proxy -> getgrnam_r failed for '%s' <%d>: %s\n", + name, ret, strerror(ret)); } return ret; } @@ -907,7 +907,7 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, bool delete_group = false; int ret; - DEBUG(SSSDBG_TRACE_FUNC, ("Searching group by gid (%"SPRIgid")\n", gid)); + DEBUG(SSSDBG_TRACE_FUNC, "Searching group by gid (%"SPRIgid")\n", gid); tmpctx = talloc_new(mem_ctx); if (!tmpctx) { @@ -936,14 +936,14 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("getgrgid failed [%d]: %s\n", ret, strerror(ret))); + "getgrgid failed [%d]: %s\n", ret, strerror(ret)); goto done; } if (delete_group) { DEBUG(SSSDBG_TRACE_FUNC, - ("Group %"SPRIgid" does not exist (or is invalid) on remote " - "server, deleting!\n", gid)); + "Group %"SPRIgid" does not exist (or is invalid) on remote " + "server, deleting!\n", gid); ret = sysdb_delete_group(sysdb, dom, NULL, gid); if (ret == ENOENT) { @@ -955,7 +955,7 @@ static int get_gr_gid(TALLOC_CTX *mem_ctx, ret = save_group(sysdb, dom, grp, grp->gr_name, NULL, dom->group_timeout); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot save user [%d]: %s\n", ret, strerror(ret))); + "Cannot save user [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -963,8 +963,8 @@ done: talloc_zfree(tmpctx); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("proxy -> getgrgid_r failed for '%"SPRIgid"' <%d>: %s\n", - gid, ret, strerror(ret))); + "proxy -> getgrgid_r failed for '%"SPRIgid"' <%d>: %s\n", + gid, ret, strerror(ret)); } return ret; } @@ -987,7 +987,7 @@ static int enum_groups(TALLOC_CTX *mem_ctx, errno_t sret; bool again; - DEBUG(SSSDBG_TRACE_LIBS, ("Enumerating groups\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Enumerating groups\n"); tmpctx = talloc_new(mem_ctx); if (!tmpctx) { @@ -1009,7 +1009,7 @@ static int enum_groups(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -1050,11 +1050,11 @@ static int enum_groups(TALLOC_CTX *mem_ctx, case NSS_STATUS_NOTFOUND: /* we are done here */ - DEBUG(SSSDBG_TRACE_LIBS, ("Enumeration completed.\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Enumeration completed.\n"); ret = sysdb_transaction_commit(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; @@ -1062,16 +1062,16 @@ static int enum_groups(TALLOC_CTX *mem_ctx, case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_OP_FAILURE, ("Group found (%s, %"SPRIgid")\n", - grp->gr_name, grp->gr_gid)); + DEBUG(SSSDBG_OP_FAILURE, "Group found (%s, %"SPRIgid")\n", + grp->gr_name, grp->gr_gid); /* gid=0 is an invalid value */ /* also check that the id is in the valid range for this domain */ if (OUT_OF_ID_RANGE(grp->gr_gid, dom->id_min, dom->id_max)) { - DEBUG(SSSDBG_OP_FAILURE, ("Group [%s] filtered out! (id" - "out of range)\n", grp->gr_name)); + DEBUG(SSSDBG_OP_FAILURE, "Group [%s] filtered out! (id" + "out of range)\n", grp->gr_name); again = true; break; @@ -1082,8 +1082,8 @@ static int enum_groups(TALLOC_CTX *mem_ctx, if (ret) { /* Do not fail completely on errors. * Just report the failure to save and go on */ - DEBUG(SSSDBG_OP_FAILURE, ("Failed to store group." - "Ignoring\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to store group." + "Ignoring\n"); } again = true; break; @@ -1095,8 +1095,8 @@ static int enum_groups(TALLOC_CTX *mem_ctx, default: ret = EIO; - DEBUG(SSSDBG_OP_FAILURE, ("proxy -> getgrent_r failed (%d)[%s]" - "\n", ret, strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "proxy -> getgrent_r failed (%d)[%s]" + "\n", ret, strerror(ret)); break; } } while (again); @@ -1106,7 +1106,7 @@ done: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } ctx->ops.endgrent(); @@ -1161,7 +1161,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto fail; } in_transaction = true; @@ -1172,14 +1172,14 @@ static int get_initgr(TALLOC_CTX *mem_ctx, ret = handle_getpw_result(status, pwd, dom, &del_user); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("getpwnam failed [%d]: %s\n", ret, strerror(ret))); + "getpwnam failed [%d]: %s\n", ret, strerror(ret)); goto fail; } if (del_user) { ret = delete_user(sysdb, dom, name, 0); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not delete user\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not delete user\n"); goto fail; } goto done; @@ -1193,15 +1193,15 @@ static int get_initgr(TALLOC_CTX *mem_ctx, ret = sysdb_getpwuid(tmpctx, sysdb, dom, uid, &cached_pwd); if (ret != EOK) { /* Non-fatal, attempt to canonicalize online */ - DEBUG(SSSDBG_TRACE_FUNC, ("Request to cache failed [%d]: %s\n", - ret, strerror(ret))); + DEBUG(SSSDBG_TRACE_FUNC, "Request to cache failed [%d]: %s\n", + ret, strerror(ret)); } if (ret == EOK && cached_pwd->count == 1) { real_name = ldb_msg_find_attr_as_string(cached_pwd->msgs[0], SYSDB_NAME, NULL); if (!real_name) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Cached user has no name?\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Cached user has no name?\n"); } } } @@ -1213,7 +1213,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, ret = handle_getpw_result(status, pwd, dom, &del_user); if (ret) { DEBUG(SSSDBG_OP_FAILURE, - ("getpwuid failed [%d]: %s\n", ret, strerror(ret))); + "getpwuid failed [%d]: %s\n", ret, strerror(ret)); goto done; } @@ -1223,7 +1223,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, if (del_user) { ret = delete_user(sysdb, dom, name, uid); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not delete user\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not delete user\n"); goto fail; } goto done; @@ -1232,20 +1232,20 @@ static int get_initgr(TALLOC_CTX *mem_ctx, ret = save_user(sysdb, dom, !dom->case_sensitive, pwd, real_name, name, dom->user_timeout); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not save user\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not save user\n"); goto fail; } ret = get_initgr_groups_process(tmpctx, ctx, sysdb, dom, pwd); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not process initgroups\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not process initgroups\n"); goto fail; } done: ret = sysdb_transaction_commit(sysdb); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_OP_FAILURE, "Failed to commit transaction\n"); goto fail; } in_transaction = false; @@ -1255,7 +1255,7 @@ fail: if (in_transaction) { sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to cancel transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to cancel transaction\n"); } } return ret; @@ -1317,13 +1317,13 @@ static int get_initgr_groups_process(TALLOC_CTX *memctx, switch (status) { case NSS_STATUS_NOTFOUND: - DEBUG(SSSDBG_FUNC_DATA, ("The initgroups call returned 'NOTFOUND'. " + DEBUG(SSSDBG_FUNC_DATA, "The initgroups call returned 'NOTFOUND'. " "Assume the user is only member of its " - "primary group (%"SPRIgid")\n", pwd->pw_gid)); + "primary group (%"SPRIgid")\n", pwd->pw_gid); /* fall through */ case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_CONF_SETTINGS, ("User [%s] appears to be member of %lu" - "groups\n", pwd->pw_name, num_gids)); + DEBUG(SSSDBG_CONF_SETTINGS, "User [%s] appears to be member of %lu" + "groups\n", pwd->pw_name, num_gids); now = time(NULL); for (i = 0; i < num_gids; i++) { @@ -1337,8 +1337,8 @@ static int get_initgr_groups_process(TALLOC_CTX *memctx, break; default: - DEBUG(2, ("proxy -> initgroups_dyn failed (%d)[%s]\n", - ret, strerror(ret))); + DEBUG(2, "proxy -> initgroups_dyn failed (%d)[%s]\n", + ret, strerror(ret)); ret = EIO; break; } @@ -1496,7 +1496,7 @@ void proxy_get_account_info(struct be_req *breq) if (ret) { if (ret == ENXIO) { - DEBUG(2, ("proxy returned UNAVAIL error, going offline!\n")); + DEBUG(2, "proxy returned UNAVAIL error, going offline!\n"); be_mark_offline(be_ctx); } be_req_terminate(breq, DP_ERR_FATAL, ret, NULL); diff --git a/src/providers/proxy/proxy_init.c b/src/providers/proxy/proxy_init.c index 491482d8c..f2ad14475 100644 --- a/src/providers/proxy/proxy_init.c +++ b/src/providers/proxy/proxy_init.c @@ -125,8 +125,8 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->handle = dlopen(libpath, RTLD_NOW); if (!ctx->handle) { - DEBUG(0, ("Unable to load %s module with path, error: %s\n", - libpath, dlerror())); + DEBUG(0, "Unable to load %s module with path, error: %s\n", + libpath, dlerror()); ret = ELIBACC; goto done; } @@ -134,7 +134,7 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getpwnam_r = proxy_dlsym(ctx->handle, "_nss_%s_getpwnam_r", libname); if (!ctx->ops.getpwnam_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -142,14 +142,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getpwuid_r = proxy_dlsym(ctx->handle, "_nss_%s_getpwuid_r", libname); if (!ctx->ops.getpwuid_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } ctx->ops.setpwent = proxy_dlsym(ctx->handle, "_nss_%s_setpwent", libname); if (!ctx->ops.setpwent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -157,14 +157,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getpwent_r = proxy_dlsym(ctx->handle, "_nss_%s_getpwent_r", libname); if (!ctx->ops.getpwent_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } ctx->ops.endpwent = proxy_dlsym(ctx->handle, "_nss_%s_endpwent", libname); if (!ctx->ops.endpwent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -172,7 +172,7 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getgrnam_r = proxy_dlsym(ctx->handle, "_nss_%s_getgrnam_r", libname); if (!ctx->ops.getgrnam_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -180,14 +180,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getgrgid_r = proxy_dlsym(ctx->handle, "_nss_%s_getgrgid_r", libname); if (!ctx->ops.getgrgid_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } ctx->ops.setgrent = proxy_dlsym(ctx->handle, "_nss_%s_setgrent", libname); if (!ctx->ops.setgrent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -195,14 +195,14 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.getgrent_r = proxy_dlsym(ctx->handle, "_nss_%s_getgrent_r", libname); if (!ctx->ops.getgrent_r) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } ctx->ops.endgrent = proxy_dlsym(ctx->handle, "_nss_%s_endgrent", libname); if (!ctx->ops.endgrent) { - DEBUG(0, ("Failed to load NSS fns, error: %s\n", dlerror())); + DEBUG(0, "Failed to load NSS fns, error: %s\n", dlerror()); ret = ELIBBAD; goto done; } @@ -210,34 +210,34 @@ int sssm_proxy_id_init(struct be_ctx *bectx, ctx->ops.initgroups_dyn = proxy_dlsym(ctx->handle, "_nss_%s_initgroups_dyn", libname); if (!ctx->ops.initgroups_dyn) { - DEBUG(1, ("The '%s' library does not provides the " + DEBUG(1, "The '%s' library does not provides the " "_nss_XXX_initgroups_dyn function!\n" "initgroups will be slow as it will require " - "full groups enumeration!\n", libname)); + "full groups enumeration!\n", libname); } ctx->ops.setnetgrent = proxy_dlsym(ctx->handle, "_nss_%s_setnetgrent", libname); if (!ctx->ops.setnetgrent) { - DEBUG(0, ("Failed to load _nss_%s_setnetgrent, error: %s. " + DEBUG(0, "Failed to load _nss_%s_setnetgrent, error: %s. " "The library does not support netgroups.\n", libname, - dlerror())); + dlerror()); } ctx->ops.getnetgrent_r = proxy_dlsym(ctx->handle, "_nss_%s_getnetgrent_r", libname); if (!ctx->ops.getgrent_r) { - DEBUG(0, ("Failed to load _nss_%s_getnetgrent_r, error: %s. " + DEBUG(0, "Failed to load _nss_%s_getnetgrent_r, error: %s. " "The library does not support netgroups.\n", libname, - dlerror())); + dlerror()); } ctx->ops.endnetgrent = proxy_dlsym(ctx->handle, "_nss_%s_endnetgrent", libname); if (!ctx->ops.endnetgrent) { - DEBUG(0, ("Failed to load _nss_%s_endnetgrent, error: %s. " + DEBUG(0, "Failed to load _nss_%s_endnetgrent, error: %s. " "The library does not support netgroups.\n", libname, - dlerror())); + dlerror()); } ctx->ops.getservbyname_r = proxy_dlsym(ctx->handle, @@ -245,10 +245,10 @@ int sssm_proxy_id_init(struct be_ctx *bectx, libname); if (!ctx->ops.getservbyname_r) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to load _nss_%s_getservbyname_r, error: %s. " + "Failed to load _nss_%s_getservbyname_r, error: %s. " "The library does not support services.\n", libname, - dlerror())); + dlerror()); } ctx->ops.getservbyport_r = proxy_dlsym(ctx->handle, @@ -256,10 +256,10 @@ int sssm_proxy_id_init(struct be_ctx *bectx, libname); if (!ctx->ops.getservbyport_r) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to load _nss_%s_getservbyport_r, error: %s. " + "Failed to load _nss_%s_getservbyport_r, error: %s. " "The library does not support services.\n", libname, - dlerror())); + dlerror()); } ctx->ops.setservent = proxy_dlsym(ctx->handle, @@ -267,10 +267,10 @@ int sssm_proxy_id_init(struct be_ctx *bectx, libname); if (!ctx->ops.setservent) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to load _nss_%s_setservent, error: %s. " + "Failed to load _nss_%s_setservent, error: %s. " "The library does not support services.\n", libname, - dlerror())); + dlerror()); } ctx->ops.getservent_r = proxy_dlsym(ctx->handle, @@ -278,10 +278,10 @@ int sssm_proxy_id_init(struct be_ctx *bectx, libname); if (!ctx->ops.getservent_r) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to load _nss_%s_getservent_r, error: %s. " + "Failed to load _nss_%s_getservent_r, error: %s. " "The library does not support services.\n", libname, - dlerror())); + dlerror()); } ctx->ops.endservent = proxy_dlsym(ctx->handle, @@ -289,10 +289,10 @@ int sssm_proxy_id_init(struct be_ctx *bectx, libname); if (!ctx->ops.endservent) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Failed to load _nss_%s_endservent, error: %s. " + "Failed to load _nss_%s_endservent, error: %s. " "The library does not support services.\n", libname, - dlerror())); + dlerror()); } *ops = &proxy_id_ops; @@ -329,7 +329,7 @@ static int proxy_client_init(struct sbus_connection *conn, void *data) proxy_cli = talloc_zero(conn, struct proxy_client); if (!proxy_cli) { - DEBUG(0,("Out of memory?!\n")); + DEBUG(0,"Out of memory?!\n"); talloc_zfree(conn); return ENOMEM; } @@ -343,11 +343,11 @@ static int proxy_client_init(struct sbus_connection *conn, void *data) proxy_cli->timeout = tevent_add_timer(proxy_auth_ctx->be->ev, proxy_cli, tv, init_timeout, proxy_cli); if (!proxy_cli->timeout) { - DEBUG(0,("Out of memory?!\n")); + DEBUG(0,"Out of memory?!\n"); talloc_zfree(conn); return ENOMEM; } - DEBUG(4, ("Set-up proxy client ID timeout [%p]\n", proxy_cli->timeout)); + DEBUG(4, "Set-up proxy client ID timeout [%p]\n", proxy_cli->timeout); /* Attach the client context to the connection context, so that it is * always available when we need to manage the connection. */ @@ -362,7 +362,7 @@ static void init_timeout(struct tevent_context *ev, { struct proxy_client *proxy_cli; - DEBUG(2, ("Client timed out before Identification [%p]!\n", te)); + DEBUG(2, "Client timed out before Identification [%p]!\n", te); proxy_cli = talloc_get_type(ptr, struct proxy_client); @@ -396,12 +396,12 @@ static int client_registration(DBusMessage *message, data = sbus_conn_get_private_data(conn); proxy_cli = talloc_get_type(data, struct proxy_client); if (!proxy_cli) { - DEBUG(0, ("Connection holds no valid init data\n")); + DEBUG(0, "Connection holds no valid init data\n"); return EINVAL; } /* First thing, cancel the timeout */ - DEBUG(4, ("Cancel proxy client ID timeout [%p]\n", proxy_cli->timeout)); + DEBUG(4, "Cancel proxy client ID timeout [%p]\n", proxy_cli->timeout); talloc_zfree(proxy_cli->timeout); dbus_error_init(&dbus_error); @@ -411,20 +411,20 @@ static int client_registration(DBusMessage *message, DBUS_TYPE_UINT32, &cli_id, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(1, ("Failed to parse message, killing connection\n")); + DEBUG(1, "Failed to parse message, killing connection\n"); if (dbus_error_is_set(&dbus_error)) dbus_error_free(&dbus_error); sbus_disconnect(conn); /* FIXME: should we just talloc_zfree(conn) ? */ return EIO; } - DEBUG(SSSDBG_FUNC_DATA, ("Proxy client [%"PRIu32"] connected\n", cli_id)); + DEBUG(SSSDBG_FUNC_DATA, "Proxy client [%"PRIu32"] connected\n", cli_id); /* Check the hash table */ key.type = HASH_KEY_ULONG; key.ul = cli_id; if (!hash_has_key(proxy_cli->proxy_auth_ctx->request_table, &key)) { - DEBUG(1, ("Unknown child ID. Killing the connection\n")); + DEBUG(1, "Unknown child ID. Killing the connection\n"); sbus_disconnect(proxy_cli->conn); return EIO; } @@ -432,7 +432,7 @@ static int client_registration(DBusMessage *message, /* reply that all is ok */ reply = dbus_message_new_method_return(message); if (!reply) { - DEBUG(0, ("Dbus Out of memory!\n")); + DEBUG(0, "Dbus Out of memory!\n"); return ENOMEM; } @@ -440,7 +440,7 @@ static int client_registration(DBusMessage *message, DBUS_TYPE_UINT16, &version, DBUS_TYPE_INVALID); if (!dbret) { - DEBUG(0, ("Failed to build dbus reply\n")); + DEBUG(0, "Failed to build dbus reply\n"); dbus_message_unref(reply); sbus_disconnect(conn); return EIO; @@ -452,7 +452,7 @@ static int client_registration(DBusMessage *message, hret = hash_lookup(proxy_cli->proxy_auth_ctx->request_table, &key, &value); if (hret != HASH_SUCCESS) { - DEBUG(1, ("Hash error [%d][%s]\n", hret, hash_error_string(hret))); + DEBUG(1, "Hash error [%d][%s]\n", hret, hash_error_string(hret)); sbus_disconnect(conn); } @@ -466,8 +466,8 @@ static int client_registration(DBusMessage *message, * the init_req will be NULL below and things will * break. */ - DEBUG(1, ("Client connection from a request " - "that's not marked as running\n")); + DEBUG(1, "Client connection from a request " + "that's not marked as running\n"); return EIO; } @@ -490,7 +490,7 @@ int sssm_proxy_auth_init(struct be_ctx *bectx, /* If we're already set up, just return that */ if(bectx->bet_info[BET_AUTH].mod_name && strcmp("proxy", bectx->bet_info[BET_AUTH].mod_name) == 0) { - DEBUG(8, ("Re-using proxy_auth_ctx for this provider\n")); + DEBUG(8, "Re-using proxy_auth_ctx for this provider\n"); *ops = bectx->bet_info[BET_AUTH].bet_ops; *pvt_data = bectx->bet_info[BET_AUTH].pvt_bet_data; return EOK; @@ -509,7 +509,7 @@ int sssm_proxy_auth_init(struct be_ctx *bectx, &ctx->pam_target); if (ret != EOK) goto done; if (!ctx->pam_target) { - DEBUG(1, ("Missing option proxy_pam_target.\n")); + DEBUG(1, "Missing option proxy_pam_target.\n"); ret = EINVAL; goto done; } @@ -517,7 +517,7 @@ int sssm_proxy_auth_init(struct be_ctx *bectx, sbus_address = talloc_asprintf(ctx, "unix:path=%s/%s_%s", PIPE_PATH, PROXY_CHILD_PIPE, bectx->domain->name); if (sbus_address == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); ret = ENOMEM; goto done; } @@ -525,7 +525,7 @@ int sssm_proxy_auth_init(struct be_ctx *bectx, ret = sbus_new_server(ctx, bectx->ev, sbus_address, &proxy_interface, false, &ctx->sbus_srv, proxy_client_init, ctx); if (ret != EOK) { - DEBUG(0, ("Could not set up sbus server.\n")); + DEBUG(0, "Could not set up sbus server.\n"); goto done; } @@ -536,7 +536,7 @@ int sssm_proxy_auth_init(struct be_ctx *bectx, hret = hash_create(ctx->max_children * 2, &ctx->request_table, NULL, NULL); if (hret != HASH_SUCCESS) { - DEBUG(0, ("Could not initialize request table\n")); + DEBUG(0, "Could not initialize request table\n"); ret = EIO; goto done; } diff --git a/src/providers/proxy/proxy_netgroup.c b/src/providers/proxy/proxy_netgroup.c index bb0bc171b..8aec528cf 100644 --- a/src/providers/proxy/proxy_netgroup.c +++ b/src/providers/proxy/proxy_netgroup.c @@ -40,7 +40,7 @@ static errno_t make_netgroup_attr(struct __netgrent netgrent, ret =sysdb_attrs_add_string(attrs, SYSDB_NETGROUP_MEMBER, netgrent.val.group); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); return ret; } } else if (netgrent.type == triple_val) { @@ -49,17 +49,17 @@ static errno_t make_netgroup_attr(struct __netgrent netgrent, get_triple_el(netgrent.val.triple.user), get_triple_el(netgrent.val.triple.domain)); if (dummy == NULL) { - DEBUG(1, ("talloc_asprintf failed.\n")); + DEBUG(1, "talloc_asprintf failed.\n"); return ENOMEM; } ret = sysdb_attrs_add_string(attrs, SYSDB_NETGROUP_TRIPLE, dummy); if (ret != EOK) { - DEBUG(1, ("sysdb_attrs_add_string failed.\n")); + DEBUG(1, "sysdb_attrs_add_string failed.\n"); return ret; } } else { - DEBUG(1, ("Unknown netgrent entry type [%d].\n", netgrent.type)); + DEBUG(1, "Unknown netgrent entry type [%d].\n", netgrent.type); return EINVAL; } @@ -78,7 +78,7 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, if (lowercase) { ret = sysdb_attrs_add_lc_name_alias(attrs, name); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not add name alias\n")); + DEBUG(SSSDBG_OP_FAILURE, "Could not add name alias\n"); return ret; } } @@ -86,7 +86,7 @@ static errno_t save_netgroup(struct sysdb_ctx *sysdb, ret = sysdb_add_netgroup(sysdb, domain, name, NULL, attrs, NULL, cache_timeout, 0); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_add_netgroup failed.\n"); return ret; } @@ -100,27 +100,27 @@ static errno_t handle_error(enum nss_status status, struct sysdb_ctx *sysdb, switch (status) { case NSS_STATUS_SUCCESS: - DEBUG(SSSDBG_TRACE_INTERNAL, ("Netgroup lookup succeeded\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Netgroup lookup succeeded\n"); ret = EOK; break; case NSS_STATUS_NOTFOUND: - DEBUG(SSSDBG_MINOR_FAILURE, ("The netgroup was not found\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "The netgroup was not found\n"); ret = sysdb_delete_netgroup(sysdb, domain, name); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Cannot delete netgroup: %d\n", ret)); + DEBUG(SSSDBG_CRIT_FAILURE, "Cannot delete netgroup: %d\n", ret); ret = EIO; } break; case NSS_STATUS_UNAVAIL: DEBUG(SSSDBG_TRACE_LIBS, - ("The proxy target did not respond, going offline\n")); + "The proxy target did not respond, going offline\n"); ret = ENXIO; break; default: - DEBUG(SSSDBG_CRIT_FAILURE, ("Unexpected error looking up netgroup\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Unexpected error looking up netgroup\n"); ret = EIO; break; } @@ -144,21 +144,21 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, status = ctx->ops.setnetgrent(name, &result); if (status != NSS_STATUS_SUCCESS) { DEBUG(SSSDBG_OP_FAILURE, - ("setnetgrent failed for netgroup [%s].\n", name)); + "setnetgrent failed for netgroup [%s].\n", name); ret = handle_error(status, sysdb, dom, name); goto done; } 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"); ret = ENOMEM; goto done; } attrs = sysdb_new_attrs(tmp_ctx); if (attrs == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("sysdb_new_attrs failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "sysdb_new_attrs failed.\n"); ret = ENOMEM; goto done; } @@ -170,15 +170,15 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, status != NSS_STATUS_NOTFOUND) { ret = handle_error(status, sysdb, dom, name); DEBUG(SSSDBG_OP_FAILURE, - ("getnetgrent_r failed for netgroup [%s]: [%d][%s].\n", - name, ret, strerror(ret))); + "getnetgrent_r failed for netgroup [%s]: [%d][%s].\n", + name, ret, strerror(ret)); goto done; } if (status == NSS_STATUS_SUCCESS) { ret = make_netgroup_attr(result, attrs); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("make_netgroup_attr failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "make_netgroup_attr failed.\n"); goto done; } } @@ -186,7 +186,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, status = ctx->ops.endnetgrent(&result); if (status != NSS_STATUS_SUCCESS) { - DEBUG(SSSDBG_OP_FAILURE, ("endnetgrent failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "endnetgrent failed.\n"); ret = handle_error(status, sysdb, dom, name); goto done; } @@ -195,7 +195,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx, !dom->case_sensitive, dom->netgroup_timeout); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("sysdb_add_netgroup failed.\n")); + DEBUG(SSSDBG_OP_FAILURE, "sysdb_add_netgroup failed.\n"); goto done; } diff --git a/src/providers/proxy/proxy_services.c b/src/providers/proxy/proxy_services.c index 474959039..e5f4ff2a8 100644 --- a/src/providers/proxy/proxy_services.c +++ b/src/providers/proxy/proxy_services.c @@ -111,7 +111,7 @@ get_serv_byname(struct proxy_id_ctx *ctx, buffer, BUFLEN, &ret); if (status != NSS_STATUS_SUCCESS && status != NSS_STATUS_NOTFOUND) { DEBUG(SSSDBG_MINOR_FAILURE, - ("getservbyname_r failed for service [%s].\n", name)); + "getservbyname_r failed for service [%s].\n", name); return ret; } @@ -165,7 +165,7 @@ get_serv_byport(struct proxy_id_ctx *ctx, buffer, BUFLEN, &ret); if (status != NSS_STATUS_SUCCESS && status != NSS_STATUS_NOTFOUND) { DEBUG(SSSDBG_MINOR_FAILURE, - ("getservbyport_r failed for service [%s].\n", be_filter)); + "getservbyport_r failed for service [%s].\n", be_filter); return ret; } @@ -202,7 +202,7 @@ enum_services(struct proxy_id_ctx *ctx, const char **cased_aliases; bool again; - DEBUG(SSSDBG_TRACE_FUNC, ("Enumerating services\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Enumerating services\n"); tmpctx = talloc_new(NULL); if (!tmpctx) { @@ -230,7 +230,7 @@ enum_services(struct proxy_id_ctx *ctx, ret = sysdb_transaction_start(sysdb); if (ret) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to start transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to start transaction\n"); goto done; } in_transaction = true; @@ -271,11 +271,11 @@ enum_services(struct proxy_id_ctx *ctx, case NSS_STATUS_NOTFOUND: /* we are done here */ - DEBUG(SSSDBG_TRACE_FUNC, ("Enumeration completed.\n")); + DEBUG(SSSDBG_TRACE_FUNC, "Enumeration completed.\n"); ret = sysdb_transaction_commit(sysdb); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to commit transaction\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "Failed to commit transaction\n"); goto done; } @@ -285,8 +285,8 @@ enum_services(struct proxy_id_ctx *ctx, case NSS_STATUS_SUCCESS: DEBUG(SSSDBG_TRACE_INTERNAL, - ("Service found (%s, %d/%s)\n", - svc->s_name, svc->s_port, svc->s_proto)); + "Service found (%s, %d/%s)\n", + svc->s_name, svc->s_port, svc->s_proto); protocols[0] = sss_get_cased_name(protocols, svc->s_proto, dom->case_sensitive); @@ -303,8 +303,8 @@ enum_services(struct proxy_id_ctx *ctx, /* Do not fail completely on errors. * Just report the failure to save and go on */ DEBUG(SSSDBG_OP_FAILURE, - ("Failed to store service [%s]. Ignoring.\n", - strerror(ret))); + "Failed to store service [%s]. Ignoring.\n", + strerror(ret)); again = true; break; } @@ -321,8 +321,8 @@ enum_services(struct proxy_id_ctx *ctx, /* Do not fail completely on errors. * Just report the failure to save and go on */ DEBUG(SSSDBG_OP_FAILURE, - ("Failed to store service [%s]. Ignoring.\n", - strerror(ret))); + "Failed to store service [%s]. Ignoring.\n", + strerror(ret)); } again = true; break; @@ -335,8 +335,8 @@ enum_services(struct proxy_id_ctx *ctx, default: ret = EIO; DEBUG(SSSDBG_CRIT_FAILURE, - ("proxy -> getservent_r failed (%d)[%s]\n", - ret, strerror(ret))); + "proxy -> getservent_r failed (%d)[%s]\n", + ret, strerror(ret)); break; } } while (again); @@ -347,8 +347,8 @@ done: sret = sysdb_transaction_cancel(sysdb); if (sret != EOK) { DEBUG(SSSDBG_CRIT_FAILURE, - ("Could not cancel transaction! [%s]\n", - strerror(sret))); + "Could not cancel transaction! [%s]\n", + strerror(sret)); } } ctx->ops.endservent(); diff --git a/src/providers/simple/simple_access.c b/src/providers/simple/simple_access.c index eab62a826..edb4f2f3e 100644 --- a/src/providers/simple/simple_access.c +++ b/src/providers/simple/simple_access.c @@ -63,8 +63,8 @@ static int simple_access_obtain_filter_lists(struct simple_ctx *ctx) ret = sysdb_master_domain_update(bectx->domain); if (ret != EOK) { - DEBUG(SSSDBG_FUNC_DATA, ("Update of master domain failed [%d]: %s.\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_FUNC_DATA, "Update of master domain failed [%d]: %s.\n", + ret, sss_strerror(ret)); goto failed; } @@ -72,19 +72,19 @@ static int simple_access_obtain_filter_lists(struct simple_ctx *ctx) ret = confdb_get_string_as_list(bectx->cdb, ctx, bectx->conf_path, lists[i].option, &lists[i].orig_list); if (ret == ENOENT) { - DEBUG(SSSDBG_FUNC_DATA, ("%s list is empty.\n", lists[i].name)); + DEBUG(SSSDBG_FUNC_DATA, "%s list is empty.\n", lists[i].name); *lists[i].ctx_list = NULL; continue; } else if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("confdb_get_string_as_list failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "confdb_get_string_as_list failed.\n"); goto failed; } ret = simple_access_parse_names(ctx, bectx, lists[i].orig_list, lists[i].ctx_list); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to parse %s list [%d]: %s\n", - lists[i].name, ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to parse %s list [%d]: %s\n", + lists[i].name, ret, sss_strerror(ret)); goto failed; } } @@ -94,8 +94,8 @@ static int simple_access_obtain_filter_lists(struct simple_ctx *ctx) !ctx->deny_users && !ctx->deny_groups) { DEBUG(SSSDBG_OP_FAILURE, - ("No rules supplied for simple access provider. " - "Access will be granted for all users.\n")); + "No rules supplied for simple access provider. " + "Access will be granted for all users.\n"); } return EOK; @@ -118,7 +118,7 @@ void simple_access_handler(struct be_req *be_req) if (pd->cmd != SSS_PAM_ACCT_MGMT) { DEBUG(SSSDBG_CONF_SETTINGS, - ("simple access does not handle pam task %d.\n", pd->cmd)); + "simple access does not handle pam task %d.\n", pd->cmd); pd->pam_status = PAM_MODULE_UNKNOWN; goto done; } @@ -133,7 +133,7 @@ void simple_access_handler(struct be_req *be_req) ret = simple_access_obtain_filter_lists(ctx); if (ret != EOK) { - DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to refresh filter lists\n")); + DEBUG(SSSDBG_MINOR_FAILURE, "Failed to refresh filter lists\n"); } ctx->last_refresh_of_filter_lists = now; } @@ -197,7 +197,7 @@ static errno_t simple_access_parse_names(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"); ret = ENOMEM; goto done; } @@ -208,7 +208,7 @@ static errno_t simple_access_parse_names(TALLOC_CTX *mem_ctx, out = talloc_zero_array(tmp_ctx, char*, size + 1); if (out == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero_array() failed\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero_array() failed\n"); ret = ENOMEM; goto done; } @@ -219,8 +219,8 @@ static errno_t simple_access_parse_names(TALLOC_CTX *mem_ctx, ret = sss_parse_name(tmp_ctx, be_ctx->domain->names, list[i], &domain, &name); if (ret != EOK) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Unable to parse name '%s' [%d]: %s\n", - list[i], ret, sss_strerror(ret))); + DEBUG(SSSDBG_CRIT_FAILURE, "Unable to parse name '%s' [%d]: %s\n", + list[i], ret, sss_strerror(ret)); goto done; } @@ -262,7 +262,7 @@ int sssm_simple_access_init(struct be_ctx *bectx, struct bet_ops **ops, struct simple_ctx *ctx; ctx = talloc_zero(bectx, struct simple_ctx); if (ctx == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("talloc_zero failed.\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "talloc_zero failed.\n"); return ENOMEM; } diff --git a/src/providers/simple/simple_access_check.c b/src/providers/simple/simple_access_check.c index a36843118..007ec10aa 100644 --- a/src/providers/simple/simple_access_check.c +++ b/src/providers/simple/simple_access_check.c @@ -53,16 +53,16 @@ simple_check_users(struct simple_ctx *ctx, const char *username, domain = find_subdomain_by_object_name(ctx->domain, ctx->allow_users[i]); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid user %s!\n", - ctx->allow_users[i])); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid user %s!\n", + ctx->allow_users[i]); return EINVAL; } if (sss_string_equal(domain->case_sensitive, username, ctx->allow_users[i])) { DEBUG(SSSDBG_TRACE_LIBS, - ("User [%s] found in allow list, access granted.\n", - username)); + "User [%s] found in allow list, access granted.\n", + username); /* Do not return immediately on explicit allow * We need to make sure none of the user's groups @@ -76,7 +76,7 @@ simple_check_users(struct simple_ctx *ctx, const char *username, * unless a deny rule disables us below. */ DEBUG(SSSDBG_TRACE_LIBS, - ("No allow rule, assumuing allow unless explicitly denied\n")); + "No allow rule, assumuing allow unless explicitly denied\n"); *access_granted = true; } @@ -86,16 +86,16 @@ simple_check_users(struct simple_ctx *ctx, const char *username, domain = find_subdomain_by_object_name(ctx->domain, ctx->deny_users[i]); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid user %s!\n", - ctx->deny_users[i])); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid user %s!\n", + ctx->deny_users[i]); return EINVAL; } if (sss_string_equal(domain->case_sensitive, username, ctx->deny_users[i])) { DEBUG(SSSDBG_TRACE_LIBS, - ("User [%s] found in deny list, access denied.\n", - ctx->deny_users[i])); + "User [%s] found in deny list, access denied.\n", + ctx->deny_users[i]); /* Return immediately on explicit denial */ *access_granted = false; @@ -125,8 +125,8 @@ simple_check_groups(struct simple_ctx *ctx, const char **group_names, domain = find_subdomain_by_object_name(ctx->domain, ctx->allow_groups[i]); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid group %s!\n", - ctx->allow_groups[i])); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid group %s!\n", + ctx->allow_groups[i]); return EINVAL; } @@ -143,8 +143,8 @@ simple_check_groups(struct simple_ctx *ctx, const char **group_names, */ if (matched) { DEBUG(SSSDBG_TRACE_LIBS, - ("Group [%s] found in allow list, access granted.\n", - group_names[j])); + "Group [%s] found in allow list, access granted.\n", + group_names[j]); *access_granted = true; break; } @@ -158,8 +158,8 @@ simple_check_groups(struct simple_ctx *ctx, const char **group_names, domain = find_subdomain_by_object_name(ctx->domain, ctx->deny_groups[i]); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid group %s!\n", - ctx->deny_groups[i])); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid group %s!\n", + ctx->deny_groups[i]); return EINVAL; } @@ -176,8 +176,8 @@ simple_check_groups(struct simple_ctx *ctx, const char **group_names, */ if (matched) { DEBUG(SSSDBG_TRACE_LIBS, - ("Group [%s] found in deny list, access denied.\n", - group_names[j])); + "Group [%s] found in deny list, access denied.\n", + group_names[j]); *access_granted = false; break; } @@ -224,13 +224,13 @@ simple_resolve_group_send(TALLOC_CTX *mem_ctx, * parent was updated first), then just shortcut */ ret = simple_resolve_group_check(state); if (ret == EOK) { - DEBUG(SSSDBG_TRACE_LIBS, ("Group already updated\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Group already updated\n"); ret = EOK; goto done; } else if (ret != EAGAIN) { DEBUG(SSSDBG_OP_FAILURE, - ("Cannot check if group was already updated [%d]: %s\n", - ret, sss_strerror(ret))); + "Cannot check if group was already updated [%d]: %s\n", + ret, sss_strerror(ret)); goto done; } /* EAGAIN - still needs update */ @@ -287,24 +287,24 @@ simple_resolve_group_check(struct simple_resolve_group_state *state) return EAGAIN; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not look up group by gid [%"SPRIgid"]: [%d][%s]\n", - state->gid, ret, sss_strerror(ret))); + "Could not look up group by gid [%"SPRIgid"]: [%d][%s]\n", + state->gid, ret, sss_strerror(ret)); return ret; } state->name = ldb_msg_find_attr_as_string(group, SYSDB_NAME, NULL); if (!state->name) { - DEBUG(SSSDBG_OP_FAILURE, ("No group name\n")); + DEBUG(SSSDBG_OP_FAILURE, "No group name\n"); return ERR_ACCOUNT_UNKNOWN; } if (is_posix(group) == false) { DEBUG(SSSDBG_TRACE_LIBS, - ("The group is still non-POSIX\n")); + "The group is still non-POSIX\n"); return EAGAIN; } - DEBUG(SSSDBG_TRACE_LIBS, ("Got POSIX group\n")); + DEBUG(SSSDBG_TRACE_LIBS, "Got POSIX group\n"); return EOK; } @@ -324,15 +324,15 @@ static void simple_resolve_group_done(struct tevent_req *subreq) &err_maj, &err_min, &err_msg); talloc_zfree(subreq); if (ret) { - DEBUG(SSSDBG_OP_FAILURE, ("be_get_account_info_recv failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "be_get_account_info_recv failed\n"); tevent_req_error(req, ret); return; } if (err_maj) { DEBUG(SSSDBG_MINOR_FAILURE, - ("Cannot refresh data from DP: %u,%u: %s\n", - err_maj, err_min, err_msg)); + "Cannot refresh data from DP: %u,%u: %s\n", + err_maj, err_min, err_msg); tevent_req_error(req, EIO); return; } @@ -340,7 +340,7 @@ static void simple_resolve_group_done(struct tevent_req *subreq) /* Check the cache by GID again and fetch the name */ ret = simple_resolve_group_check(state); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Refresh failed\n")); + DEBUG(SSSDBG_OP_FAILURE, "Refresh failed\n"); tevent_req_error(req, ret); return; } @@ -415,12 +415,12 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, state->ev = ev; state->ctx = ctx; - DEBUG(SSSDBG_TRACE_LIBS, ("Looking up groups for user %s\n", username)); + DEBUG(SSSDBG_TRACE_LIBS, "Looking up groups for user %s\n", username); /* get domain from username */ state->domain = find_subdomain_by_object_name(ctx->domain, username); if (state->domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("Invalid user %s!\n", username)); + DEBUG(SSSDBG_CRIT_FAILURE, "Invalid user %s!\n", username); ret = EINVAL; goto done; } @@ -428,13 +428,13 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, ret = sysdb_search_user_by_name(state, state->domain->sysdb, state->domain, username, attrs, &user); if (ret == ENOENT) { - DEBUG(SSSDBG_MINOR_FAILURE, ("No such user %s\n", username)); + DEBUG(SSSDBG_MINOR_FAILURE, "No such user %s\n", username); ret = ERR_ACCOUNT_UNKNOWN; goto done; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not look up username [%s]: [%d][%s]\n", - username, ret, sss_strerror(ret))); + "Could not look up username [%s]: [%d][%s]\n", + username, ret, sss_strerror(ret)); goto done; } @@ -446,8 +446,8 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, } DEBUG(SSSDBG_TRACE_FUNC, - ("User %s is a member of %zu supplemental groups\n", - username, group_count)); + "User %s is a member of %zu supplemental groups\n", + username, group_count); /* One extra space for terminator, one extra space for private group */ state->group_names = talloc_zero_array(state, const char *, group_count + 2); @@ -474,7 +474,7 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, gid = ldb_msg_find_attr_as_uint64(user, SYSDB_GIDNUM, 0); if (!gid) { - DEBUG(SSSDBG_MINOR_FAILURE, ("User %s has no gid?\n", username)); + DEBUG(SSSDBG_MINOR_FAILURE, "User %s has no gid?\n", username); ret = EINVAL; goto done; } @@ -488,13 +488,13 @@ simple_check_get_groups_send(TALLOC_CTX *mem_ctx, /* If all groups could have been resolved by name, we are * done */ - DEBUG(SSSDBG_TRACE_FUNC, ("All groups had name attribute\n")); + DEBUG(SSSDBG_TRACE_FUNC, "All groups had name attribute\n"); ret = EOK; goto done; } - DEBUG(SSSDBG_TRACE_FUNC, ("Need to resolve %zu groups\n", - state->num_groups)); + DEBUG(SSSDBG_TRACE_FUNC, "Need to resolve %zu groups\n", + state->num_groups); state->giter = 0; subreq = simple_resolve_group_send(req, state->ev, state->ctx, state->lookup_groups[state->giter].domain, @@ -530,8 +530,8 @@ static void simple_check_get_groups_next(struct tevent_req *subreq) talloc_zfree(subreq); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not resolve name of group with GID %"SPRIgid"\n", - state->lookup_groups[state->giter].gid)); + "Could not resolve name of group with GID %"SPRIgid"\n", + state->lookup_groups[state->giter].gid); tevent_req_error(req, ret); return; } @@ -551,7 +551,7 @@ static void simple_check_get_groups_next(struct tevent_req *subreq) return; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("All groups resolved. Done.\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "All groups resolved. Done.\n"); tevent_req_done(req); } @@ -576,7 +576,7 @@ simple_check_process_group(struct simple_check_groups_state *state, if (gid == 0) { if (posix == true) { - DEBUG(SSSDBG_CRIT_FAILURE, ("POSIX group without GID\n")); + DEBUG(SSSDBG_CRIT_FAILURE, "POSIX group without GID\n"); return EINVAL; } @@ -588,7 +588,7 @@ simple_check_process_group(struct simple_check_groups_state *state, if (!state->group_names[state->num_names]) { return ENOMEM; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding group %s\n", name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Adding group %s\n", name); state->num_names++; return EOK; } @@ -601,7 +601,7 @@ simple_check_process_group(struct simple_check_groups_state *state, if (!state->group_names[state->num_names]) { return ENOMEM; } - DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding group %s\n", name)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Adding group %s\n", name); state->num_names++; return EOK; } @@ -614,8 +614,8 @@ simple_check_process_group(struct simple_check_groups_state *state, } else { domain = find_subdomain_by_sid(state->ctx->domain, group_sid); if (domain == NULL) { - DEBUG(SSSDBG_CRIT_FAILURE, ("There is no domain information for " - "SID %s\n", group_sid)); + DEBUG(SSSDBG_CRIT_FAILURE, "There is no domain information for " + "SID %s\n", group_sid); return ENOENT; } } @@ -623,7 +623,7 @@ simple_check_process_group(struct simple_check_groups_state *state, /* It is a non-posix group with a GID. Needs resolving */ state->lookup_groups[state->num_groups].domain = domain; state->lookup_groups[state->num_groups].gid = gid; - DEBUG(SSSDBG_TRACE_INTERNAL, ("Adding GID %"SPRIgid"\n", gid)); + DEBUG(SSSDBG_TRACE_INTERNAL, "Adding GID %"SPRIgid"\n", gid); state->num_groups++; return EOK; } @@ -641,8 +641,8 @@ simple_check_get_groups_primary(struct simple_check_groups_state *state, gid, group_attrs, &msg); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not look up primary group [%"SPRIgid"]: [%d][%s]\n", - gid, ret, sss_strerror(ret))); + "Could not look up primary group [%"SPRIgid"]: [%d][%s]\n", + gid, ret, sss_strerror(ret)); /* We have to treat this as non-fatal, because the primary * group may be local to the machine and not available in * our ID provider. @@ -650,7 +650,7 @@ simple_check_get_groups_primary(struct simple_check_groups_state *state, } else { ret = simple_check_process_group(state, msg); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Cannot process primary group\n")); + DEBUG(SSSDBG_OP_FAILURE, "Cannot process primary group\n"); return ret; } } @@ -705,7 +705,7 @@ struct tevent_req *simple_access_check_send(TALLOC_CTX *mem_ctx, goto immediate; } - DEBUG(SSSDBG_FUNC_DATA, ("Simple access check for %s\n", username)); + DEBUG(SSSDBG_FUNC_DATA, "Simple access check for %s\n", username); ret = simple_check_users(ctx, username, &state->access_granted); if (ret == EOK) { @@ -721,7 +721,7 @@ struct tevent_req *simple_access_check_send(TALLOC_CTX *mem_ctx, /* There are no group restrictions, so just return * here with whatever we've decided. */ - DEBUG(SSSDBG_TRACE_LIBS, ("No group restrictions, end request\n")); + DEBUG(SSSDBG_TRACE_LIBS, "No group restrictions, end request\n"); ret = EOK; goto immediate; } @@ -767,7 +767,7 @@ static void simple_access_check_done(struct tevent_req *subreq) return; } else if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, - ("Could not collect groups of user %s\n", state->username)); + "Could not collect groups of user %s\n", state->username); tevent_req_error(req, ret); return; } @@ -775,14 +775,14 @@ static void simple_access_check_done(struct tevent_req *subreq) ret = simple_check_groups(state->ctx, state->group_names, &state->access_granted); if (ret != EOK) { - DEBUG(SSSDBG_OP_FAILURE, ("Could not check group access [%d]: %s\n", - ret, sss_strerror(ret))); + DEBUG(SSSDBG_OP_FAILURE, "Could not check group access [%d]: %s\n", + ret, sss_strerror(ret)); tevent_req_error(req, ERR_INTERNAL); return; } /* Now just return whatever we decided */ - DEBUG(SSSDBG_TRACE_INTERNAL, ("Group check done\n")); + DEBUG(SSSDBG_TRACE_INTERNAL, "Group check done\n"); tevent_req_done(req); } @@ -794,7 +794,7 @@ errno_t simple_access_check_recv(struct tevent_req *req, bool *access_granted) TEVENT_REQ_RETURN_ON_ERROR(req); DEBUG(SSSDBG_TRACE_LIBS, - ("Access %sgranted\n", state->access_granted ? "" : "not ")); + "Access %sgranted\n", state->access_granted ? "" : "not "); if (access_granted) { *access_granted = state->access_granted; } |