summaryrefslogtreecommitdiffstats
path: root/src/providers
diff options
context:
space:
mode:
authorJan Zeleny <jzeleny@redhat.com>2011-12-14 07:20:11 -0500
committerStephen Gallagher <sgallagh@redhat.com>2012-02-21 21:28:49 -0500
commit3bea01f01d76e1e95a8239c0d3f67073992136a1 (patch)
tree5da8c3f66905726489fcffba5934db221f6dbed4 /src/providers
parent3e5caddf4840e40b49ccf24e1ce7b531a692023b (diff)
downloadsssd-3bea01f01d76e1e95a8239c0d3f67073992136a1.tar.gz
sssd-3bea01f01d76e1e95a8239c0d3f67073992136a1.tar.xz
sssd-3bea01f01d76e1e95a8239c0d3f67073992136a1.zip
Don't give memory context in confdb where not needed
Diffstat (limited to 'src/providers')
-rw-r--r--src/providers/data_provider_fo.c7
-rw-r--r--src/providers/data_provider_opts.c4
-rw-r--r--src/providers/ipa/ipa_dyndns.c2
-rw-r--r--src/providers/ldap/ldap_common.c2
4 files changed, 7 insertions, 8 deletions
diff --git a/src/providers/data_provider_fo.c b/src/providers/data_provider_fo.c
index dd73e9d97..81c94f337 100644
--- a/src/providers/data_provider_fo.c
+++ b/src/providers/data_provider_fo.c
@@ -67,7 +67,7 @@ static int be_fo_get_options(struct be_ctx *ctx,
{
errno_t ret;
- ret = confdb_get_int(ctx->cdb, ctx, ctx->conf_path,
+ ret = confdb_get_int(ctx->cdb, ctx->conf_path,
CONFDB_DOMAIN_RESOLV_TIMEOUT,
FO_DEFAULT_SVC_TIMEOUT,
&opts->service_resolv_timeout);
@@ -102,10 +102,9 @@ int be_init_failover(struct be_ctx *ctx)
return ENOMEM;
}
- ret = confdb_get_int(ctx->cdb, ctx, ctx->conf_path,
+ ret = confdb_get_int(ctx->cdb, ctx->conf_path,
CONFDB_DOMAIN_RESOLV_OP_TIMEOUT,
- RESOLV_DEFAULT_TIMEOUT,
- &resolv_timeout);
+ RESOLV_DEFAULT_TIMEOUT, &resolv_timeout);
if (ret != EOK) {
return ret;
}
diff --git a/src/providers/data_provider_opts.c b/src/providers/data_provider_opts.c
index 3fdbb055c..94849991c 100644
--- a/src/providers/data_provider_opts.c
+++ b/src/providers/data_provider_opts.c
@@ -85,7 +85,7 @@ int dp_get_options(TALLOC_CTX *memctx,
break;
case DP_OPT_NUMBER:
- ret = confdb_get_int(cdb, opts, conf_path,
+ ret = confdb_get_int(cdb, conf_path,
opts[i].opt_name,
opts[i].def_val.number,
&opts[i].val.number);
@@ -99,7 +99,7 @@ int dp_get_options(TALLOC_CTX *memctx,
break;
case DP_OPT_BOOL:
- ret = confdb_get_bool(cdb, opts, conf_path,
+ ret = confdb_get_bool(cdb, conf_path,
opts[i].opt_name,
opts[i].def_val.boolean,
&opts[i].val.boolean);
diff --git a/src/providers/ipa/ipa_dyndns.c b/src/providers/ipa/ipa_dyndns.c
index 0d2c34e66..1e4d97ed8 100644
--- a/src/providers/ipa/ipa_dyndns.c
+++ b/src/providers/ipa/ipa_dyndns.c
@@ -144,7 +144,7 @@ errno_t ipa_dyndns_init(struct be_ctx *be_ctx,
errno_t ret;
int resolv_timeout;
- ret = confdb_get_int(be_ctx->cdb, be_ctx, be_ctx->conf_path,
+ ret = confdb_get_int(be_ctx->cdb, be_ctx->conf_path,
CONFDB_DOMAIN_RESOLV_TIMEOUT,
RESOLV_DEFAULT_TIMEOUT, &resolv_timeout);
if (ret != EOK) {
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index 4f78313bc..cec3989d0 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -376,7 +376,7 @@ int ldap_get_options(TALLOC_CTX *memctx,
}
/* account_cache_expiration must be >= than offline_credentials_expiration */
- ret = confdb_get_int(cdb, memctx, CONFDB_PAM_CONF_ENTRY,
+ ret = confdb_get_int(cdb, CONFDB_PAM_CONF_ENTRY,
CONFDB_PAM_CRED_TIMEOUT, 0,
&offline_credentials_expiration);
if (ret != EOK) {