diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-03-12 02:16:43 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-03-12 02:16:43 +0000 |
| commit | 2bc78534fe250dcdf5efd211c5d0904e69287c9b (patch) | |
| tree | edb17775d5d82f260e8348d9ee3dec3da5cf25ec /ldap/servers/slapd/util.c | |
| parent | 0e53c2ae9d98fb7eef5d3d311b98fc63a437f894 (diff) | |
| download | ds-2bc78534fe250dcdf5efd211c5d0904e69287c9b.tar.gz ds-2bc78534fe250dcdf5efd211c5d0904e69287c9b.tar.xz ds-2bc78534fe250dcdf5efd211c5d0904e69287c9b.zip | |
Resolves: bug 488866
Bug Description: crash in reliab15 test
Reviewed by: nkinder (Thanks!)
Fix Description: There was still a small window of time during which the connection could be closed out from under the other thread which was sending/reading result. The solution is to use explicit locking using the conn->lock to protect access to the conn->ld. Since this also affected the total update code, I tested it under similar conditions, and found that it exhibited the same behavior. I added checking to the total update code to check for disconnection and coordinate access in the entry sending/result reading threads.
I also fixed a spurious error message about the sasl path.
Platforms tested: RHEL5
Flag Day: no
Doc impact: no
Diffstat (limited to 'ldap/servers/slapd/util.c')
| -rw-r--r-- | ldap/servers/slapd/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c index 4fcae3ba..2aff1e30 100644 --- a/ldap/servers/slapd/util.c +++ b/ldap/servers/slapd/util.c @@ -959,7 +959,7 @@ slapi_ldap_init_ext( char *pp = NULL; if (NULL == pluginpath || (*pluginpath == '\0')) { - slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext", + slapi_log_error(SLAPI_LOG_SHELL, "slapi_ldap_init_ext", "configpluginpath == NULL\n"); if (!(pluginpath = getenv("SASL_PATH"))) { #if defined(LINUX) && defined(__LP64__) @@ -974,7 +974,7 @@ slapi_ldap_init_ext( (0 != strcmp(++pp, pluginpath)) /* sasl_path has been updated */ ) { PR_snprintf(util_sasl_path, sizeof(util_sasl_path), "SASL_PATH=%s", pluginpath); - slapi_log_error(SLAPI_LOG_FATAL, "slapi_ldap_init_ext", + slapi_log_error(SLAPI_LOG_SHELL, "slapi_ldap_init_ext", "putenv(%s)\n", util_sasl_path); putenv(util_sasl_path); } |