diff options
| author | Bill Marquette <billm@pfsense.org> | 2006-10-22 05:21:39 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2006-10-22 05:21:39 +0000 |
| commit | 1387e454fa9678a5c486b041a4d0c1f65459ee68 (patch) | |
| tree | 64eb1cc475a76982279687b20f7b33bdc7ced7b5 | |
| parent | 0a972a1a30f1f9e59685b320fab6a0db8ab7e4d0 (diff) | |
| download | pfsense-1387e454fa9678a5c486b041a4d0c1f65459ee68.zip pfsense-1387e454fa9678a5c486b041a4d0c1f65459ee68.tar.gz | |
MFC [15086]
Ticket #1137: find_interface_ip() doesn't do what it says. Really return only the first found IP. This fixes issues with people configuring FreeBSD IP aliases on interfaces
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index e0de9a2..a67782e 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -616,7 +616,7 @@ function find_interface_ip($interface, $flush = false) { if(does_interface_exist($interface) == false) return; /* Setup IP cache */ if (!isset($interface_ip_arr_cache[$interface]) or $flush) { - $interface_ip_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 2"); + $interface_ip_arr_cache[$interface] = exec_command("/sbin/ifconfig {$interface} | /usr/bin/grep -w \"inet\" | /usr/bin/cut -d\" \" -f 2| /usr/bin/head -1"); $interface_ip_arr_cache[$interface] = str_replace("\n", "", $interface_ip_arr_cache[$interface]); } @@ -2361,4 +2361,4 @@ function is_dhcp_server_enabled() { return $dhcpdenable; } -?>
\ No newline at end of file +?> |
