Changeset 307 for trunk/src

Timestamp:

Dec 3, 2010, 10:44:38 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #229 (malfunction on CentOS 4.8 / gcc4), documentation update.

Location:

trunk/src

Files:

• samhain.c (modified) (1 diff)
• sh_calls.c (modified) (2 diffs)
• sh_files.c (modified) (3 diffs)
• sh_forward.c (modified) (1 diff)
• sh_hash.c (modified) (1 diff)

trunk/src/samhain.c

@@ -2024 +2024 @@
           if (flag_check_2 == 1 || FileSchedTwo == NULL)
             {
-              fprintf(stderr, "FIXME check unvisited\n");
               TPT((0, FIL__, __LINE__, _("msg=<Check for missing files.>\n")))
               sh_hash_unvisited (ShDFLevel[SH_ERR_T_FILE]);

trunk/src/sh_calls.c

@@ -226 +226 @@
   } while (val_retry < 0 && errno == EINTR);
 
-  *addrlen = (int) my_addrlen;
   error = errno;
   if (val_retry < 0) {
@@ -237 +236 @@
   sh_ipvx_save(serv_addr, ss.ss_family, (struct sockaddr *) &ss);
 
+  *addrlen = (int) my_addrlen;
   SL_RETURN(val_retry, _("retry_accept"));
 }

trunk/src/sh_files.c

@@ -377 +377 @@
                   if (S_FALSE == sh_ignore_chk_del(ptr->name))
                     {
-                      fprintf(stderr, "FIXME 1 %s, %d\n", ptr->name, ptr->is_reported);
                       if (0 != hashreport_missing(ptr->name, 
                                                   (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -436 +435 @@
                       if (S_FALSE == sh_ignore_chk_del(ptr->name))
                         {
-                          fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
                           if (0 != hashreport_missing(ptr->name, 
                                                       (ptr->class == SH_LEVEL_ALLIGNORE) ? 
@@ -1292 +1290 @@
               if (S_FALSE == sh_ignore_chk_del(ptr->name))
                 {
-                  fprintf(stderr, "FIXME 2 %s, %d\n", ptr->name, ptr->is_reported);
                   if (0 != hashreport_missing(ptr->name, 
                                               (ptr->class == SH_LEVEL_ALLIGNORE) ? 

trunk/src/sh_forward.c

@@ -5028 +5028 @@
 #endif
 
-  int                sock = -1;
+  /* Use volatile to circumvent a gcc4 problem on RH/CentOS 4.8 (?) */
+  volatile int       sock = -1;
   sh_conn_t        * cx;
   fd_set             readset;

trunk/src/sh_hash.c

@@ -688 +688 @@
           
           goto end;
-          SL_RET0(_("sh_hash_remove"));
 #else
           SET_SH_FFLAG_REPORTED(p->fflags);