From 7a390a0dabcdadb30196662b6cdec512bf81dcb4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 21 Oct 2006 00:10:19 +0000 Subject: r19430: merge recent ldb changes from Samba4. This includes memory leak fixes and significant speedups (This used to be commit bb5c205fef90aa8b89ba400fb9f2f37a111676a8) --- source3/lib/ldb/tools/ad2oLschema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/ldb/tools/ad2oLschema.c') diff --git a/source3/lib/ldb/tools/ad2oLschema.c b/source3/lib/ldb/tools/ad2oLschema.c index 8b1203bff0..62c6e01c2e 100644 --- a/source3/lib/ldb/tools/ad2oLschema.c +++ b/source3/lib/ldb/tools/ad2oLschema.c @@ -330,7 +330,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_ int j; /* We have been asked to skip some attributes/objectClasses */ - if (str_list_check_ci(attrs_skip, name)) { + if (attrs_skip && str_list_check_ci(attrs_skip, name)) { ret.skipped++; continue; } @@ -436,7 +436,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_ int j; /* We have been asked to skip some attributes/objectClasses */ - if (str_list_check_ci(attrs_skip, name)) { + if (attrs_skip && str_list_check_ci(attrs_skip, name)) { ret.skipped++; continue; } -- cgit