From 7cca77de28652ca92a901be6da2e8ad86259ce16 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 21 Jun 2011 07:08:05 +0000
Subject: Kill olsrd if it is not enabled. Reported-by:
 http://forum.pfsense.org/index.php/topic,37931.0.html

---
 etc/inc/services.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index d5c9ada..6913498 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -978,8 +978,11 @@ function setup_wireless_olsr() {
 	conf_mount_rw();
 	foreach($config['installedpackages']['olsrd']['config'] as $olsrd) {
 		$olsr_enable = $olsrd['enable'];
-		if($olsr_enable <> "on")
+		if($olsr_enable <> "on") {
+			if (is_process_running("olsrd"))
+				mwexec("/usr/bin/killall olsrd", true);
 			return;
+		}
 		$fd = fopen("{$g['varetc_path']}/olsr.conf", "w");
 
 		if($olsrd['announcedynamicroute'] or $olsrd['enableannounce'] == "on") {
@@ -1241,7 +1244,7 @@ EODAD;
 		fclose($fd);
 	}
 
-	if(is_process_running("olsrd"))
+	if (is_process_running("olsrd"))
 		mwexec("/usr/bin/killall olsrd", true);
 
 	sleep(2);
-- 
cgit v1.1