Fix for termination problems when no interfaces found - bug #5267.

[samba.git] / source / nmbd / nmbd.c

diff --git a/source/nmbd/nmbd.c b/source/nmbd/nmbd.c
index 00d252940afc33bcf34e9d98dca13c89b15b0408..9797a7adb673b0774672ca586b1f6b625c4faf5c 100644 (file)
--- a/source/nmbd/nmbd.c
+++ b/source/nmbd/nmbd.c
@@ -182,11 +182,12 @@ static void reload_interfaces(time_t t)
                return;
        }
 
+  try_again:
+
        /* the list of probed interfaces has changed, we may need to add/remove
           some subnets */
        load_interfaces();
 
-  try_again:
 
        /* find any interfaces that need adding */
        for (n=iface_count() - 1; n >= 0; n--) {
@@ -278,7 +279,6 @@ static void reload_interfaces(time_t t)
 
        /* We need to wait if there are no subnets... */
        if (FIRST_SUBNET == NULL) {
-               void (*saved_handler)(int);
 
                DEBUG(0,("reload_interfaces: "
                        "No subnets to listen to. Waiting..\n"));
@@ -288,19 +288,28 @@ static void reload_interfaces(time_t t)
                 * cause us to exit.
                 */
 
-               saved_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
+               BlockSignals(false, SIGTERM);
 
                /* We only count IPv4 interfaces here. */
-               while (iface_count_v4() == 0) {
+               while (iface_count_v4() == 0 && !got_sig_term) {
                        sleep(5);
                        load_interfaces();
                }
 
                /*
-                * We got an interface, restore our normal term handler.
+                * Handle termination inband.
+                */
+
+               if (got_sig_term) {
+                       got_sig_term = 0;
+                       terminate();
+               }
+
+               /*
+                * We got an interface, go back to blocking term.
                 */
 
-               CatchSignal( SIGTERM, SIGNAL_CAST saved_handler );
+               BlockSignals(true, SIGTERM);
                goto try_again;
        }
 }