On 10/12/2015 07:37 AM, Lukas Slebodnik wrote:
On (11/10/15 23:17), Pavel Reichl wrote:
Hello, please see simple patch set attached.
From 85deb8e78f6fdbcc064d6184115483381c0174c6 Mon Sep 17 00:00:00 2001
From: Pavel Reichl <[email protected]>
Date: Sun, 11 Oct 2015 22:33:08 +0200
Subject: [PATCH 2/4] sudo: remove unused param. in ldap_get_sudo_options
If you prefer to have all changes in separate patches then
the commit message should be more specific.
remove unused talloc context
remove unused sdap_options ...
LS
OK, please see updated patch set.
>From a5fc8e774cab9c8a78bb7c61ba8df23984985379 Mon Sep 17 00:00:00 2001
From: Pavel Reichl <[email protected]>
Date: Sun, 11 Oct 2015 22:33:08 +0200
Subject: [PATCH 1/3] sudo: remove unused param. in ldap_get_sudo_options
Remove unused talloc memory context.
---
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 edef44208b69af454da0fc906e608b91d5634e90..ccc775fb0c3b8a1e4dd9209265ba7cad37570494 100644
--- a/src/providers/ldap/sdap_sudo.c
+++ b/src/providers/ldap/sdap_sudo.c
@@ -144,7 +144,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.4.3
>From 1dc282eb91423bd3c37d62997526395948f1e4e2 Mon Sep 17 00:00:00 2001
From: Pavel Reichl <[email protected]>
Date: Sun, 11 Oct 2015 22:41:21 +0200
Subject: [PATCH 2/3] autofs: remove unused params in del_autofs_entries
Remove unused sdap_options and map parameters.
---
src/providers/ldap/sdap_async_autofs.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/providers/ldap/sdap_async_autofs.c b/src/providers/ldap/sdap_async_autofs.c
index 1db8d2067a691ac93844d97dd2d53422b1ca3ad2..ed0125885422d2b58bf6fb38ecf01f5dae1d9fa2 100644
--- a/src/providers/ldap/sdap_async_autofs.c
+++ b/src/providers/ldap/sdap_async_autofs.c
@@ -160,8 +160,6 @@ save_autofs_entries(struct sss_domain_info *domain,
static errno_t
del_autofs_entries(struct sss_domain_info *dom,
- struct sdap_options *opts,
- const char *map,
char **del_dn_list)
{
size_t i;
@@ -920,8 +918,7 @@ sdap_autofs_setautomntent_save(struct tevent_req *req)
/* Delete entries that don't exist anymore */
if (del_entries && del_entries[0]) {
- ret = del_autofs_entries(state->dom, state->opts,
- state->mapname, del_entries);
+ ret = del_autofs_entries(state->dom, del_entries);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE,
"Cannot delete autofs entries [%d]: %s\n",
--
2.4.3
>From baaa16d91cf37746b04ba30f588b21af2953b4c2 Mon Sep 17 00:00:00 2001
From: Pavel Reichl <[email protected]>
Date: Sun, 11 Oct 2015 22:42:30 +0200
Subject: [PATCH 3/3] LDAP: remove unused param. in sdap_fallback_local_user
Remove unused sdap_options parameter.
---
src/providers/ldap/ldap_id.c | 3 +--
src/providers/ldap/sdap_async_initgroups.c | 3 +--
src/providers/ldap/sdap_async_users.c | 1 -
src/providers/ldap/sdap_users.h | 5 ++---
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index 905bbd94d36e52e212d118e728f5fe46fa5bc64a..a51c5271b0ccdf4ef0671e8292aa06c7988ffc5b 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -474,8 +474,7 @@ static void users_get_done(struct tevent_req *subreq)
}
if (fallback) {
- ret = sdap_fallback_local_user(state, state->ctx->opts,
- name, uid, &usr_attrs);
+ ret = sdap_fallback_local_user(state, name, uid, &usr_attrs);
if (ret == EOK) {
ret = sdap_save_user(state, state->ctx->opts, state->domain,
usr_attrs[0], NULL, 0);
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index ffb8f7e1f5db5564f45c4f5b7aff46139e64537d..e9fcb272d3e906555c63d51e0aab90d1f575f3f8 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -2868,8 +2868,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
if ((state->opts->schema_type == SDAP_SCHEMA_RFC2307) &&
(dp_opt_get_bool(state->opts->basic,
SDAP_RFC2307_FALLBACK_TO_LOCAL_USERS) == true)) {
- ret = sdap_fallback_local_user(state, state->opts,
- state->name, -1, &usr_attrs);
+ ret = sdap_fallback_local_user(state, state->name, -1, &usr_attrs);
} else {
ret = ENOENT;
}
diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index 865439cadeb4f9f9452b1549663691c29e52f27b..25304d4bfec7303c321699880b445f5620727231 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -940,7 +940,6 @@ int sdap_get_users_recv(struct tevent_req *req,
/* ==Fetch-Fallback-local-user============================================ */
errno_t sdap_fallback_local_user(TALLOC_CTX *memctx,
- struct sdap_options *opts,
const char *name, uid_t uid,
struct sysdb_attrs ***reply)
{
diff --git a/src/providers/ldap/sdap_users.h b/src/providers/ldap/sdap_users.h
index 1cc1cd1fa665a6c872236c14abbb9fc8482116ec..78dafb31a2a07e7289055daec77c5dc5da1bdeef 100644
--- a/src/providers/ldap/sdap_users.h
+++ b/src/providers/ldap/sdap_users.h
@@ -27,9 +27,8 @@
/* shared non-async user functions */
errno_t sdap_fallback_local_user(TALLOC_CTX *memctx,
- struct sdap_options *opts,
- const char *name, uid_t uid,
- struct sysdb_attrs ***reply);
+ const char *name, uid_t uid,
+ struct sysdb_attrs ***reply);
int sdap_save_user(TALLOC_CTX *memctx,
struct sdap_options *opts,
--
2.4.3
_______________________________________________
sssd-devel mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
