summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd/back-ldbm/import.c
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2005-12-06 18:28:14 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2005-12-06 18:28:14 +0000
commit8905e03a05d67cbea9df347cd78cb2231d577acc (patch)
treeaed830b473aa3177768d7dd0c537e3ab449cece5 /ldap/servers/slapd/back-ldbm/import.c
parent337c6c4965f484e1de020f16e905a9ac4be78590 (diff)
downloadds-8905e03a05d67cbea9df347cd78cb2231d577acc.tar.gz
ds-8905e03a05d67cbea9df347cd78cb2231d577acc.tar.xz
ds-8905e03a05d67cbea9df347cd78cb2231d577acc.zip
[175063] entry with escaped characters fails to import and index
If missing entry_id is found, skip it and continue reading the primary db to be reindexed.
Diffstat (limited to 'ldap/servers/slapd/back-ldbm/import.c')
-rw-r--r--ldap/servers/slapd/back-ldbm/import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
index 0889d894..62169dc8 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -91,7 +91,7 @@ static int import_fifo_init(ImportJob *job)
return 0;
}
-FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker)
+FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift)
{
int idx = id % job->fifo.size;
FifoItem *fi;
@@ -102,7 +102,7 @@ FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker)
return NULL;
}
if (fi->entry) {
- if (id != fi->entry->ep_id)
+ if (id != fi->entry->ep_id - shift)
fi = NULL;
else if (worker) {
if (fi->bad) return NULL;