summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-06-30 12:01:32 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-06-30 12:08:42 -0700
commitc0d08bec068e35511ab172c2afe32ee43a62fcec (patch)
treeda89d2f8965dd63d9b6857820bac5f50942641fd /scripts
parentc36fe19a71447795ea5fda31d35fc67cf62083fe (diff)
downloadvyatta-cfg-c0d08bec068e35511ab172c2afe32ee43a62fcec.tar.gz
vyatta-cfg-c0d08bec068e35511ab172c2afe32ee43a62fcec.zip
Fix 4664: 'set failed' is returned when duplicated interface IP address is set
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-interfaces.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index 1388155..86410c1 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -112,8 +112,8 @@ sub is_ip_duplicate {
return unless($ipaddrs_hash{$ip});
- # if ip exists but on another interface, that is okay
- return is_ip_configured($intf, $ip);
+ # allow dup if it's the same interface
+ return !is_ip_configured($intf, $ip);
}
sub is_up {