diff options
author | jim-p <jimp@pfsense.org> | 2012-02-01 13:23:15 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2012-02-01 13:28:53 -0500 |
commit | c82b2c3f212e7c008146df624e0423d0f10770ab (patch) | |
tree | eb92213294725f229a4a2b161301d3db253f1959 /etc | |
parent | d835ffc8c201abb882d6b88bfacdd5f9e9e87677 (diff) | |
download | pfsense-c82b2c3f212e7c008146df624e0423d0f10770ab.zip pfsense-c82b2c3f212e7c008146df624e0423d0f10770ab.tar.gz |
Change SNMP binding option to work on any eligible interface/VIP. Fixes #2158
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/services.inc | 13 | ||||
-rw-r--r-- | etc/inc/system.inc | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc index 3f88455..61df803 100644 --- a/etc/inc/services.inc +++ b/etc/inc/services.inc @@ -1501,10 +1501,15 @@ begemotSnmpdCommunityDisable = 1 EOD; - if(isset($config['snmpd']['bindlan'])) { - $bind_to_ip = get_interface_ip("lan"); - } else { - $bind_to_ip = "0.0.0.0"; + $bind_to_ip = "0.0.0.0"; + if(isset($config['snmpd']['bindip'])) { + if (is_ipaddr($config['snmpd']['bindip'])) { + $bind_to_ip = $config['snmpd']['bindip']; + } else { + $if = get_real_interface($config['snmpd']['bindip']); + if (does_interface_exist($if)) + $bind_to_ip = find_interface_ip($if); + } } if(is_port( $config['snmpd']['pollport'] )) { diff --git a/etc/inc/system.inc b/etc/inc/system.inc index b443e8a..14d4e89 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1552,7 +1552,7 @@ function system_get_dmesg_boot() { return file_get_contents("{$g['varlog_path']}/dmesg.boot"); } -function openntpd_get_listen_ips() { +function get_possible_listen_ips() { $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); $listenips = array(); |