summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-06 11:02:40 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-06 11:02:40 +1000
commit410115bb6b8e9674c9779fc9bc5d1cb7022bebcf (patch)
tree7c99574c6477cd68a29c2214a991087f0e33f0ea /source4
parent674d089beac8a5808a4537b8021e466c4c14f656 (diff)
downloadsamba-410115bb6b8e9674c9779fc9bc5d1cb7022bebcf.tar.gz
samba-410115bb6b8e9674c9779fc9bc5d1cb7022bebcf.tar.bz2
samba-410115bb6b8e9674c9779fc9bc5d1cb7022bebcf.zip
Cope with an empty mapping file in ad2oLschema
(This used to be commit 5f36a605a9accfba1125bbae0e79bb14b936173c)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/ldb/tools/ad2oLschema.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index 67b16dd06e..0a89656fa2 100644
--- a/source4/lib/ldb/tools/ad2oLschema.c
+++ b/source4/lib/ldb/tools/ad2oLschema.c
@@ -429,7 +429,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, or lack of
* implementation */
- for (j=0; syntax_oid && oid_map[j].old_oid; j++) {
+ for (j=0; syntax_oid && oid_map && oid_map[j].old_oid; j++) {
if (strcasecmp(syntax_oid, oid_map[j].old_oid) == 0) {
syntax_oid = oid_map[j].new_oid;
break;
@@ -494,7 +494,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_map[j].old_oid; j++) {
+ for (j=0; oid_map && oid_map[j].old_oid; j++) {
if (strcasecmp(oid, oid_map[j].old_oid) == 0) {
oid = oid_map[j].new_oid;
break;