[Fedora-directory-commits] ldapserver/ldap/servers/slapd util.c, 1.29, 1.30

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27916/ldapserver/ldap/servers/slapd

Modified Files:
	util.c 
Log Message:
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



Index: util.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/util.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- util.c	9 Mar 2009 16:35:35 -0000	1.29
+++ util.c	12 Mar 2009 02:16:43 -0000	1.30
@@ -959,7 +959,7 @@
     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 @@
         (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);
     }