Changeset 460 for trunk/src

Timestamp:

Nov 1, 2014, 8:17:00 AM (10 years ago)

Author:

katerina

Message:

Better error message for update and fix for deadlock in UNIX entropy collector. 3.1.3 final.

Location:

trunk/src

Files:

• sh_entropy.c (modified) (1 diff)
• sh_unix.c (modified) (1 diff)

trunk/src/sh_entropy.c

@@ -614 +614 @@
   
           if (NULL != tempres) {
-            i = setgid(tempres->pw_gid); 
-            if (i == 0)
-              i = sh_unix_initgroups(DEFAULT_IDENT ,tempres->pw_gid);
+            i = setgid(tempres->pw_gid);
+
+            /*** locks up in dnmalloc ***/
+            /*
+             * if (i == 0)
+             *   i = sh_unix_initgroups(DEFAULT_IDENT ,tempres->pw_gid);
+             */
+
             if (i == 0) 
               i = setuid(tempres->pw_uid);

trunk/src/sh_unix.c

@@ -4861 +4861 @@
               SL_RETURN( S_FALSE, _("file_is_remote"));
             }
+          else
+            {
+              char * tmp  = sh_util_safe_name (&(sh.data.path[15]));
+              sh_error_handle((-1), FIL__, __LINE__, S_FALSE, MSG_E_SUBGPATH, 
+                              _("No local baseline database at expected path"), 
+                              _("file_is_remote"),
+                              tmp);
+              SH_FREE(tmp);
+            }
+        }
+      else
+        {
+          sh_error_handle((-1), FIL__, __LINE__, S_FALSE, MSG_E_SUBGEN, 
+                          _("No local baseline database path known"), 
+                          _("file_is_remote"));
         }
       SL_RETURN( S_TRUE, _("file_is_remote"));