From e0d141bd4661482f374cbd95d866be587307ecd2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 May 2010 08:11:13 +1000 Subject: s4:dsdb Allow a NULL search expression in dsdb_search() The NULL search expression expands to (objectClass=*), but %s expands NULL to (NULL) which doesn't parse... Andrew Bartlett --- source4/dsdb/common/util.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/common/util.c') diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index da4d0b3940..987864f748 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -3641,10 +3641,13 @@ int dsdb_search_one(struct ldb_context *ldb, talloc_free(tmp_ctx); return LDB_ERR_OPERATIONS_ERROR; } + ret = dsdb_search(ldb, tmp_ctx, &res, basedn, scope, attrs, + dsdb_flags, "%s", expression); + } else { + ret = dsdb_search(ldb, tmp_ctx, &res, basedn, scope, attrs, + dsdb_flags, NULL); } - ret = dsdb_search(ldb, tmp_ctx, &res, basedn, scope, attrs, - dsdb_flags, "%s", expression); if (ret != LDB_SUCCESS) { talloc_free(tmp_ctx); return ret; -- cgit