From 1aa619883601bb4eeee29ad549743f33076a3bf3 Mon Sep 17 00:00:00 2001 From: todd <> Date: Wed, 8 Nov 2000 19:09:29 +0000 Subject: [PATCH] This fixes pr 1481, we now handle args > 6 in /etc/hostname.if in the cases where we did not previously handle them. Thanks to Scott Atwood for reminding us of this. --- src/etc/netstart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/etc/netstart b/src/etc/netstart index 9dbcc3a3..36640dee 100644 --- a/src/etc/netstart +++ b/src/etc/netstart @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: netstart,v 1.72 2000/09/02 15:59:29 todd Exp $ +# $OpenBSD: netstart,v 1.73 2000/11/08 19:09:29 todd Exp $ # Returns true if $1 contains only alphanumerics isalphanumeric() { @@ -112,8 +112,10 @@ for hn in /etc/hostname.*; do if [ "$cmd2" ]; then # we are carrying over from the 'read dt dtaddr' last time set -- $cmd2 - af="$1" name="$2" mask="$3" bcaddr="$4" ext1="$5" ext2="$6" - cmd2= + af="$1" name="$2" mask="$3" bcaddr="$4" ext1="$5" cmd2= + # make sure and get any remaining args in ext2, like the read below + i=1; while [ i -lt 6 -a "$1" ]; do shift; let i=i+1; done + ext2="$@" else # read the next line or exit the while loop read af name mask bcaddr ext1 ext2 || break