>From 18ee74e59058aea84ce6d67e978f259dda4b5e2b Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 15 May 2015 15:22:47 +0200 Subject: [PATCH 4/4] SDAP: Remove unnecessary argument from sdap_save_user --- src/providers/ldap/ldap_id.c | 2 +- src/providers/ldap/sdap_async_initgroups.c | 2 +- src/providers/ldap/sdap_async_users.c | 4 +--- src/providers/ldap/sdap_users.h | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/providers/ldap/ldap_id.c b/src/providers/ldap/ldap_id.c index 034d5272b8d4d851a8055096329cea0824f06861..33c039082ef2d406578de3ac8d66561ce42fc793 100644 --- a/src/providers/ldap/ldap_id.c +++ b/src/providers/ldap/ldap_id.c @@ -434,7 +434,7 @@ static void users_get_done(struct tevent_req *subreq) name, uid, &usr_attrs); if (ret == EOK) { ret = sdap_save_user(state, state->ctx->opts, state->domain, - usr_attrs[0], false, NULL, 0); + usr_attrs[0], NULL, 0); } } } diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c index 4f775d76b77a311c3394beec4546c4f6c7dc5f6f..4d9738ee6bdfaf6cb3c50ad8bf5a953ed6c7a488 100644 --- a/src/providers/ldap/sdap_async_initgroups.c +++ b/src/providers/ldap/sdap_async_initgroups.c @@ -2930,7 +2930,7 @@ static void sdap_get_initgr_user(struct tevent_req *subreq) DEBUG(SSSDBG_TRACE_ALL, "Storing the user\n"); ret = sdap_save_user(state, state->opts, state->dom, state->orig_user, - true, NULL, 0); + 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 89e5ae558fb87e64eb87413b6ac306af849039c2..416bedda8491fae5385e6b6a074b4cf05ae86b65 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -116,7 +116,6 @@ int sdap_save_user(TALLOC_CTX *memctx, struct sdap_options *opts, struct sss_domain_info *dom, struct sysdb_attrs *attrs, - bool is_initgr, char **_usn_value, time_t now) { @@ -547,8 +546,7 @@ int sdap_save_users(TALLOC_CTX *memctx, for (i = 0; i < num_users; i++) { usn_value = NULL; - ret = sdap_save_user(tmpctx, opts, dom, users[i], false, - &usn_value, now); + ret = sdap_save_user(tmpctx, opts, dom, users[i], &usn_value, now); /* Do not fail completely on errors. * Just report the failure to save and go on */ diff --git a/src/providers/ldap/sdap_users.h b/src/providers/ldap/sdap_users.h index e452a44b9e376d55304e463733adc451406f8687..1cc1cd1fa665a6c872236c14abbb9fc8482116ec 100644 --- a/src/providers/ldap/sdap_users.h +++ b/src/providers/ldap/sdap_users.h @@ -35,7 +35,6 @@ int sdap_save_user(TALLOC_CTX *memctx, struct sdap_options *opts, struct sss_domain_info *dom, struct sysdb_attrs *attrs, - bool is_initgr, char **_usn_value, time_t now); -- 2.4.0