zhm: Don't send HM_BOOT on new_server if -N used

If -N was used, then not only should the hostmanager not send an HM_BOOT
to the first server it contacts; it should also not send one to other
servers it tries when the first one fails to respond.  However, it should
consistently send HM_BOOT when coming back from a SIGHUP deactivation
where it has previously sent HM_FLUSH (if you don't want that behavior,
use -f and avoid sending SIGHUP to the hostmanager).

This fixes #88

1 files changed, 4 insertions, 5 deletions

diff --git a/zhm/zhm.c b/zhm/zhm.c
index bd888d0..cbdcf6d 100644
--- a/zhm/zhm.c
+++ b/zhm/zhm.c
@@ -28,7 +28,6 @@ int use_hesiod = 0;
 int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork;
 int no_server = 1, nservchang, nserv, nclt;
 int booting = 1, timeout_type, deactivated = 1;
-int bootflag = 1;
 int started = 0;
 long starttime;
 u_short cli_port;
@@ -106,9 +105,9 @@ main(int argc,
 	  case 'f':
 	    noflushflag = 1;
 	    break;
-          case 'N':
-            bootflag = 0;
-            break;
+	  case 'N':
+	    booting = 0;
+	    break;
 	  case '?':
 	  default:
 	    errflg++;
@@ -440,7 +439,7 @@ init_hm(void)
 	  memcpy(&serv_sin.sin_addr, hp->h_addr, 4);
      }
 
-     if (bootflag)
+     if (booting)
           send_boot_notice(HM_BOOT);
      else
           send_boot_notice(HM_ATTACH);