Changeset 745 for trunk/server/source3/nmbd/nmbd_subnetdb.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/nmbd/nmbd_subnetdb.c (modified) (4 diffs)

trunk/server/source3/nmbd/nmbd_subnetdb.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "nmbd/nmbd.h"
 
 extern int global_nmb_port;
@@ -260 +261 @@
                  */
 
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 sleep(5);
@@ -269 +270 @@
                  */
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
         }
 
@@ -321 +322 @@
                                 "smb.conf correct ?\n"));
 
-                saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+                saved_handler = CatchSignal(SIGTERM, SIG_DFL);
 
                 sleep(5);
                 load_interfaces();
 
-                CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+                CatchSignal(SIGTERM, saved_handler);
                 goto try_interfaces_again;
         }