[SSSD] [PATCHES] Remove unused parameter after sysdb refactoring
Lukas Slebodnik
lslebodn at redhat.com
Fri Nov 15 22:59:17 UTC 2013
ehlo,
there are lof of unused parametres in functions after sysdb refactoring.
Patches are splitted per function for easier review.
I can reduce count of patches after review.
LS
-------------- next part --------------
>From 7c67f5b58879ad32b256849d4bc98a2aa63135a0 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:28:45 +0100
Subject: [PATCH 01/26] Remove unused parameter from sss_selinux_extract_user
---
src/providers/ipa/ipa_selinux.c | 2 +-
src/util/sss_selinux.c | 1 -
src/util/sss_selinux.h | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/providers/ipa/ipa_selinux.c b/src/providers/ipa/ipa_selinux.c
index c77c8f5a5b6751e3668aa3d4c6ff831f89374755..10dc872cb7e491a4a4aac1f71e6ad70cfd805854 100644
--- a/src/providers/ipa/ipa_selinux.c
+++ b/src/providers/ipa/ipa_selinux.c
@@ -223,7 +223,7 @@ ipa_selinux_create_op_ctx(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
op_ctx->domain = domain;
op_ctx->selinux_ctx = selinux_ctx;
- ret = sss_selinux_extract_user(op_ctx, sysdb, domain, username, &op_ctx->user);
+ ret = sss_selinux_extract_user(op_ctx, domain, username, &op_ctx->user);
if (ret != EOK) {
goto fail;
}
diff --git a/src/util/sss_selinux.c b/src/util/sss_selinux.c
index 5315c9c035dbb570df7d878ad3926970dd6ce6c3..f97e3f661e63694ff0651ef6a782f0f3a6bef878 100644
--- a/src/util/sss_selinux.c
+++ b/src/util/sss_selinux.c
@@ -188,7 +188,6 @@ bool sss_selinux_match(struct sysdb_attrs *usermap,
}
errno_t sss_selinux_extract_user(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *username,
struct sysdb_attrs **_user_attrs)
diff --git a/src/util/sss_selinux.h b/src/util/sss_selinux.h
index ae5b2f35519426d2f8ed5ecc16eb9c20daa22bdc..8821e73b628cfe1af9474f4f623acc2886b59c06 100644
--- a/src/util/sss_selinux.h
+++ b/src/util/sss_selinux.h
@@ -40,7 +40,6 @@
errno_t
sss_selinux_extract_user(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *username,
struct sysdb_attrs **_user_attrs);
--
1.8.3.1
-------------- next part --------------
>From c0de7a34404a43d6cbffa690f31306822a2d327c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:31:02 +0100
Subject: [PATCH 02/26] Remove unused parameter from get_user_dn
---
src/providers/ldap/ldap_auth.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/providers/ldap/ldap_auth.c b/src/providers/ldap/ldap_auth.c
index 7cf17376ff36b93172e0368f0140f014f770afc9..7ab25db2973a76baa90be937bb41793634bd97c7 100644
--- a/src/providers/ldap/ldap_auth.c
+++ b/src/providers/ldap/ldap_auth.c
@@ -345,7 +345,6 @@ shadow_fail:
/* ==Get-User-DN========================================================== */
static int get_user_dn(TALLOC_CTX *memctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
struct sdap_options *opts,
const char *username,
@@ -607,7 +606,7 @@ static void auth_connect_done(struct tevent_req *subreq)
state->srv, PORT_WORKING);
}
- ret = get_user_dn(state, state->ctx->be->domain->sysdb, state->ctx->be->domain,
+ ret = get_user_dn(state, state->ctx->be->domain,
state->ctx->opts, state->username, &state->dn,
&state->pw_expire_type, &state->pw_expire_data);
if (ret) {
--
1.8.3.1
-------------- next part --------------
>From 3744dd80a8bb8d7ffca8de547bfc9767fc31b625 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:35:39 +0100
Subject: [PATCH 03/26] Remove unused parameter from sdap_save_user
---
src/providers/ldap/ldap_id.c | 3 +--
src/providers/ldap/sdap_async_initgroups.c | 4 +---
src/providers/ldap/sdap_async_users.c | 4 +---
src/providers/ldap/sdap_users.h | 1 -
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c
index b92f07dd09c30c47ba5a2d4d23edee47fa25930f..6fb67516153629309638c3400afa03be6dbaad2f 100644
--- a/src/providers/ldap/ldap_id.c
+++ b/src/providers/ldap/ldap_id.c
@@ -325,8 +325,7 @@ static void users_get_done(struct tevent_req *subreq)
ret = sdap_fallback_local_user(state, state->ctx->opts,
name, uid, &usr_attrs);
if (ret == EOK) {
- ret = sdap_save_user(state, state->sysdb,
- state->ctx->opts, state->domain,
+ ret = sdap_save_user(state, state->ctx->opts, state->domain,
usr_attrs[0], false, NULL, 0);
}
}
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
index 22df38148fcc2035b0194e35f113d4036ed492f3..91a3a82de7da58cd2489e46cdb822714e9697351 100644
--- a/src/providers/ldap/sdap_async_initgroups.c
+++ b/src/providers/ldap/sdap_async_initgroups.c
@@ -2797,9 +2797,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq)
DEBUG(9, ("Storing the user\n"));
- ret = sdap_save_user(state, state->sysdb,
- state->opts, state->dom,
- state->orig_user,
+ ret = sdap_save_user(state, state->opts, state->dom, state->orig_user,
true, NULL, 0);
if (ret) {
goto fail;
diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c
index 488df512053a17264dcab6e02e1a7bd206e316c1..50f493f81057a0556c6981c901024d24a965ac04 100644
--- a/src/providers/ldap/sdap_async_users.c
+++ b/src/providers/ldap/sdap_async_users.c
@@ -95,7 +95,6 @@ done:
/* FIXME: support storing additional attributes */
int sdap_save_user(TALLOC_CTX *memctx,
- struct sysdb_ctx *ctx,
struct sdap_options *opts,
struct sss_domain_info *dom,
struct sysdb_attrs *attrs,
@@ -527,8 +526,7 @@ int sdap_save_users(TALLOC_CTX *memctx,
for (i = 0; i < num_users; i++) {
usn_value = NULL;
- ret = sdap_save_user(tmpctx, sysdb, opts, dom,
- users[i], false,
+ ret = sdap_save_user(tmpctx, opts, dom, users[i], false,
&usn_value, now);
/* Do not fail completely on errors.
diff --git a/src/providers/ldap/sdap_users.h b/src/providers/ldap/sdap_users.h
index 16620a9edbdebe94a8be3846baa491281dcdc5f8..e452a44b9e376d55304e463733adc451406f8687 100644
--- a/src/providers/ldap/sdap_users.h
+++ b/src/providers/ldap/sdap_users.h
@@ -32,7 +32,6 @@ errno_t sdap_fallback_local_user(TALLOC_CTX *memctx,
struct sysdb_attrs ***reply);
int sdap_save_user(TALLOC_CTX *memctx,
- struct sysdb_ctx *ctx,
struct sdap_options *opts,
struct sss_domain_info *dom,
struct sysdb_attrs *attrs,
--
1.8.3.1
-------------- next part --------------
>From f3fb27113f24bef006975e11a94169de74ea782a Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:41:19 +0100
Subject: [PATCH 04/26] Remove unused parameter from
sdap_get_members_with_primary_gid
---
src/providers/ldap/sdap_async_groups.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index ff4f1bbc1601b494d966c09b4d7af93cd8721d5b..0e76d1b444f7c21983deced7da1328f3a153b81d 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -93,7 +93,7 @@ done:
}
static errno_t
-sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
+sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx,
struct sss_domain_info *domain,
gid_t gid, char ***_localdn, size_t *_ndn)
{
@@ -149,7 +149,7 @@ sdap_get_members_with_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
static errno_t
sdap_dn_by_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_attrs *ldap_attrs,
- struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
+ struct sss_domain_info *domain,
struct sdap_options *opts,
char ***_dn_list, size_t *_count)
{
@@ -168,7 +168,7 @@ sdap_dn_by_primary_gid(TALLOC_CTX *mem_ctx, struct sysdb_attrs *ldap_attrs,
return ret;
}
- ret = sdap_get_members_with_primary_gid(mem_ctx, sysdb, domain, gid,
+ ret = sdap_get_members_with_primary_gid(mem_ctx, domain, gid,
_dn_list, _count);
if (ret) return ret;
@@ -709,7 +709,7 @@ static int sdap_save_grpmem(TALLOC_CTX *memctx,
* are reported with tokenGroups, too
*/
if (opts->schema_type == SDAP_SCHEMA_AD) {
- ret = sdap_dn_by_primary_gid(memctx, attrs, ctx, dom, opts,
+ ret = sdap_dn_by_primary_gid(memctx, attrs, dom, opts,
&userdns, &nuserdns);
if (ret != EOK) {
goto fail;
--
1.8.3.1
-------------- next part --------------
>From 51f9aa3c992983784f6cf6a7d620177435f577b6 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:53:13 +0100
Subject: [PATCH 05/26] Remove unused parameter from sdap_store_group_with_gid
---
src/providers/ldap/sdap_async_groups.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index 0e76d1b444f7c21983deced7da1328f3a153b81d..2647fa6e2a797ef9672c02e33c4e5a3f34e37a07 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -280,8 +280,7 @@ done:
/* FIXME: support storing additional attributes */
static errno_t
-sdap_store_group_with_gid(struct sysdb_ctx *ctx,
- struct sss_domain_info *domain,
+sdap_store_group_with_gid(struct sss_domain_info *domain,
const char *name,
gid_t gid,
struct sysdb_attrs *group_attrs,
@@ -431,7 +430,6 @@ sdap_process_ghost_members(struct sysdb_attrs *attrs,
}
static int sdap_save_group(TALLOC_CTX *memctx,
- struct sysdb_ctx *ctx,
struct sdap_options *opts,
struct sss_domain_info *dom,
struct sysdb_attrs *attrs,
@@ -648,8 +646,7 @@ static int sdap_save_group(TALLOC_CTX *memctx,
}
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,
+ ret = sdap_store_group_with_gid(dom, group_name, gid, group_attrs,
dom->group_timeout,
posix_group, now);
if (ret) {
@@ -823,8 +820,7 @@ static int sdap_save_groups(TALLOC_CTX *memctx,
usn_value = NULL;
/* if 2 pass savemembers = false */
- ret = sdap_save_group(tmpctx, sysdb,
- opts, dom, groups[i],
+ ret = sdap_save_group(tmpctx, opts, dom, groups[i],
populate_members, has_nesting,
ghosts, &usn_value, now);
--
1.8.3.1
-------------- next part --------------
>From 9f45c1ad5db2bf5f7841dd9a3c44cd2367b72f77 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:54:28 +0100
Subject: [PATCH 06/26] Remove unused parameter from sdap_add_group_member_2307
---
src/providers/ldap/sdap_async_groups.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index 2647fa6e2a797ef9672c02e33c4e5a3f34e37a07..fc811cd43d4caf315d2131510694b96a828f04dd 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -1210,7 +1210,6 @@ sdap_process_group_members_2307bis(struct tevent_req *req,
static int
sdap_add_group_member_2307(struct ldb_message_element *sysdb_dns,
- struct sss_domain_info *dom,
const char *username)
{
sysdb_dns->values[sysdb_dns->num_values].data =
@@ -1272,14 +1271,14 @@ sdap_process_missing_member_2307(struct sdap_process_group_state *state,
return ENOMEM;
}
- ret = sdap_add_group_member_2307(state->sysdb_dns, state->dom, user_dn);
+ ret = sdap_add_group_member_2307(state->sysdb_dns, user_dn);
if (ret != EOK) {
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"));
- ret = sdap_add_group_member_2307(state->ghost_dns, state->dom, member_name);
+ ret = sdap_add_group_member_2307(state->ghost_dns, member_name);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not add group member %s\n", member_name));
}
@@ -1325,7 +1324,7 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state,
return ENOMEM;
}
- ret = sdap_add_group_member_2307(state->sysdb_dns, state->dom, userdn);
+ ret = sdap_add_group_member_2307(state->sysdb_dns, userdn);
if (ret != EOK) {
DEBUG(1, ("Could not add member %s into sysdb\n", member_name));
goto done;
--
1.8.3.1
-------------- next part --------------
>From be815250a26fb5c61408b0f8775465b10fdfe7f0 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 11:56:10 +0100
Subject: [PATCH 07/26] Remove unused parameter from
sdap_process_missing_member_2307
---
src/providers/ldap/sdap_async_groups.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/providers/ldap/sdap_async_groups.c b/src/providers/ldap/sdap_async_groups.c
index fc811cd43d4caf315d2131510694b96a828f04dd..1131140692b9872fb22ef7163df5523e23b71f36 100644
--- a/src/providers/ldap/sdap_async_groups.c
+++ b/src/providers/ldap/sdap_async_groups.c
@@ -1226,7 +1226,7 @@ sdap_add_group_member_2307(struct ldb_message_element *sysdb_dns,
static int
sdap_process_missing_member_2307(struct sdap_process_group_state *state,
- char *member_name, time_t now)
+ char *member_name)
{
int ret;
TALLOC_CTX *tmp_ctx;
@@ -1300,10 +1300,8 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state,
char *member_name;
char *userdn;
int ret;
- time_t now;
int i;
- now = time(NULL);
for (i=0; i < memberel->num_values; i++) {
member_name = (char *)memberel->values[i].data;
@@ -1334,7 +1332,7 @@ sdap_process_group_members_2307(struct sdap_process_group_state *state,
DEBUG(7, ("member #%d (%s): not found in sysdb\n",
i, member_name));
- ret = sdap_process_missing_member_2307(state, member_name, now);
+ ret = sdap_process_missing_member_2307(state, member_name);
if (ret != EOK) {
DEBUG(1, ("Error processing missing member #%d (%s):\n",
i, member_name));
--
1.8.3.1
-------------- next part --------------
>From c4bf55bf583926fca2082702fc1317cbbe64f190 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:01:21 +0100
Subject: [PATCH 08/26] Remove unused parameter from sdap_save_netgroup
---
src/providers/ldap/sdap_async_netgroups.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/providers/ldap/sdap_async_netgroups.c b/src/providers/ldap/sdap_async_netgroups.c
index 710e6c78a44f1c4c296e126112e85a6d0c294195..217c2c5ed30d7fde15747c8bd10a03a34ab5e394 100644
--- a/src/providers/ldap/sdap_async_netgroups.c
+++ b/src/providers/ldap/sdap_async_netgroups.c
@@ -39,7 +39,6 @@ bool is_dn(const char *str)
}
static errno_t sdap_save_netgroup(TALLOC_CTX *memctx,
- struct sysdb_ctx *ctx,
struct sss_domain_info *dom,
struct sdap_options *opts,
struct sysdb_attrs *attrs,
@@ -201,7 +200,6 @@ struct netgr_translate_members_state {
struct tevent_context *ev;
struct sdap_options *opts;
struct sdap_handle *sh;
- struct sysdb_ctx *sysdb;
struct sysdb_attrs **netgroups;
size_t count;
@@ -246,7 +244,6 @@ struct tevent_req *netgr_translate_members_send(TALLOC_CTX *memctx,
state->ev = ev;
state->opts = opts;
state->sh = sh;
- state->sysdb = sysdb;
state->netgroups = netgroups;
state->count = count;
state->dn_list = NULL;
@@ -712,7 +709,7 @@ static void netgr_translate_members_done(struct tevent_req *subreq)
now = time(NULL);
for (c = 0; c < state->count; c++) {
- ret = sdap_save_netgroup(state, state->sysdb,
+ ret = sdap_save_netgroup(state,
state->dom,
state->opts,
state->netgroups[c],
--
1.8.3.1
-------------- next part --------------
>From 32ffa9fce82f9bc7316f84f799d275bf08880b78 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:02:30 +0100
Subject: [PATCH 09/26] Remove unused parameter from krb5_auth_cache_creds
---
src/providers/krb5/krb5_auth.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index fc7c79c6cc2eaa7edd9ad1ea7b3b6bb86a9b90da..1891c6d6623e4b91ec8a6e528aa392e48161b1bb 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -253,7 +253,6 @@ errno_t krb5_setup(TALLOC_CTX *mem_ctx, struct pam_data *pd,
static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
struct confdb_ctx *cdb,
struct pam_data *pd, uid_t uid,
@@ -755,7 +754,6 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq)
if (dp_opt_get_bool(kr->krb5_ctx->opts,
KRB5_STORE_PASSWORD_IF_OFFLINE)) {
krb5_auth_cache_creds(state->kr->krb5_ctx,
- state->domain->sysdb,
state->domain,
state->be_ctx->cdb,
kr->pd, kr->uid,
@@ -1113,7 +1111,6 @@ static void krb5_auth_done(struct tevent_req *subreq)
if (dp_opt_get_bool(kr->krb5_ctx->opts,
KRB5_STORE_PASSWORD_IF_OFFLINE)) {
krb5_auth_cache_creds(state->kr->krb5_ctx,
- state->domain->sysdb,
state->domain,
state->be_ctx->cdb,
state->pd, state->kr->uid,
--
1.8.3.1
-------------- next part --------------
>From e7f8b5c8bf0e4117731dc7ace95bc11302fcdac9 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:06:19 +0100
Subject: [PATCH 10/26] Remove unused parameter from krb5_auth_store_creds
---
src/providers/krb5/krb5_auth.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index 1891c6d6623e4b91ec8a6e528aa392e48161b1bb..0adf601e9de0beee9ddd7460af16b53619a23681 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -333,8 +333,7 @@ static errno_t krb5_auth_prepare_ccache_name(struct krb5child_req *kr,
return EOK;
}
-static void krb5_auth_store_creds(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+static void krb5_auth_store_creds(struct sss_domain_info *domain,
struct pam_data *pd)
{
const char *password = NULL;
@@ -1125,7 +1124,7 @@ static void krb5_auth_done(struct tevent_req *subreq)
}
if (state->be_ctx->domain->cache_credentials == TRUE && !res->otp) {
- krb5_auth_store_creds(state->sysdb, state->domain, pd);
+ krb5_auth_store_creds(state->domain, pd);
}
state->pam_status = PAM_SUCCESS;
--
1.8.3.1
-------------- next part --------------
>From e6f283b868dfd6c6ebcd6b8bc87f37993e39245c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:08:53 +0100
Subject: [PATCH 11/26] Remove unused parameter from mod_groups_member
---
src/tools/sss_sync_ops.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 121efa6cc259bc9a8a7bfb0655a2d74f15302725..b4b1e99a316ff7df60435584c9be35c8691cd290 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -52,8 +52,7 @@ struct sync_op_res {
/*
* Generic modify groups member
*/
-static int mod_groups_member(struct sysdb_ctx *sysdb,
- struct sss_domain_info *dom,
+static int mod_groups_member(struct sss_domain_info *dom,
char **grouplist,
struct ldb_dn *member_dn,
int optype)
@@ -90,11 +89,11 @@ done:
return ret;
}
-#define add_to_groups(sysdb, data, member_dn) \
- mod_groups_member(sysdb, data->domain, data->addgroups, member_dn, \
+#define add_to_groups(data, member_dn) \
+ mod_groups_member(data->domain, data->addgroups, member_dn, \
LDB_FLAG_MOD_ADD)
-#define remove_from_groups(sysdb, data, member_dn) \
- mod_groups_member(sysdb, data->domain, data->rmgroups, member_dn, \
+#define remove_from_groups(data, member_dn) \
+ mod_groups_member(data->domain, data->rmgroups, member_dn, \
LDB_FLAG_MOD_DELETE)
/*
@@ -226,14 +225,14 @@ int usermod(TALLOC_CTX *mem_ctx,
}
if (data->rmgroups != NULL) {
- ret = remove_from_groups(sysdb, data, member_dn);
+ ret = remove_from_groups(data, member_dn);
if (ret) {
return ret;
}
}
if (data->addgroups != NULL) {
- ret = add_to_groups(sysdb, data, member_dn);
+ ret = add_to_groups(data, member_dn);
if (ret) {
return ret;
}
@@ -281,14 +280,14 @@ int groupmod(TALLOC_CTX *mem_ctx,
}
if (data->rmgroups != NULL) {
- ret = remove_from_groups(sysdb, data, member_dn);
+ ret = remove_from_groups(data, member_dn);
if (ret) {
return ret;
}
}
if (data->addgroups != NULL) {
- ret = add_to_groups(sysdb, data, member_dn);
+ ret = add_to_groups(data, member_dn);
if (ret) {
return ret;
}
@@ -484,7 +483,7 @@ int useradd(TALLOC_CTX *mem_ctx,
goto done;
}
- ret = add_to_groups(sysdb, data, member_dn);
+ ret = add_to_groups(data, member_dn);
if (ret) {
goto done;
}
--
1.8.3.1
-------------- next part --------------
>From 5dbfb191acc89ed8043350bf4bfca7f0300538e6 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:31:06 +0100
Subject: [PATCH 12/26] Remove unused parameter from usermod
---
src/python/pysss.c | 2 +-
src/tools/sss_sync_ops.c | 1 -
src/tools/sss_sync_ops.h | 1 -
src/tools/sss_userdel.c | 2 +-
src/tools/sss_usermod.c | 2 +-
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/python/pysss.c b/src/python/pysss.c
index c516cbffe25d9b929b3851b957e2985e5d1d83a8..8f362ffe0cca575829ccad4549fdb15f5a4cc124 100644
--- a/src/python/pysss.c
+++ b/src/python/pysss.c
@@ -500,7 +500,7 @@ static PyObject *py_sss_usermod(PySssLocalObject *self,
in_transaction = true;
/* usermod */
- tctx->error = usermod(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = usermod(tctx, tctx->octx);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index b4b1e99a316ff7df60435584c9be35c8691cd290..539d09ca43f2300d3f02e672c01ccd2f76b4c874 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -190,7 +190,6 @@ static int usermod_build_attrs(TALLOC_CTX *mem_ctx,
* Public interface for modifying users
*/
int usermod(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data)
{
struct sysdb_attrs *attrs = NULL;
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index c1b7874877ab00ec32c0939c43574aa4a8dba63e..0da497ad4ac50ff6e066d002426f8eb0e00a3243 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -79,7 +79,6 @@ int userdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int usermod(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int groupadd(struct sysdb_ctx *sysdb,
diff --git a/src/tools/sss_userdel.c b/src/tools/sss_userdel.c
index 9d6c088c5bc4fe329773c75f0ca1b6a75b1cd4d3..ad2d5b38acf6e298574bbf3b7cc1eee9590eaf87 100644
--- a/src/tools/sss_userdel.c
+++ b/src/tools/sss_userdel.c
@@ -79,7 +79,7 @@ static int kick_user(struct tools_ctx *tctx)
tctx->octx->lock = 1;
- ret = usermod(tctx, tctx->sysdb, tctx->octx);
+ ret = usermod(tctx, tctx->octx);
if (ret != EOK) {
return ret;
}
diff --git a/src/tools/sss_usermod.c b/src/tools/sss_usermod.c
index 09946e9aca04214bbaa9d4d6d9764793d8406d1f..e0ae99ea05f34d11265f97fa52e6790d20829ab5 100644
--- a/src/tools/sss_usermod.c
+++ b/src/tools/sss_usermod.c
@@ -224,7 +224,7 @@ int main(int argc, const char **argv)
in_transaction = true;
/* usermod */
- tctx->error = usermod(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = usermod(tctx, tctx->octx);
if (tctx->error) {
goto done;
}
--
1.8.3.1
-------------- next part --------------
>From 3a25f4b7ccb38770574d99bba84d8c805f2f2d36 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:34:13 +0100
Subject: [PATCH 13/26] Remove unused parameter from groupmod
---
src/python/pysss.c | 2 +-
src/tools/sss_groupmod.c | 2 +-
src/tools/sss_sync_ops.c | 1 -
src/tools/sss_sync_ops.h | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/python/pysss.c b/src/python/pysss.c
index 8f362ffe0cca575829ccad4549fdb15f5a4cc124..5fecbb3075cf043d978f3d5fcbd0f0f66ee9d4ed 100644
--- a/src/python/pysss.c
+++ b/src/python/pysss.c
@@ -717,7 +717,7 @@ static PyObject *py_sss_groupmod(PySssLocalObject *self,
in_transaction = true;
/* groupmod */
- tctx->error = groupmod(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = groupmod(tctx, tctx->octx);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
diff --git a/src/tools/sss_groupmod.c b/src/tools/sss_groupmod.c
index 10deea885cb05162365ff11ed9a3c8e4d25dbdce..39c46d1cb30983220f95252ab8ca08b9652bc7a3 100644
--- a/src/tools/sss_groupmod.c
+++ b/src/tools/sss_groupmod.c
@@ -202,7 +202,7 @@ int main(int argc, const char **argv)
in_transaction = true;
/* groupmod */
- tctx->error = groupmod(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = groupmod(tctx, tctx->octx);
if (tctx->error) {
goto done;
}
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 539d09ca43f2300d3f02e672c01ccd2f76b4c874..486af85db2d623813dabd3d11085953621b403e4 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -247,7 +247,6 @@ int usermod(TALLOC_CTX *mem_ctx,
* Public interface for modifying groups
*/
int groupmod(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data)
{
struct sysdb_attrs *attrs = NULL;
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index 0da497ad4ac50ff6e066d002426f8eb0e00a3243..5fed1cfa605c8918ba9b9b58b35a7be3b03346c4 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -87,7 +87,6 @@ int groupdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int groupmod(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int sysdb_getpwnam_sync(TALLOC_CTX *mem_ctx,
--
1.8.3.1
-------------- next part --------------
>From 3c466eb456ef7ca0bd9336841288a148df617f82 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:37:30 +0100
Subject: [PATCH 14/26] Remove unused parameter from useradd
---
src/python/pysss.c | 2 +-
src/tools/sss_sync_ops.c | 1 -
src/tools/sss_sync_ops.h | 1 -
src/tools/sss_useradd.c | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/python/pysss.c b/src/python/pysss.c
index 5fecbb3075cf043d978f3d5fcbd0f0f66ee9d4ed..b248313cac1f036a88580a93137992278b8af82a 100644
--- a/src/python/pysss.c
+++ b/src/python/pysss.c
@@ -236,7 +236,7 @@ static PyObject *py_sss_useradd(PySssLocalObject *self,
in_transaction = true;
/* useradd */
- tctx->error = useradd(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = useradd(tctx, tctx->octx);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 486af85db2d623813dabd3d11085953621b403e4..8c3468d1a0683e8c72223a7d18440a58c44bd360 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -460,7 +460,6 @@ done:
* Public interface for adding users
*/
int useradd(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data)
{
int ret;
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index 5fed1cfa605c8918ba9b9b58b35a7be3b03346c4..69d3e5e9faf9819a548ae354fadff8da0fbed8a4 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -73,7 +73,6 @@ int userdel_defaults(TALLOC_CTX *mem_ctx,
/* synchronous operations */
int useradd(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct ops_ctx *data);
int userdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
diff --git a/src/tools/sss_useradd.c b/src/tools/sss_useradd.c
index a1eef8d6408118ed119236ae9096b19646a5ae0d..395b2651cf87ee777cfeb6e700e1dfa31c712e5e 100644
--- a/src/tools/sss_useradd.c
+++ b/src/tools/sss_useradd.c
@@ -187,7 +187,7 @@ int main(int argc, const char **argv)
in_transaction = true;
/* useradd */
- tctx->error = useradd(tctx, tctx->sysdb, tctx->octx);
+ tctx->error = useradd(tctx, tctx->octx);
if (tctx->error) {
goto done;
}
--
1.8.3.1
-------------- next part --------------
>From ddbe70afff4eee9939b118310a9fd00fdc45f12b Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:40:24 +0100
Subject: [PATCH 15/26] Remove unused parameter from groupadd
---
src/python/pysss.c | 2 +-
src/tools/sss_groupadd.c | 2 +-
src/tools/sss_sync_ops.c | 3 +--
src/tools/sss_sync_ops.h | 3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/python/pysss.c b/src/python/pysss.c
index b248313cac1f036a88580a93137992278b8af82a..f56916ddf8cb81f67de891fc5f87513298e14c33 100644
--- a/src/python/pysss.c
+++ b/src/python/pysss.c
@@ -574,7 +574,7 @@ static PyObject *py_sss_groupadd(PySssLocalObject *self,
in_transaction = true;
/* groupadd */
- tctx->error = groupadd(tctx->sysdb, tctx->octx);
+ tctx->error = groupadd(tctx->octx);
if (tctx->error) {
PyErr_SetSssError(tctx->error);
goto fail;
diff --git a/src/tools/sss_groupadd.c b/src/tools/sss_groupadd.c
index 5667e9aa291982ded1e8be3aa9bf17c57b00adea..6e600401d148800aed54a3f869cecf7d4ed043cd 100644
--- a/src/tools/sss_groupadd.c
+++ b/src/tools/sss_groupadd.c
@@ -114,7 +114,7 @@ int main(int argc, const char **argv)
in_transaction = true;
/* groupadd */
- tctx->error = groupadd(tctx->sysdb, tctx->octx);
+ tctx->error = groupadd(tctx->octx);
if (tctx->error) {
goto done;
}
diff --git a/src/tools/sss_sync_ops.c b/src/tools/sss_sync_ops.c
index 8c3468d1a0683e8c72223a7d18440a58c44bd360..9f6176bce32904dec8e4a8c7ba82bf3b4a469e73 100644
--- a/src/tools/sss_sync_ops.c
+++ b/src/tools/sss_sync_ops.c
@@ -523,8 +523,7 @@ int userdel(TALLOC_CTX *mem_ctx,
/*
* Public interface for adding groups
*/
-int groupadd(struct sysdb_ctx *sysdb,
- struct ops_ctx *data)
+int groupadd(struct ops_ctx *data)
{
int ret;
diff --git a/src/tools/sss_sync_ops.h b/src/tools/sss_sync_ops.h
index 69d3e5e9faf9819a548ae354fadff8da0fbed8a4..6b50c5af54f0d824e597d627aa4de02d14e5600c 100644
--- a/src/tools/sss_sync_ops.h
+++ b/src/tools/sss_sync_ops.h
@@ -80,8 +80,7 @@ int userdel(TALLOC_CTX *mem_ctx,
int usermod(TALLOC_CTX *mem_ctx,
struct ops_ctx *data);
-int groupadd(struct sysdb_ctx *sysdb,
- struct ops_ctx *data);
+int groupadd(struct ops_ctx *data);
int groupdel(TALLOC_CTX *mem_ctx,
struct sysdb_ctx *sysdb,
struct ops_ctx *data);
--
1.8.3.1
-------------- next part --------------
>From b0e94e45ab7f7416a76dac0c1ef0ff15fa9f1634 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:42:54 +0100
Subject: [PATCH 16/26] Remove unused parameter from invalidate_entry
---
src/tools/sss_cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index 8a232b7888a36f8f6125f4faabec19b65ccfa7c7..9348551274fd0e8261c719364ed52cff851a2d7f 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -86,7 +86,7 @@ struct cache_tool_ctx {
errno_t init_domains(struct cache_tool_ctx *ctx, const char *domain);
errno_t init_context(int argc, const char *argv[], struct cache_tool_ctx **tctx);
-static errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
+static errno_t invalidate_entry(TALLOC_CTX *ctx,
struct sss_domain_info *domain,
const char *name, int entry_type);
static bool invalidate_entries(TALLOC_CTX *ctx,
@@ -400,7 +400,7 @@ static bool invalidate_entries(TALLOC_CTX *ctx,
ERROR("Couldn't invalidate %1$s", type_string);
iret = false;
} else {
- ret = invalidate_entry(ctx, sysdb, dinfo, c_name, entry_type);
+ ret = invalidate_entry(ctx, dinfo, c_name, entry_type);
if (ret != EOK) {
DEBUG(SSSDBG_MINOR_FAILURE,
("Couldn't invalidate %s %s", type_string, c_name));
@@ -413,7 +413,7 @@ static bool invalidate_entries(TALLOC_CTX *ctx,
return iret;
}
-static errno_t invalidate_entry(TALLOC_CTX *ctx, struct sysdb_ctx *sysdb,
+static errno_t invalidate_entry(TALLOC_CTX *ctx,
struct sss_domain_info *domain,
const char *name, int entry_type)
{
--
1.8.3.1
-------------- next part --------------
>From 421555eb2db6c9ed6d03f0634a7f55747150c233 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:45:30 +0100
Subject: [PATCH 17/26] Remove unused parameter from search_autofsmaps
---
src/tools/sss_cache.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/tools/sss_cache.c b/src/tools/sss_cache.c
index 9348551274fd0e8261c719364ed52cff851a2d7f..0bf029ebbe2c42fab7cd9f878039cdfad357f700 100644
--- a/src/tools/sss_cache.c
+++ b/src/tools/sss_cache.c
@@ -55,7 +55,7 @@ enum sss_cache_entry {
TYPE_AUTOFSMAP
};
-static errno_t search_autofsmaps(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
+static errno_t search_autofsmaps(TALLOC_CTX *mem_ctx,
struct sss_domain_info *domain,
const char *sub_filter, const char **attrs,
size_t *msgs_count, struct ldb_message ***msgs);
@@ -91,7 +91,6 @@ static errno_t invalidate_entry(TALLOC_CTX *ctx,
const char *name, int entry_type);
static bool invalidate_entries(TALLOC_CTX *ctx,
struct sss_domain_info *dinfo,
- struct sysdb_ctx *sysdb,
enum sss_cache_entry entry_type,
const char *filter, const char *name);
static errno_t update_all_filters(struct cache_tool_ctx *tctx,
@@ -139,19 +138,19 @@ int main(int argc, const char *argv[])
goto done;
}
- skipped &= !invalidate_entries(tctx, dinfo, sysdb, TYPE_USER,
+ skipped &= !invalidate_entries(tctx, dinfo, TYPE_USER,
tctx->user_filter,
tctx->user_name);
- skipped &= !invalidate_entries(tctx, dinfo, sysdb, TYPE_GROUP,
+ skipped &= !invalidate_entries(tctx, dinfo, TYPE_GROUP,
tctx->group_filter,
tctx->group_name);
- skipped &= !invalidate_entries(tctx, dinfo, sysdb, TYPE_NETGROUP,
+ skipped &= !invalidate_entries(tctx, dinfo, TYPE_NETGROUP,
tctx->netgroup_filter,
tctx->netgroup_name);
- skipped &= !invalidate_entries(tctx, dinfo, sysdb, TYPE_SERVICE,
+ skipped &= !invalidate_entries(tctx, dinfo, TYPE_SERVICE,
tctx->service_filter,
tctx->service_name);
- skipped &= !invalidate_entries(tctx, dinfo, sysdb, TYPE_AUTOFSMAP,
+ skipped &= !invalidate_entries(tctx, dinfo, TYPE_AUTOFSMAP,
tctx->autofs_filter,
tctx->autofs_name);
@@ -337,7 +336,6 @@ static errno_t update_all_filters(struct cache_tool_ctx *tctx,
static bool invalidate_entries(TALLOC_CTX *ctx,
struct sss_domain_info *dinfo,
- struct sysdb_ctx *sysdb,
enum sss_cache_entry entry_type,
const char *filter, const char *name)
{
@@ -374,8 +372,7 @@ static bool invalidate_entries(TALLOC_CTX *ctx,
break;
case TYPE_AUTOFSMAP:
type_string = "autofs map";
- ret = search_autofsmaps(ctx, sysdb, dinfo,
- filter, attrs, &msg_count, &msgs);
+ ret = search_autofsmaps(ctx, dinfo, filter, attrs, &msg_count, &msgs);
break;
}
@@ -695,7 +692,7 @@ fini:
}
static errno_t
-search_autofsmaps(TALLOC_CTX *mem_ctx, struct sysdb_ctx *sysdb,
+search_autofsmaps(TALLOC_CTX *mem_ctx,
struct sss_domain_info *domain,
const char *sub_filter, const char **attrs,
size_t *msgs_count, struct ldb_message ***msgs)
--
1.8.3.1
-------------- next part --------------
>From fbc1c0fe99d74434bc5893c1e5fca0331cc0a84c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:46:26 +0100
Subject: [PATCH 18/26] Remove unused parameter from seed_domain_user_info
---
src/tools/sss_seed.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/tools/sss_seed.c b/src/tools/sss_seed.c
index cb5a0bfc4e5d6b574303c7659d2939c30d7e91e9..09af8b9b22f35b37f7ae5034b641d8381a9b8630 100644
--- a/src/tools/sss_seed.c
+++ b/src/tools/sss_seed.c
@@ -653,7 +653,6 @@ done:
static int seed_domain_user_info(const char *name,
const char *domain_name,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
bool *is_cached)
{
@@ -805,7 +804,7 @@ int main(int argc, const char **argv)
/* get user info from domain */
ret = seed_domain_user_info(sctx->uctx->name, sctx->uctx->domain_name,
- sctx->sysdb, sctx->domain, &sctx->user_cached);
+ sctx->domain, &sctx->user_cached);
if (ret != EOK) {
DEBUG(SSSDBG_OP_FAILURE, ("Failed lookup of user [%s] in domain [%s]\n",
sctx->uctx->name, sctx->uctx->domain_name));
--
1.8.3.1
-------------- next part --------------
>From 1c475bf3716227855a217b559bd890754372b81a Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:49:14 +0100
Subject: [PATCH 19/26] Remove unused parameter from
sudosrv_get_sudorules_query_cache
---
src/responder/sudo/sudosrv_get_sudorules.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/responder/sudo/sudosrv_get_sudorules.c b/src/responder/sudo/sudosrv_get_sudorules.c
index 16349d567760b1e0d17dce55731879cf8c64bc71..fa461b4f07fc94d85df9fd0d7cf86a3a5b5c9f09 100644
--- a/src/responder/sudo/sudosrv_get_sudorules.c
+++ b/src/responder/sudo/sudosrv_get_sudorules.c
@@ -303,7 +303,6 @@ static void
sudosrv_dp_req_done(struct tevent_req *req);
static errno_t sudosrv_get_sudorules_query_cache(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char **attrs,
unsigned int flags,
@@ -367,7 +366,7 @@ errno_t sudosrv_get_rules(struct sudo_cmd_ctx *cmd_ctx)
| SYSDB_SUDO_FILTER_INCLUDE_DFL
| SYSDB_SUDO_FILTER_ONLY_EXPIRED
| SYSDB_SUDO_FILTER_USERINFO;
- ret = sudosrv_get_sudorules_query_cache(tmp_ctx, cmd_ctx->domain->sysdb,
+ ret = sudosrv_get_sudorules_query_cache(tmp_ctx,
cmd_ctx->domain, attrs, flags,
cmd_ctx->orig_username,
cmd_ctx->uid, groupnames,
@@ -577,7 +576,7 @@ static errno_t sudosrv_get_sudorules_from_cache(TALLOC_CTX *mem_ctx,
break;
}
- ret = sudosrv_get_sudorules_query_cache(tmp_ctx, cmd_ctx->domain->sysdb,
+ ret = sudosrv_get_sudorules_query_cache(tmp_ctx,
cmd_ctx->domain, attrs, flags,
cmd_ctx->orig_username,
cmd_ctx->uid, groupnames,
@@ -609,7 +608,6 @@ static errno_t
sort_sudo_rules(struct sysdb_attrs **rules, size_t count);
static errno_t sudosrv_get_sudorules_query_cache(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char **attrs,
unsigned int flags,
--
1.8.3.1
-------------- next part --------------
>From 382dc121ecaf104c707e4ad1f347cedcdcac5d4f Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 12:55:09 +0100
Subject: [PATCH 20/26] Remove unused parameter from delete_user
---
src/providers/proxy/proxy_id.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 503e325a48b016d446f2dee1e8cf18a21912740f..10a82510a54fc01e31a5b7c4e0decf33c0bafd94 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -39,8 +39,7 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd,
struct sss_domain_info *dom, bool *del_user);
static int
-delete_user(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+delete_user(struct sss_domain_info *domain,
const char *name, uid_t uid);
static int get_pw_name(TALLOC_CTX *mem_ctx,
@@ -91,7 +90,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx,
}
if (del_user) {
- ret = delete_user(sysdb, dom, name, 0);
+ ret = delete_user(dom, name, 0);
goto done;
}
@@ -131,7 +130,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx,
}
if (del_user) {
- ret = delete_user(sysdb, dom, name, uid);
+ ret = delete_user(dom, name, uid);
goto done;
}
@@ -200,8 +199,7 @@ handle_getpw_result(enum nss_status status, struct passwd *pwd,
}
static int
-delete_user(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+delete_user(struct sss_domain_info *domain,
const char *name, uid_t uid)
{
int ret = EOK;
@@ -346,7 +344,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx,
}
if (del_user) {
- ret = delete_user(sysdb, dom, NULL, uid);
+ ret = delete_user(dom, NULL, uid);
goto done;
}
@@ -1193,7 +1191,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx,
}
if (del_user) {
- ret = delete_user(sysdb, dom, name, 0);
+ ret = delete_user(dom, name, 0);
if (ret) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not delete user\n"));
goto fail;
@@ -1237,7 +1235,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx,
}
if (del_user) {
- ret = delete_user(sysdb, dom, name, uid);
+ ret = delete_user(dom, name, uid);
if (ret) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not delete user\n"));
goto fail;
--
1.8.3.1
-------------- next part --------------
>From 0c677e4727f0929dde3d4db125e6cea71d5c148c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 13:16:31 +0100
Subject: [PATCH 21/26] Remove unused parameter from save_user
---
src/providers/proxy/proxy_id.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 10a82510a54fc01e31a5b7c4e0decf33c0bafd94..f78d82b6adfec7daf2328e204d2bd2c01da1ed26 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -30,7 +30,7 @@
/* =Getpwnam-wrapper======================================================*/
-static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
+static int save_user(struct sss_domain_info *domain,
bool lowercase, struct passwd *pwd, const char *real_name,
const char *alias, uint64_t cache_timeout);
@@ -44,7 +44,6 @@ delete_user(struct sss_domain_info *domain,
static int get_pw_name(TALLOC_CTX *mem_ctx,
struct proxy_id_ctx *ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *dom,
const char *name)
{
@@ -135,7 +134,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx,
}
/* Both lookups went fine, we can save the user now */
- ret = save_user(sysdb, dom, !dom->case_sensitive, pwd,
+ ret = save_user(dom, !dom->case_sensitive, pwd,
real_name, name, dom->user_timeout);
done:
@@ -215,7 +214,7 @@ delete_user(struct sss_domain_info *domain,
return ret;
}
-static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
+static int save_user(struct sss_domain_info *domain,
bool lowercase, struct passwd *pwd, const char *real_name,
const char *alias, uint64_t cache_timeout)
{
@@ -303,7 +302,6 @@ static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain,
static int get_pw_uid(TALLOC_CTX *mem_ctx,
struct proxy_id_ctx *ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *dom,
uid_t uid)
{
@@ -348,7 +346,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx,
goto done;
}
- ret = save_user(sysdb, dom, !dom->case_sensitive, pwd,
+ ret = save_user(dom, !dom->case_sensitive, pwd,
pwd->pw_name, NULL, dom->user_timeout);
done:
@@ -471,7 +469,7 @@ static int enum_users(TALLOC_CTX *mem_ctx,
break;
}
- ret = save_user(sysdb, dom, !dom->case_sensitive, pwd,
+ ret = save_user(dom, !dom->case_sensitive, pwd,
pwd->pw_name, NULL, dom->user_timeout);
if (ret) {
/* Do not fail completely on errors.
@@ -1243,7 +1241,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx,
goto done;
}
- ret = save_user(sysdb, dom, !dom->case_sensitive, pwd,
+ ret = save_user(dom, !dom->case_sensitive, pwd,
real_name, name, dom->user_timeout);
if (ret) {
DEBUG(SSSDBG_OP_FAILURE, ("Could not save user\n"));
@@ -1403,7 +1401,7 @@ void proxy_get_account_info(struct be_req *breq)
break;
case BE_FILTER_NAME:
- ret = get_pw_name(breq, ctx, sysdb, domain, ar->filter_value);
+ ret = get_pw_name(breq, ctx, domain, ar->filter_value);
break;
case BE_FILTER_IDNUM:
@@ -1412,7 +1410,7 @@ void proxy_get_account_info(struct be_req *breq)
return be_req_terminate(breq, DP_ERR_FATAL,
EINVAL, "Invalid attr type");
}
- ret = get_pw_uid(breq, ctx, sysdb, domain, uid);
+ ret = get_pw_uid(breq, ctx, domain, uid);
break;
default:
return be_req_terminate(breq, DP_ERR_FATAL,
--
1.8.3.1
-------------- next part --------------
>From 74c9deb9cac56fff9476963d3e86e983d74d8ab9 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 13:17:24 +0100
Subject: [PATCH 22/26] Remove unused parameter from save_netgroup
---
src/providers/proxy/proxy.h | 1 -
src/providers/proxy/proxy_id.c | 2 +-
src/providers/proxy/proxy_netgroup.c | 6 ++----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/providers/proxy/proxy.h b/src/providers/proxy/proxy.h
index 179245fed55cdb096707fe5c8ecf1d49b725928f..7f4dfc984c5a6488f2888f270c771574a4bc1898 100644
--- a/src/providers/proxy/proxy.h
+++ b/src/providers/proxy/proxy.h
@@ -149,7 +149,6 @@ void proxy_pam_handler(struct be_req *req);
/* From proxy_netgroup.c */
errno_t get_netgroup(struct proxy_id_ctx *ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *dom,
const char *name);
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index f78d82b6adfec7daf2328e204d2bd2c01da1ed26..4ed943ad48d0a1989f25ce3514594f892d4606f5 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -1463,7 +1463,7 @@ void proxy_get_account_info(struct be_req *breq)
ENODEV, "Netgroups are not supported");
}
- ret = get_netgroup(ctx, sysdb, domain, ar->filter_value);
+ ret = get_netgroup(ctx, domain, ar->filter_value);
break;
case BE_REQ_SERVICES:
diff --git a/src/providers/proxy/proxy_netgroup.c b/src/providers/proxy/proxy_netgroup.c
index a201b26076f6f6e1f98338a478f23b050af9ed8b..0aeb7cfe47a7fcbbc2844f85f4fe9312fe538857 100644
--- a/src/providers/proxy/proxy_netgroup.c
+++ b/src/providers/proxy/proxy_netgroup.c
@@ -66,8 +66,7 @@ static errno_t make_netgroup_attr(struct __netgrent netgrent,
return EOK;
}
-static errno_t save_netgroup(struct sysdb_ctx *sysdb,
- struct sss_domain_info *domain,
+static errno_t save_netgroup(struct sss_domain_info *domain,
const char *name,
struct sysdb_attrs *attrs,
bool lowercase,
@@ -137,7 +136,6 @@ static errno_t handle_error(enum nss_status status,
}
errno_t get_netgroup(struct proxy_id_ctx *ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *dom,
const char *name)
{
@@ -199,7 +197,7 @@ errno_t get_netgroup(struct proxy_id_ctx *ctx,
goto done;
}
- ret = save_netgroup(sysdb, dom, name, attrs,
+ ret = save_netgroup(dom, name, attrs,
!dom->case_sensitive,
dom->netgroup_timeout);
if (ret != EOK) {
--
1.8.3.1
-------------- next part --------------
>From 4f9683cfc09ba86e01171d07b1788e56d9898f0b Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 13:21:33 +0100
Subject: [PATCH 23/26] Remove unused memory context in proxy
---
src/providers/proxy/proxy_id.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c
index 4ed943ad48d0a1989f25ce3514594f892d4606f5..6e2b175231d32e9e5c6a90d0f094af7757839eca 100644
--- a/src/providers/proxy/proxy_id.c
+++ b/src/providers/proxy/proxy_id.c
@@ -42,8 +42,7 @@ static int
delete_user(struct sss_domain_info *domain,
const char *name, uid_t uid);
-static int get_pw_name(TALLOC_CTX *mem_ctx,
- struct proxy_id_ctx *ctx,
+static int get_pw_name(struct proxy_id_ctx *ctx,
struct sss_domain_info *dom,
const char *name)
{
@@ -300,8 +299,7 @@ static int save_user(struct sss_domain_info *domain,
/* =Getpwuid-wrapper======================================================*/
-static int get_pw_uid(TALLOC_CTX *mem_ctx,
- struct proxy_id_ctx *ctx,
+static int get_pw_uid(struct proxy_id_ctx *ctx,
struct sss_domain_info *dom,
uid_t uid)
{
@@ -775,8 +773,7 @@ handle_getgr_result(enum nss_status status, struct group *grp,
return EOK;
}
-static int get_gr_name(TALLOC_CTX *mem_ctx,
- struct proxy_id_ctx *ctx,
+static int get_gr_name(struct proxy_id_ctx *ctx,
struct sysdb_ctx *sysdb,
struct sss_domain_info *dom,
const char *name)
@@ -1401,7 +1398,7 @@ void proxy_get_account_info(struct be_req *breq)
break;
case BE_FILTER_NAME:
- ret = get_pw_name(breq, ctx, domain, ar->filter_value);
+ ret = get_pw_name(ctx, domain, ar->filter_value);
break;
case BE_FILTER_IDNUM:
@@ -1410,7 +1407,7 @@ void proxy_get_account_info(struct be_req *breq)
return be_req_terminate(breq, DP_ERR_FATAL,
EINVAL, "Invalid attr type");
}
- ret = get_pw_uid(breq, ctx, domain, uid);
+ ret = get_pw_uid(ctx, domain, uid);
break;
default:
return be_req_terminate(breq, DP_ERR_FATAL,
@@ -1424,7 +1421,7 @@ void proxy_get_account_info(struct be_req *breq)
ret = enum_groups(breq, ctx, sysdb, domain);
break;
case BE_FILTER_NAME:
- ret = get_gr_name(breq, ctx, sysdb, domain, ar->filter_value);
+ ret = get_gr_name(ctx, sysdb, domain, ar->filter_value);
break;
case BE_FILTER_IDNUM:
gid = (gid_t) strtouint32(ar->filter_value, &endptr, 10);
--
1.8.3.1
-------------- next part --------------
>From d594c0c647d08b8e4be0d9cad3d424f621759de5 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Sat, 9 Nov 2013 13:23:49 +0100
Subject: [PATCH 24/26] Remove unused parameter from ipa_save_netgroup
---
src/providers/ipa/ipa_netgroups.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/providers/ipa/ipa_netgroups.c b/src/providers/ipa/ipa_netgroups.c
index 245930b106e66490165b068c2dc160a9ebce3f70..5bf7f9e5e64467905225d7490bba75cdbfebb9c4 100644
--- a/src/providers/ipa/ipa_netgroups.c
+++ b/src/providers/ipa/ipa_netgroups.c
@@ -64,7 +64,6 @@ struct ipa_get_netgroups_state {
};
static errno_t ipa_save_netgroup(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *ctx,
struct sss_domain_info *dom,
struct sdap_options *opts,
struct sysdb_attrs *attrs)
@@ -989,7 +988,7 @@ static int ipa_netgr_process_all(struct ipa_get_netgroups_state *state)
}
}
- ret = ipa_save_netgroup(state, state->sysdb, state->dom,
+ ret = ipa_save_netgroup(state, state->dom,
state->opts, state->netgroups[i]);
if (ret != EOK) {
goto done;
--
1.8.3.1
-------------- next part --------------
>From 1199e4227c005d618fc657e60cd79d2ee31fa84b Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 15 Nov 2013 23:15:25 +0100
Subject: [PATCH 25/26] Remove unused parameter from group_show_mpg
---
src/tools/sss_groupshow.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index 224e71c862810256c6c3bed7808e79d002efb41f..f33684519bfe225475abfe6c4c9a8d43cf6e50b9 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -544,7 +544,6 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
/*==================Get info about MPG================================= */
static int group_show_mpg(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *name,
struct group_info **res)
@@ -714,8 +713,7 @@ int main(int argc, const char **argv)
tctx->local, pc_recursive, tctx->octx->name, &root);
/* Also show MPGs */
if (ret == ENOENT) {
- ret = group_show_mpg(tctx, tctx->sysdb, tctx->local,
- tctx->octx->name, &root);
+ ret = group_show_mpg(tctx, tctx->local, tctx->octx->name, &root);
}
/* Process result */
--
1.8.3.1
-------------- next part --------------
>From 760886f1c20c6152935add0e572c59d5fe98727c Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Fri, 15 Nov 2013 23:17:30 +0100
Subject: [PATCH 26/26] Remove unused parameter from group_show_trim_memberof
---
src/tools/sss_groupshow.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/tools/sss_groupshow.c b/src/tools/sss_groupshow.c
index f33684519bfe225475abfe6c4c9a8d43cf6e50b9..02df6d4b4ff593d7ec79e1d1188dab9e73da7cef 100644
--- a/src/tools/sss_groupshow.c
+++ b/src/tools/sss_groupshow.c
@@ -311,7 +311,6 @@ int group_show_recurse(TALLOC_CTX *mem_ctx,
struct group_info ***up_members);
static int group_show_trim_memberof(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *name,
const char **memberofs,
@@ -379,7 +378,7 @@ int group_show(TALLOC_CTX *mem_ctx,
}
/* if not recursive, only show the direct parent */
- ret = group_show_trim_memberof(mem_ctx, sysdb, domain, root->name,
+ ret = group_show_trim_memberof(mem_ctx, domain, root->name,
root->memberofs, &root->memberofs);
goto done;
}
@@ -408,7 +407,6 @@ done:
/*=========Nonrecursive search should only show direct parent========== */
static int group_show_trim_memberof(TALLOC_CTX *mem_ctx,
- struct sysdb_ctx *sysdb,
struct sss_domain_info *domain,
const char *name,
const char **memberofs,
--
1.8.3.1
More information about the sssd-devel
mailing list