63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
|
From d58ae3b51f2f87e7ff1024ae25cb996ce91cae55 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Reichl <preichl@redhat.com>
|
||
|
|
Date: Sun, 11 Oct 2015 22:33:08 +0200
|
||
|
|
Subject: [PATCH 11/49] sudo: remove unused param. in ldap_get_sudo_options
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Remove unused talloc memory context.
|
||
|
|
|
||
|
|
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
|
||
|
|
(cherry picked from commit 8835ecb2ff5126629993a6b6d3fb0bb7baa3b765)
|
||
|
|
---
|
||
|
|
src/providers/ldap/ldap_common.h | 3 +--
|
||
|
|
src/providers/ldap/ldap_options.c | 3 +--
|
||
|
|
src/providers/ldap/sdap_sudo.c | 2 +-
|
||
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h
|
||
|
|
index f552520a0503908f82b845f8e813cf67306ec954..ae45fb71b5cf7edab618a829057357bea2d6844b 100644
|
||
|
|
--- a/src/providers/ldap/ldap_common.h
|
||
|
|
+++ b/src/providers/ldap/ldap_common.h
|
||
|
|
@@ -167,8 +167,7 @@ int ldap_get_options(TALLOC_CTX *memctx,
|
||
|
|
const char *conf_path,
|
||
|
|
struct sdap_options **_opts);
|
||
|
|
|
||
|
|
-int ldap_get_sudo_options(TALLOC_CTX *memctx,
|
||
|
|
- struct confdb_ctx *cdb,
|
||
|
|
+int ldap_get_sudo_options(struct confdb_ctx *cdb,
|
||
|
|
const char *conf_path,
|
||
|
|
struct sdap_options *opts,
|
||
|
|
bool *use_host_filter,
|
||
|
|
diff --git a/src/providers/ldap/ldap_options.c b/src/providers/ldap/ldap_options.c
|
||
|
|
index 7ad6071508d0abbb33984c697b833cf12f9e4df9..cf49e41abbea78c1b1fd79e2e0713fba279971be 100644
|
||
|
|
--- a/src/providers/ldap/ldap_options.c
|
||
|
|
+++ b/src/providers/ldap/ldap_options.c
|
||
|
|
@@ -343,8 +343,7 @@ done:
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
-int ldap_get_sudo_options(TALLOC_CTX *memctx,
|
||
|
|
- struct confdb_ctx *cdb,
|
||
|
|
+int ldap_get_sudo_options(struct confdb_ctx *cdb,
|
||
|
|
const char *conf_path,
|
||
|
|
struct sdap_options *opts,
|
||
|
|
bool *use_host_filter,
|
||
|
|
diff --git a/src/providers/ldap/sdap_sudo.c b/src/providers/ldap/sdap_sudo.c
|
||
|
|
index 24642344491dfb93f039bde6a0bfe8fd3e24a80d..550784842c6e6162d153785940c1e37a51b5dc1f 100644
|
||
|
|
--- a/src/providers/ldap/sdap_sudo.c
|
||
|
|
+++ b/src/providers/ldap/sdap_sudo.c
|
||
|
|
@@ -76,7 +76,7 @@ int sdap_sudo_init(struct be_ctx *be_ctx,
|
||
|
|
* so we don't have current usn values available */
|
||
|
|
sudo_ctx->full_refresh_done = false;
|
||
|
|
|
||
|
|
- ret = ldap_get_sudo_options(id_ctx, be_ctx->cdb,
|
||
|
|
+ ret = ldap_get_sudo_options(be_ctx->cdb,
|
||
|
|
be_ctx->conf_path, id_ctx->opts,
|
||
|
|
&sudo_ctx->use_host_filter,
|
||
|
|
&sudo_ctx->include_regexp,
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|