[src/netbsd-1-5]: src/usr.sbin/dhcp Pull up revision 1.6 (requested by mellon):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d91a2d6b0800
branches:  netbsd-1-5
changeset: 491093:d91a2d6b0800
user:      he <he%NetBSD.org@localhost>
date:      Wed Apr 04 20:55:37 2001 +0000

description:
Pull up revision 1.6 (requested by mellon):
  Update DHCP software to ISC version 3, Beta 2, Patchlevel 23.

diffstat:

 usr.sbin/dhcp/client/scripts/bsdos |  18 +++++++++---------
 usr.sbin/dhcp/includes/site.h      |   5 +++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r f0ac13f2366f -r d91a2d6b0800 usr.sbin/dhcp/client/scripts/bsdos
--- a/usr.sbin/dhcp/client/scripts/bsdos        Wed Apr 04 20:55:32 2001 +0000
+++ b/usr.sbin/dhcp/client/scripts/bsdos        Wed Apr 04 20:55:37 2001 +0000
@@ -50,8 +50,8 @@
 fi
 
 if [ x$reason = xMEDIUM ]; then
-  ifconfig $interface $medium
-  ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1
+  eval "ifconfig $interface $medium"
+  eval "ifconfig $interface inet -alias 0.0.0.0 $medium" >/dev/null 2>&1
   sleep 1
   exit_with_hooks 0
 fi
@@ -88,7 +88,7 @@
   fi
   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]
    then
-    ifconfig $interface inet -alias $old_ip_address $medium
+    eval "ifconfig $interface inet -alias $old_ip_address $medium"
     route delete $old_ip_address 127.1 >/dev/null 2>&1
     for router in $old_routers; do
       route delete default $router >/dev/null 2>&1
@@ -104,8 +104,8 @@
   fi
   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
-    ifconfig $interface inet $new_ip_address $new_netmask_arg \
-                                       $new_broadcast_arg $medium
+    eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+                                       $new_broadcast_arg $medium"
     route add $new_ip_address 127.1 >/dev/null 2>&1
     for router in $new_routers; do
       route add default $router >/dev/null 2>&1
@@ -133,7 +133,7 @@
     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
   fi
   if [ x$old_ip_address != x ]; then
-    ifconfig $interface inet -alias $old_ip_address $medium
+    eval "ifconfig $interface inet -alias $old_ip_address $medium"
     route delete $old_ip_address 127.1 >/dev/null 2>&1
     for router in $old_routers; do
       route delete default $router >/dev/null 2>&1
@@ -160,8 +160,8 @@
     ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1
     route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
   fi
-  ifconfig $interface inet $new_ip_address $new_netmask_arg \
-                                       $new_broadcast_arg $medium
+  eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+                                       $new_broadcast_arg $medium"
   sleep 1
   if [ "$new_routers" != "" ]; then
     set $new_routers
@@ -184,7 +184,7 @@
       exit_with_hooks 0
     fi
   fi
-  ifconfig $interface inet -alias $new_ip_address $medium
+  eval "ifconfig $interface inet -alias $new_ip_address $medium"
   for router in $old_routers; do
     route delete default $router >/dev/null 2>&1
   done
diff -r f0ac13f2366f -r d91a2d6b0800 usr.sbin/dhcp/includes/site.h
--- a/usr.sbin/dhcp/includes/site.h     Wed Apr 04 20:55:32 2001 +0000
+++ b/usr.sbin/dhcp/includes/site.h     Wed Apr 04 20:55:37 2001 +0000
@@ -163,3 +163,8 @@
    than one at a time. */
 
 #define COMPACT_LEASES
+
+/* Define this if you want to be able to save and playback server operational
+   traces. */
+
+#define TRACING