From e0294c9f66ef328e3d8dc62494f681a767c673be Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 Oct 2006 01:36:22 +0000 Subject: r19310: Add another conflicting oid Cope with there being no attributes to skip in the ad2oLscheam tool Andrew Bartlett (This used to be commit 942d7ad0c3534770ad05977b180e1c8111a5b6a6) --- source4/lib/ldb/tools/ad2oLschema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/ldb') diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c index 8b1203bff0..62c6e01c2e 100644 --- a/source4/lib/ldb/tools/ad2oLschema.c +++ b/source4/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