From: yasuoka <yasuoka@openbsd.org>
Date: Mon, 19 Oct 2015 06:56:58 +0000 (+0000)
Subject: Can't assert "module->fd >= 0" in radiusd_stop() since the module may
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d0175656520e34e390871101685dc9ee5b7e6940;p=openbsd

Can't assert "module->fd >= 0" in radiusd_stop() since the module may
be closed already when error.
---

diff --git a/usr.sbin/radiusd/radiusd.c b/usr.sbin/radiusd/radiusd.c
index 72dd39a8046..dd8b7785dd0 100644
--- a/usr.sbin/radiusd/radiusd.c
+++ b/usr.sbin/radiusd/radiusd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd.c,v 1.7 2015/08/25 01:12:59 yasuoka Exp $	*/
+/*	$OpenBSD: radiusd.c,v 1.8 2015/10/19 06:56:58 yasuoka Exp $	*/
 
 /*
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -1050,8 +1050,6 @@ on_fail:
 void
 radiusd_module_stop(struct radiusd_module *module)
 {
-	RADIUSD_ASSERT(module->fd >= 0);
-
 	module->stopped = true;
 
 	if (module->secret != NULL)
@@ -1059,9 +1057,11 @@ radiusd_module_stop(struct radiusd_module *module)
 	free(module->secret);
 	module->secret = NULL;
 
-	imsg_compose(&module->ibuf, IMSG_RADIUSD_MODULE_STOP, 0, 0, -1,
-	    NULL, 0);
-	radiusd_module_reset_ev_handler(module);
+	if (module->fd >= 0) {
+		imsg_compose(&module->ibuf, IMSG_RADIUSD_MODULE_STOP, 0, 0, -1,
+		    NULL, 0);
+		radiusd_module_reset_ev_handler(module);
+	}
 }
 
 static void