diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-20 11:37:23 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-20 11:37:23 +1000 |
| commit | 9551d4027dd9bbdfa1fcb4a5a117792811ec7f29 (patch) | |
| tree | cfb05907f4e142ec997d745e4e251b4a0a5ec953 /source4/lib/ldb/tools | |
| parent | e7d993b8b26e121ff37640825b4d2f2c4d6332bf (diff) | |
| parent | e533e7a7ebc8b3029cf604e63cdc6d1cf8570ccd (diff) | |
| download | samba-9551d4027dd9bbdfa1fcb4a5a117792811ec7f29.tar.gz samba-9551d4027dd9bbdfa1fcb4a5a117792811ec7f29.tar.bz2 samba-9551d4027dd9bbdfa1fcb4a5a117792811ec7f29.zip | |
Merge commit 'origin/v4-0-test' into vfs_smb2
(This used to be commit ffbd222d651dcddb19cacdc50cdbfeaefa816940)
Diffstat (limited to 'source4/lib/ldb/tools')
| -rw-r--r-- | source4/lib/ldb/tools/ad2oLschema.c | 4 |
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; |