snmp: corrections for #1256

src/etc/inc/services.inc

@@ -1796,7 +1796,7 @@ function services_dnsmasq_configure($verbose = false)
     }
 
     if ($verbose) {
-        echo 'Starting DNS forwarder...';
+        echo 'Starting DNS Forwarder...';
         flush();
     }
 
@@ -1917,7 +1917,7 @@ function services_unbound_configure($verbose = false)
     }
 
     if ($verbose) {
-        echo "Starting DNS Resolver...";
+        echo 'Starting DNS Resolver...';
         flush();
     }
 
@@ -1928,31 +1928,28 @@ function services_unbound_configure($verbose = false)
     }
 }
 
-function services_snmpd_configure()
+function services_snmpd_configure($verbose = false)
 {
     global $config, $g;
 
-    /* kill any running snmpd */
-    killbypid('/var/run/snmpd.pid');
-    sleep(2);
+    killbypid('/var/run/snmpd.pid', 'TERM', true);
 
-    if (is_process_running('bsnmpd')) {
-        mwexec('/usr/bin/killall bsnmpd', true);
+    if (!isset($config['snmpd']['enable'])) {
+        return;
     }
 
-    if (isset($config['snmpd']['enable'])) {
-        if (file_exists("/var/run/booting")) {
-            echo gettext("Starting SNMP daemon... ");
+    if ($verbose) {
+        echo 'Starting SNMP daemon....';
+        flush();
     }
 
     /* generate snmpd.conf */
     $fd = fopen("/var/etc/snmpd.conf", "w");
     if (!$fd) {
         log_error('Cannot open snmpd.conf in services_snmpd_configure()');
-            return 1;
+        return;
     }
 
-
     $snmpdconf = <<<EOD
 location := "{$config['snmpd']['syslocation']}"
 contact := "{$config['snmpd']['syscontact']}"
@@ -1960,7 +1957,6 @@ read := "{$config['snmpd']['rocommunity']}"
 
 EOD;
 
-
     if (isset($config['snmpd']['trapenable']) && preg_match('/^\S+$/', $config['snmpd']['trapserver'])){
         $snmpdconf .= <<<EOD
 # SNMP Trap support.
@@ -1997,7 +1993,6 @@ begemotTrapSinkComm.[$(traphost)].$(trapport) = $(trap)
 EOD;
     }
 
-
     $snmpdconf .= <<<EOD
 begemotSnmpdCommunityDisable    = 1
 
@@ -2091,16 +2086,12 @@ EOD;
     fclose($fd);
     unset($snmpdconf);
 
-
     /* run bsnmpd */
     mwexec("/usr/sbin/bsnmpd -c /var/etc/snmpd.conf -p /var/run/snmpd.pid");
 
-        if (file_exists("/var/run/booting")) {
-            echo gettext("done.") . "\n";
-        }
+    if ($verbose) {
+        echo "done.\n";
     }
-
-    return 0;
 }
 
 function services_dnsupdate_process($int = '', $updatehost = '', $forced = false)

src/etc/rc.bootup

@@ -223,7 +223,7 @@ if (function_exists('plugins_configure')) {
 $ipsec_dynamic_hosts = ipsec_configure();
 
 /* start SNMP service */
-services_snmpd_configure();
+services_snmpd_configure(true);
 
 /* load graphing functions */
 enable_rrd_graphing(true);