diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-12-16 20:45:02 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-12-16 20:56:24 +1100 |
| commit | 558a38671af5ea05d9ee1d815f0c1c2dab41a80c (patch) | |
| tree | 19752f35e1b1868425157accb0a96456ad6bcbb3 /source4/dsdb/samdb/ldb_modules/show_deleted.c | |
| parent | 41e403adb0fa76c8d15d5d1ef38b195a6da2265c (diff) | |
| download | samba-558a38671af5ea05d9ee1d815f0c1c2dab41a80c.tar.gz samba-558a38671af5ea05d9ee1d815f0c1c2dab41a80c.tar.bz2 samba-558a38671af5ea05d9ee1d815f0c1c2dab41a80c.zip | |
s4-dsdb: it is a better pattern to mark a control as done than remove it
removing a control means it can't be seen by any other modules, which
is usually not what is wanted. Better to just mark it non-critical,
which means anyone else who wants to look at it can, but if nobody
does its not an error.
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/show_deleted.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/show_deleted.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/show_deleted.c b/source4/dsdb/samdb/ldb_modules/show_deleted.c index 11503e6d3b..666d28053c 100644 --- a/source4/dsdb/samdb/ldb_modules/show_deleted.c +++ b/source4/dsdb/samdb/ldb_modules/show_deleted.c @@ -38,7 +38,6 @@ static int show_deleted_search(struct ldb_module *module, struct ldb_request *re { struct ldb_context *ldb; struct ldb_control *control; - struct ldb_control **saved_controls; struct ldb_request *down_req; struct ldb_parse_tree *new_tree = req->op.search.tree; int ret; @@ -90,9 +89,9 @@ static int show_deleted_search(struct ldb_module *module, struct ldb_request *re return ret; } - /* if a control is there remove if from the modified request */ - if (control && !save_controls(control, down_req, &saved_controls)) { - return LDB_ERR_OPERATIONS_ERROR; + /* mark the control as done */ + if (control) { + control->critical = 0; } /* perform the search */ |