Merge master

[netatalk.git] / libatalk / dsi / dsi_init.c

diff --git a/libatalk/dsi/dsi_init.c b/libatalk/dsi/dsi_init.c
index 309a28c5c366d30c4b45a1c11cb58938984907f6..ee75fcc71ebb26be21a7c3ca40241c352a1d2409 100644 (file)
--- a/libatalk/dsi/dsi_init.c
+++ b/libatalk/dsi/dsi_init.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dsi_init.c,v 1.5 2005-05-03 14:55:15 didg Exp $
+ * $Id: dsi_init.c,v 1.10 2009-11-05 14:38:08 franklahm Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
@@ -17,7 +17,7 @@
 
 DSI *dsi_init(const dsi_proto protocol, const char *program, 
              const char *hostname, const char *address,
-             const int port, const int proxy, const u_int32_t quantum)
+             const char *port, const int proxy, const uint32_t quantum)
 {
     DSI                *dsi;
 
@@ -28,15 +28,6 @@ DSI *dsi_init(const dsi_proto protocol, const char *program,
     dsi->server_quantum = quantum; /* default server quantum */
     dsi->program = program;
 
-    /* signals to block. we actually disable timers for "known" 
-     * large transfers (i.e., dsi_read/write). */
-    sigemptyset(&dsi->sigblockset);
-    sigaddset(&dsi->sigblockset, SIGTERM);
-    sigaddset(&dsi->sigblockset, SIGHUP);
-    sigaddset(&dsi->sigblockset, SIGALRM);
-    sigaddset(&dsi->sigblockset, SIGUSR1);
-    /* always block SIGUSR2 even if SERVERTEXT is not defined */
-    sigaddset(&dsi->sigblockset, SIGUSR2);
     switch (protocol) {
       /* currently the only transport protocol that exists for dsi */
     case DSI_TCPIP: