summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-01-02 11:36:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:35:53 -0500
commit3a6da3c60f07c6568537ba064ba7be80cf1d47f1 (patch)
treec9d6f1cbe5299086f7c735c0fcb2a3dacf1be567 /source4
parente18585ba39a3dc59e756832cd6608a5844027088 (diff)
downloadsamba-3a6da3c60f07c6568537ba064ba7be80cf1d47f1.tar.gz
samba-3a6da3c60f07c6568537ba064ba7be80cf1d47f1.tar.bz2
samba-3a6da3c60f07c6568537ba064ba7be80cf1d47f1.zip
r20467: Don't segfault if we don't have an OID map
(This used to be commit c0276c373c51696b5168cdd1b048e1b9858baf62)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/tools/ad2oLschema.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index 875882659b..04b9efae8f 100644
--- a/source4/lib/ldb/tools/ad2oLschema.c
+++ b/source4/lib/ldb/tools/ad2oLschema.c
@@ -332,7 +332,7 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum convert_
}
/* We might have been asked to remap this oid, due to a conflict */
- for (j=0; oid && oid_map[j].old_oid; j++) {
+ for (j=0; oid && oid_map && oid_map[j].old_oid; j++) {
if (strcmp(oid, oid_map[j].old_oid) == 0) {
oid = oid_map[j].new_oid;
break;