diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-07-19 17:39:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-07-19 17:39:23 +0200 |
| commit | 8557d14f65212faceb3e7223818b34b8869a0470 (patch) | |
| tree | 77979da96009cd84c850db60a1300b9956fe8587 /source4/dsdb/samdb/ldb_modules/linked_attributes.c | |
| parent | 7a765b65b739c38ea1e3cfc136c92d2fb5ed4fa7 (diff) | |
| parent | 4447bd96b90ce4bfca793d482f9dcbd98e6579a5 (diff) | |
| download | samba-8557d14f65212faceb3e7223818b34b8869a0470.tar.gz samba-8557d14f65212faceb3e7223818b34b8869a0470.tar.bz2 samba-8557d14f65212faceb3e7223818b34b8869a0470.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/linked_attributes.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/linked_attributes.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/linked_attributes.c b/source4/dsdb/samdb/ldb_modules/linked_attributes.c index 4e28c8a149..9ed06a9130 100644 --- a/source4/dsdb/samdb/ldb_modules/linked_attributes.c +++ b/source4/dsdb/samdb/ldb_modules/linked_attributes.c @@ -741,15 +741,15 @@ static int la_op_search_callback(struct ldb_request *req, if (ret != LDB_SUCCESS) { return ldb_module_done(ac->req, NULL, NULL, ret); } - break; - case LDB_RENAME: - + return ret; + + case LDB_RENAME: + /* start the mod requests chain */ ret = la_do_mod_request(ac); if (ret != LDB_SUCCESS) { return ldb_module_done(ac->req, NULL, NULL, ret); - } - + } return ret; default: @@ -759,7 +759,6 @@ static int la_op_search_callback(struct ldb_request *req, return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_OPERATIONS_ERROR); } - return LDB_SUCCESS; } talloc_free(ares); |