summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2011-03-31 11:09:56 +0200
committerStephen Gallagher <sgallagh@redhat.com>2011-05-24 14:26:32 -0400
commitfa34cc7ea2cb4fed3134ed4206f8e703d8544b76 (patch)
tree7ff97df3989bdf725b4f9ec267ae2cf33ee7d559 /src
parentaa090ec9d9de69151aea58740f699f7131ff0719 (diff)
downloadsssd-fa34cc7ea2cb4fed3134ed4206f8e703d8544b76.tar.gz
sssd-fa34cc7ea2cb4fed3134ed4206f8e703d8544b76.tar.xz
sssd-fa34cc7ea2cb4fed3134ed4206f8e703d8544b76.zip
Only save members for successfully saved groups
Diffstat (limited to 'src')
-rw-r--r--src/providers/ldap/sdap_async_accounts.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/providers/ldap/sdap_async_accounts.c b/src/providers/ldap/sdap_async_accounts.c
index 29a0f9f64..8fd7cf2a3 100644
--- a/src/providers/ldap/sdap_async_accounts.c
+++ b/src/providers/ldap/sdap_async_accounts.c
@@ -909,6 +909,8 @@ static int sdap_save_groups(TALLOC_CTX *memctx,
bool twopass;
int ret;
int i;
+ struct sysdb_attrs **saved_groups = NULL;
+ int nsaved_groups = 0;
switch (opts->schema_type) {
case SDAP_SCHEMA_RFC2307:
@@ -935,6 +937,15 @@ static int sdap_save_groups(TALLOC_CTX *memctx,
goto done;
}
+ if (twopass && !populate_members) {
+ saved_groups = talloc_array(tmpctx, struct sysdb_attrs *,
+ num_groups);
+ if (!saved_groups) {
+ ret = ENOMEM;
+ goto done;
+ }
+ }
+
for (i = 0; i < num_groups; i++) {
usn_value = NULL;
@@ -949,6 +960,10 @@ static int sdap_save_groups(TALLOC_CTX *memctx,
DEBUG(2, ("Failed to store group %d. Ignoring.\n", i));
} else {
DEBUG(9, ("Group %d processed!\n", i));
+ if (twopass && !populate_members) {
+ saved_groups[nsaved_groups] = groups[i];
+ nsaved_groups++;
+ }
}
if (usn_value) {
@@ -968,9 +983,9 @@ static int sdap_save_groups(TALLOC_CTX *memctx,
if (twopass && !populate_members) {
- for (i = 0; i < num_groups; i++) {
+ for (i = 0; i < nsaved_groups; i++) {
- ret = sdap_save_grpmem(tmpctx, sysdb, opts, dom, groups[i]);
+ ret = sdap_save_grpmem(tmpctx, sysdb, opts, dom, saved_groups[i]);
/* Do not fail completely on errors.
* Just report the failure to save and go on */
if (ret) {