found a second reset_heartbeat instance that did the same thing;
switched to checking against "not HB_DISABLED" for consistency.


--- tzc-2.6.15.orig/tzc.c
+++ tzc-2.6.15/tzc.c
@@ -1369,7 +1377,9 @@
    globals->ebuf = (char *) malloc(globals->ebufsiz);
    globals->ebufptr = globals->ebuf;
 
-   reset_heartbeat();
+   if (globals->heartbeat.status != HB_DISABLED) {
+     reset_heartbeat();
+   }
 
    globals->pending_replies = NULL;
 
@@ -1605,7 +1616,9 @@
       }
 
       /* zephyr server is still talking to us, so reset the heartbeat
       */
-      reset_heartbeat();
+      if (globals->heartbeat.status != HB_DISABLED) {
+      reset_heartbeat();
+      }
 
       /* if this is a heartbeat zgram, don't report it */
       if (!strcasecmp(notice->z_class, TZC_HEARTBEAT_CLASS) &&
@@ -2003,6 +2016,7 @@
    globals->heartbeat.period = atoi(optarg);
     if (globals->heartbeat.period == 0)
         globals->heartbeat.status = HB_DISABLED;
+         break;
        case 'd':
         globals->debug = 1;
          break;



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to