Merge branch-2-1

[netatalk.git] / libatalk / util / server_child.c

diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c
index bb81089f466de81bd3bc9d9f920a9e321480b1a6..b21bae35f08fe427b4f1f8eed027f0420cb2dd57 100644 (file)
--- a/libatalk/util/server_child.c
+++ b/libatalk/util/server_child.c
@@ -1,5 +1,5 @@
 /*
- * $Id: server_child.c,v 1.10 2008-12-03 18:35:44 didg Exp $
+ * $Id: server_child.c,v 1.12 2010-01-21 14:14:49 didg Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -141,12 +141,12 @@ int server_child_add(server_child *children, const int forkid,
    * chance to add the child in. */
   sigemptyset(&sig);
   sigaddset(&sig, SIGCHLD);
-  sigprocmask(SIG_BLOCK, &sig, &oldsig);
+  pthread_sigmask(SIG_BLOCK, &sig, &oldsig);
 
   /* it's possible that the child could have already died before the
-   * sigprocmask. we need to check for this. */
+   * pthread_sigmask. we need to check for this. */
   if (kill(pid, 0) < 0) {
-    sigprocmask(SIG_SETMASK, &oldsig, NULL);
+    pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
     return 1;
   }
 
@@ -154,13 +154,13 @@ int server_child_add(server_child *children, const int forkid,
 
   /* if we already have an entry. just return. */
   if (resolve_child(fork->table, pid)) {
-    sigprocmask(SIG_SETMASK, &oldsig, NULL);
+    pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
     return 0;
   }
 
   if ((child = (struct server_child_data *) 
        calloc(1, sizeof(struct server_child_data))) == NULL) {
-    sigprocmask(SIG_SETMASK, &oldsig, NULL);
+    pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
     return -1;
   }
 
@@ -169,7 +169,7 @@ int server_child_add(server_child *children, const int forkid,
   child->killed = 0;
   hash_child(fork->table, child);
   children->count++;
-  sigprocmask(SIG_SETMASK, &oldsig, NULL);
+  pthread_sigmask(SIG_SETMASK, &oldsig, NULL);
 
   return 0;
 }
@@ -341,7 +341,7 @@ void server_child_kill_one_by_id(server_child *children, const int forkid, const
           child->valid = 1;
          child->idlen = idlen;
           child->clientid = id;
-         LOG(log_info, logtype_default, "Setting clientid (len %d) for %d, boottime %X", idlen, child->pid, boottime);
+         LOG(log_debug, logtype_default, "Setting clientid (len %d) for %d, boottime %X", idlen, child->pid, boottime);
       }
       child = tmp;
     }
@@ -416,17 +416,17 @@ void server_reset_signal(void)
     sv.sa_handler =  SIG_DFL;
     sigemptyset( &sv.sa_mask );
     
-    sigaction(SIGALRM, &sv, 0 );
-    sigaction(SIGHUP,  &sv, 0 );
-    sigaction(SIGTERM, &sv, 0 );
-    sigaction(SIGUSR1, &sv, 0 );
-    sigaction(SIGCHLD, &sv, 0 );
+    sigaction(SIGALRM, &sv, NULL );
+    sigaction(SIGHUP,  &sv, NULL );
+    sigaction(SIGTERM, &sv, NULL );
+    sigaction(SIGUSR1, &sv, NULL );
+    sigaction(SIGCHLD, &sv, NULL );
     
     sigemptyset(&sigs);
     sigaddset(&sigs, SIGALRM);
     sigaddset(&sigs, SIGHUP);
     sigaddset(&sigs, SIGUSR1);
     sigaddset(&sigs, SIGCHLD);
-    sigprocmask(SIG_UNBLOCK, &sigs, NULL);
+    pthread_sigmask(SIG_UNBLOCK, &sigs, NULL);
         
 }