diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-08-22 06:18:07 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:27 -0500 |
| commit | 3d33bc10ed5dc827a7cabb74d229efea293e1bbf (patch) | |
| tree | b0867ec92233f00e4b55d56286d247d8ad76593d | |
| parent | 54b5ba20f6bd6aa7cf749e3e4b6e4472dc94cefb (diff) | |
| download | samba-3d33bc10ed5dc827a7cabb74d229efea293e1bbf.tar.gz samba-3d33bc10ed5dc827a7cabb74d229efea293e1bbf.tar.bz2 samba-3d33bc10ed5dc827a7cabb74d229efea293e1bbf.zip | |
r17700: Despite our best hopes, the way module initialisation tends to happen,
we make searches before things are initialised. Cope with this.
Andrew Bartlett
(This used to be commit daa1a61891ede404bcce72affb7094e5c452c689)
| -rw-r--r-- | source4/lib/ldb/modules/paged_searches.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/modules/paged_searches.c b/source4/lib/ldb/modules/paged_searches.c index a867aab01c..809a59dce2 100644 --- a/source4/lib/ldb/modules/paged_searches.c +++ b/source4/lib/ldb/modules/paged_searches.c @@ -238,10 +238,10 @@ static int ps_search(struct ldb_module *module, struct ldb_request *req) private_data = talloc_get_type(module->private_data, struct private_data); /* check if paging is supported and if there is a any control */ - if (!private_data->paged_supported || req->controls) { - /* do not touch this request - * oaged controls not supported or - * explicit controls have been set */ + if (!private_data || !private_data->paged_supported || req->controls) { + /* do not touch this request paged controls not + * supported or explicit controls have been set or we + * are just not setup yet */ return ldb_next_request(module, req); } |