[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     8bb4b759eb23004e8c6d5f9e267854624c70e354
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 08:03:38 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:08:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8bb4b759

net/iproute2: IPv6 cannot be used with broadcast

Broadcast and IPv6 should not be used together. Do not try to set the
keyword for auto-generation of the broadcast address. If the user passes
a broadcast address for IPv6, throw an error.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index c3bb9c8..4c7fbdc 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -137,8 +137,14 @@ _add_address()
 	fi
 
 	# figure out the broadcast address if it is not specified
-	# FIXME: I'm not sure if this should be set if we are passing a peer arg
-	[ -z "$broadcast" ] && broadcast="+"
+	# This must NOT be set for IPv6 addresses
+	if [ "${address/:}" = "${address}" ]; then
+		# FIXME: I'm not sure if this should be set if we are passing a peer arg
+		[ -z "$broadcast" ] && broadcast="+"
+	elif [ -n "$broadcast" ]; then
+		eerror "Broadcast keywords are not valid with IPv6 addresses"
+		return 1
+	fi
 
 	# This must appear on a single line, continuations cannot be used
 	set -- "${address}${netmask}" ${peer:+peer} ${peer} ${broadcast:+broadcast} ${broadcast} ${anycast:+anycast} ${anycast} ${label:+label} ${label} ${scope:+scope} ${scope} dev "${IFACE}" ${valid_lft:+valid_lft} $valid_lft ${preferred_lft:+preferred_lft} $preferred_lft $confflaglist