I'll attack a patch which fixes two things: - it makes the code in c-sdk/ldap/libraries/libldap/charray.c use STRTOK just like it is done in c-sdk/ldap/libraries/libldap/getdn.c - it changes the tests in portable.h so that the strtok_r function from the libc is used (it exists since glibc 2.0) - it avoids re-declaring strtok_r if strtok_r is a macro; this is a problem on Linux I have not really been able to test resulting binary since I have no LDAP setup but looking at the generated .o files I see that the correct functions are used now.

Michael, can you take this one?

-> mcs (have applied patch in my tree; verifying now)

Fixed on the trunk: mozilla/directory/c-sdk/ldap/include/portable.h new revision: 5.2; previous revision: 5.1 Fix bug # 99068 - Can't compile on NetBSD. Fix bug # 121276 - use sigthreadmask instead of sigprocmask (AIX). Fix bug # 81584 - strtok use and STRTOK on Linux. The charray() code now uses strtok_r() if available. strtok_r() is now used everywhere on Linux if available. mozilla/directory/c-sdk/ldap/include/portable.h new revision: 5.3; previous revision: 5.2 Additional fix for bug # 81584 - strtok use and STRTOK on Linux.