From 3bea01f01d76e1e95a8239c0d3f67073992136a1 Mon Sep 17 00:00:00 2001 From: Jan Zeleny Date: Wed, 14 Dec 2011 07:20:11 -0500 Subject: Don't give memory context in confdb where not needed --- src/responder/autofs/autofssrv.c | 4 ++-- src/responder/nss/nsssrv.c | 12 ++++++------ src/responder/pam/pamsrv.c | 8 ++++---- src/responder/pam/pamsrv_cmd.c | 4 ++-- src/responder/ssh/sshsrv.c | 2 +- src/responder/sudo/sudosrv.c | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/responder') diff --git a/src/responder/autofs/autofssrv.c b/src/responder/autofs/autofssrv.c index 76d270704..096cce9d2 100644 --- a/src/responder/autofs/autofssrv.c +++ b/src/responder/autofs/autofssrv.c @@ -62,7 +62,7 @@ autofs_get_config(struct autofs_ctx *actx, { errno_t ret; - ret = confdb_get_int(cdb, actx, CONFDB_AUTOFS_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_AUTOFS_CONF_ENTRY, CONFDB_AUTOFS_MAP_NEG_TIMEOUT, 15, &actx->neg_timeout); if (ret != EOK) { @@ -142,7 +142,7 @@ autofs_process_init(TALLOC_CTX *mem_ctx, autofs_ctx->rctx->pvt_ctx = autofs_ctx; /* Enable automatic reconnection to the Data Provider */ - ret = confdb_get_int(autofs_ctx->rctx->cdb, autofs_ctx->rctx, + ret = confdb_get_int(autofs_ctx->rctx->cdb, CONFDB_AUTOFS_CONF_ENTRY, CONFDB_SERVICE_RECON_RETRIES, 3, &max_retries); diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index ef66b22fb..f97898d4d 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -135,22 +135,22 @@ static int nss_get_config(struct nss_ctx *nctx, { int ret; - ret = confdb_get_int(cdb, nctx, CONFDB_NSS_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_ENUM_CACHE_TIMEOUT, 120, &nctx->enum_cache_timeout); if (ret != EOK) goto done; - ret = confdb_get_int(cdb, nctx, CONFDB_NSS_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_ENTRY_NEG_TIMEOUT, 15, &nctx->neg_timeout); if (ret != EOK) goto done; - ret = confdb_get_bool(cdb, nctx, CONFDB_NSS_CONF_ENTRY, + ret = confdb_get_bool(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_FILTER_USERS_IN_GROUPS, true, &nctx->filter_users_in_groups); if (ret != EOK) goto done; - ret = confdb_get_int(cdb, nctx, CONFDB_NSS_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_ENTRY_CACHE_NOWAIT_PERCENTAGE, 50, &nctx->cache_refresh_percent); if (ret != EOK) goto done; @@ -288,7 +288,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx, } /* Enable automatic reconnection to the Data Provider */ - ret = confdb_get_int(nctx->rctx->cdb, nctx->rctx, + ret = confdb_get_int(nctx->rctx->cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_SERVICE_RECON_RETRIES, 3, &max_retries); @@ -310,7 +310,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx, } /* Set up file descriptor limits */ - ret = confdb_get_int(nctx->rctx->cdb, nctx->rctx, + ret = confdb_get_int(nctx->rctx->cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_SERVICE_FD_LIMIT, DEFAULT_NSS_FD_LIMIT, diff --git a/src/responder/pam/pamsrv.c b/src/responder/pam/pamsrv.c index 6cb564a7a..fdb232940 100644 --- a/src/responder/pam/pamsrv.c +++ b/src/responder/pam/pamsrv.c @@ -139,7 +139,7 @@ static int pam_process_init(TALLOC_CTX *mem_ctx, /* FIXME: "retries" is too generic, either get it from a global config * or specify these retries are about the sbus connections to DP */ - ret = confdb_get_int(pctx->rctx->cdb, pctx->rctx, CONFDB_PAM_CONF_ENTRY, + ret = confdb_get_int(pctx->rctx->cdb, CONFDB_PAM_CONF_ENTRY, CONFDB_SERVICE_RECON_RETRIES, 3, &max_retries); if (ret != EOK) { DEBUG(0, ("Failed to set up automatic reconnection\n")); @@ -152,13 +152,13 @@ static int pam_process_init(TALLOC_CTX *mem_ctx, } /* Set up the negative cache */ - ret = confdb_get_int(cdb, pctx, CONFDB_NSS_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_NSS_CONF_ENTRY, CONFDB_NSS_ENTRY_NEG_TIMEOUT, 15, &pctx->neg_timeout); if (ret != EOK) goto done; /* Set up the PAM identity timeout */ - ret = confdb_get_int(cdb, pctx, CONFDB_PAM_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_PAM_CONF_ENTRY, CONFDB_PAM_ID_TIMEOUT, 5, &id_timeout); if (ret != EOK) goto done; @@ -187,7 +187,7 @@ static int pam_process_init(TALLOC_CTX *mem_ctx, } /* Set up file descriptor limits */ - ret = confdb_get_int(pctx->rctx->cdb, pctx->rctx, + ret = confdb_get_int(pctx->rctx->cdb, CONFDB_PAM_CONF_ENTRY, CONFDB_SERVICE_FD_LIMIT, DEFAULT_PAM_FD_LIMIT, diff --git a/src/responder/pam/pamsrv_cmd.c b/src/responder/pam/pamsrv_cmd.c index bf5114870..841bbf439 100644 --- a/src/responder/pam/pamsrv_cmd.c +++ b/src/responder/pam/pamsrv_cmd.c @@ -524,7 +524,7 @@ static errno_t filter_responses(struct confdb_ctx *cdb, return ENOMEM; } - ret = confdb_get_int(cdb, tmp_ctx, CONFDB_PAM_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_PAM_CONF_ENTRY, CONFDB_PAM_VERBOSITY, DEFAULT_PAM_VERBOSITY, &pam_verbosity); if (ret != EOK) { @@ -533,7 +533,7 @@ static errno_t filter_responses(struct confdb_ctx *cdb, } - ret = confdb_get_int(cdb, tmp_ctx, CONFDB_PAM_CONF_ENTRY, + ret = confdb_get_int(cdb, CONFDB_PAM_CONF_ENTRY, CONFDB_PAM_PWD_EXPIRATION_WARNING, DEFAULT_PAM_PWD_EXPIRATION_WARNING, &pam_expiration_warning); diff --git a/src/responder/ssh/sshsrv.c b/src/responder/ssh/sshsrv.c index e5bb5b09c..20f44ca9c 100644 --- a/src/responder/ssh/sshsrv.c +++ b/src/responder/ssh/sshsrv.c @@ -113,7 +113,7 @@ int ssh_process_init(TALLOC_CTX *mem_ctx, ssh_ctx->rctx->pvt_ctx = ssh_ctx; /* Enable automatic reconnection to the Data Provider */ - ret = confdb_get_int(ssh_ctx->rctx->cdb, ssh_ctx->rctx, + ret = confdb_get_int(ssh_ctx->rctx->cdb, CONFDB_SSH_CONF_ENTRY, CONFDB_SERVICE_RECON_RETRIES, 3, &max_retries); diff --git a/src/responder/sudo/sudosrv.c b/src/responder/sudo/sudosrv.c index c8e36adc9..137bd3276 100644 --- a/src/responder/sudo/sudosrv.c +++ b/src/responder/sudo/sudosrv.c @@ -114,7 +114,7 @@ int sudo_process_init(TALLOC_CTX *mem_ctx, sudo_ctx->rctx->pvt_ctx = sudo_ctx; /* Enable automatic reconnection to the Data Provider */ - ret = confdb_get_int(sudo_ctx->rctx->cdb, sudo_ctx->rctx, + ret = confdb_get_int(sudo_ctx->rctx->cdb, CONFDB_SUDO_CONF_ENTRY, CONFDB_SERVICE_RECON_RETRIES, 3, &max_retries); @@ -132,7 +132,7 @@ int sudo_process_init(TALLOC_CTX *mem_ctx, /* Get responder options */ /* Get cache_timeout option */ - ret = confdb_get_int(sudo_ctx->rctx->cdb, sudo_ctx, + ret = confdb_get_int(sudo_ctx->rctx->cdb, CONFDB_SUDO_CONF_ENTRY, CONFDB_SUDO_CACHE_TIMEOUT, CONFDB_DEFAULT_SUDO_CACHE_TIMEOUT, &sudo_ctx->cache_timeout); @@ -143,7 +143,7 @@ int sudo_process_init(TALLOC_CTX *mem_ctx, } /* Get sudo_timed option */ - ret = confdb_get_bool(sudo_ctx->rctx->cdb, sudo_ctx, + ret = confdb_get_bool(sudo_ctx->rctx->cdb, CONFDB_SUDO_CONF_ENTRY, CONFDB_SUDO_TIMED, CONFDB_DEFAULT_SUDO_TIMED, &sudo_ctx->timed); -- cgit