zhm could spin after losing contact with a server. This patch does

three things to resent_notices(): makes sure the while loop makes
progress even when there's a packet whose timeout hasn't been reached,
doesn't gratuitously reset timeout_type to NOTICES if we called
new_server(), and doesn't reset the alarm if we called new_server().

1 files changed, 3 insertions, 3 deletions

diff --git a/zhm/queue.c b/zhm/queue.c
index d026817..fd87546 100644
--- a/zhm/queue.c
+++ b/zhm/queue.c
@@ -259,10 +259,10 @@ struct sockaddr_in *sin;
 		    }
 		    srch->q_data->timeout = time((time_t *)0) +
 			rexmit_times[srch->q_data->retries];
-		    srch = srch->q_forw;
 	       }
+	       srch = srch->q_forw;
 	  }
      } while (srch != &hm_queue);
-     timeout_type = NOTICES;
-     (void)alarm(rexmit_times[0]);
+     if (timeout_type == NOTICES)
+	  (void)alarm(rexmit_times[0]);
 }