diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-07-13 15:58:45 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-07-13 12:51:05 +0200 |
| commit | 80c8f42f058bdcdf639037927c5941190f019a67 (patch) | |
| tree | c95ee3defe65b47be52b8c3782b2a862a72944ec | |
| parent | 43c0a92d23c2be446a9568b9d937e525d676f85e (diff) | |
| download | samba-80c8f42f058bdcdf639037927c5941190f019a67.tar.gz | |
s4-dsdb: another special case for the "member" attribute
thanks to Matthias for his great test suite work!
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 168fbf00f30..706ca33e700 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -395,7 +395,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares) } if (ares->error != LDB_SUCCESS) { - DEBUG(0,("%s failure. Error is: %s\n", __FUNCTION__, ldb_strerror(ares->error))); + DEBUG(5,("%s failure. Error is: %s\n", __FUNCTION__, ldb_strerror(ares->error))); return ldb_module_done(ac->req, controls, ares->response, ares->error); } @@ -1457,6 +1457,11 @@ static int get_parsed_dns(struct ldb_module *module, TALLOC_CTX *mem_ctx, if (ret != LDB_SUCCESS) { ldb_asprintf_errstring(ldb, "Unable to find GUID for DN %s\n", ldb_dn_get_linearized(dn)); + if (ret == LDB_ERR_NO_SUCH_OBJECT && + LDB_FLAG_MOD_TYPE(el->flags) == LDB_FLAG_MOD_DELETE && + ldb_attr_cmp(el->name, "member") == 0) { + return LDB_ERR_UNWILLING_TO_PERFORM; + } return ret; } ret = dsdb_set_extended_dn_guid(dn, p->guid, "GUID"); |