Changeset 145 for trunk/src

Timestamp:

Nov 8, 2007, 10:35:23 PM (17 years ago)

Author:

rainer

Message:

Fix for ticket #81 (compile failure with --enable-static).

Location:

trunk/src

Files:

• samhain.c (modified) (1 diff)
• sh_static.c (modified) (8 diffs)

trunk/src/samhain.c

@@ -1723 +1723 @@
             }
           
-          if (sig_config_read_again == 1) /* SIGHUP */
+          if (sig_config_read_again == 1 && /* SIGHUP */
+              sh_global_suspend_flag == 0)
             {
               TPT((0, FIL__, __LINE__, _("msg=<Re-read configuration.>\n")))

trunk/src/sh_static.c

@@ -94 +94 @@
 #define DO_GETXXKEY_R_PATHNAME  _PATH_PASSWD
 
-static int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
-                           GETXXKEY_R_ENTTYPE *__restrict resultbuf,
-                           char *__restrict buffer, size_t buflen,
-                           GETXXKEY_R_ENTTYPE **__restrict result)
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+                    GETXXKEY_R_ENTTYPE *__restrict resultbuf,
+                    char *__restrict buffer, size_t buflen,
+                    GETXXKEY_R_ENTTYPE **__restrict result)
 {
   FILE *stream;
@@ -142 +142 @@
 #define DO_GETXXKEY_R_PATHNAME  _PATH_GROUP
 
-static int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
-                           GETXXKEY_R_ENTTYPE *__restrict resultbuf,
-                           char *__restrict buffer, size_t buflen,
-                           GETXXKEY_R_ENTTYPE **__restrict result)
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+                    GETXXKEY_R_ENTTYPE *__restrict resultbuf,
+                    char *__restrict buffer, size_t buflen,
+                    GETXXKEY_R_ENTTYPE **__restrict result)
 {
   FILE *stream;
@@ -190 +190 @@
 #define DO_GETXXKEY_R_PATHNAME  _PATH_PASSWD
 
-static int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
-                           GETXXKEY_R_ENTTYPE *__restrict resultbuf,
-                           char *__restrict buffer, size_t buflen,
-                           GETXXKEY_R_ENTTYPE **__restrict result)
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+                    GETXXKEY_R_ENTTYPE *__restrict resultbuf,
+                    char *__restrict buffer, size_t buflen,
+                    GETXXKEY_R_ENTTYPE **__restrict result)
 {
   FILE *stream;
@@ -238 +238 @@
 #define DO_GETXXKEY_R_PATHNAME  _PATH_GROUP
 
-static int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
-                           GETXXKEY_R_ENTTYPE *__restrict resultbuf,
-                           char *__restrict buffer, size_t buflen,
-                           GETXXKEY_R_ENTTYPE **__restrict result)
+int GETXXKEY_R_FUNC(DO_GETXXKEY_R_KEYTYPE key,
+                    GETXXKEY_R_ENTTYPE *__restrict resultbuf,
+                    char *__restrict buffer, size_t buflen,
+                    GETXXKEY_R_ENTTYPE **__restrict result)
 {
   FILE *stream;
@@ -1168 +1168 @@
         DPRINTF("Looking up type %d answer for '%s'\n", type, name);
 
-        LOCK;
+        SH_MUTEX_LOCK_UNSAFE(resolv_lock);
         ns %= nscount;
-        UNLOCK;
+        SH_MUTEX_UNLOCK_UNSAFE(resolv_lock);
 
         while (retries++ < MAX_RETRIES) {
@@ -1181 +1181 @@
 
                 /* Mess with globals while under lock */
-                LOCK;
+                SH_MUTEX_LOCK_UNSAFE(resolv_lock);
                 ++id;
                 id &= 0xffff;
                 h.id = id;
                 dns = nsip[ns];
-                UNLOCK;
+                SH_MUTEX_UNLOCK_UNSAFE(resolv_lock);
 
                 h.qdcount = 1;
@@ -1281 +1281 @@
                 DPRINTF("id = %d, qr = %d\n", h.id, h.qr);
 
-                LOCK;
+                SH_MUTEX_LOCK_UNSAFE(resolv_lock);
                 if ((h.id != id) || (!h.qr)) {
-                        UNLOCK;
+                        SH_MUTEX_UNLOCK_UNSAFE(resolv_lock);
                         /* unsolicited */
                         goto again;
                 }
-                UNLOCK;
+                SH_MUTEX_UNLOCK_UNSAFE(resolv_lock);
 
 
@@ -1369 +1369 @@
                     } else {
                         /* next server, first search */
-                        LOCK;
+                        SH_MUTEX_LOCK_UNSAFE(resolv_lock);
                         ns = (ns + 1) % nscount;
-                        UNLOCK;
+                        SH_MUTEX_UNLOCK_UNSAFE(resolv_lock);
                         variant = 0;
                     }