[src/trunk]: src/usr.sbin/dhcp/server Revert to the last ISC version. The loc...

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

details:   https://anonhg.NetBSD.org/src/rev/538e8f335cad
branches:  trunk
changeset: 467633:538e8f335cad
user:      drochner <drochner%NetBSD.org@localhost>
date:      Fri Mar 26 20:15:01 1999 +0000

description:
Revert to the last ISC version. The local modification breaks bootp
clients which have the requested filename fixed in ROM.
The intended echoing behaviour is already provided by the ISC version
(if no special bootfile name is specified in dhcpd.conf).

diffstat:

 usr.sbin/dhcp/server/bootp.c |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (30 lines):

diff -r c7507f404534 -r 538e8f335cad usr.sbin/dhcp/server/bootp.c
--- a/usr.sbin/dhcp/server/bootp.c      Fri Mar 26 20:12:44 1999 +0000
+++ b/usr.sbin/dhcp/server/bootp.c      Fri Mar 26 20:15:01 1999 +0000
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bootp.c,v 1.6 1999/03/26 17:52:45 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bootp.c,v 1.7 1999/03/26 20:15:01 drochner Exp $ Copyright (c) 1995, 1996, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -288,15 +288,9 @@
                         (sizeof raw.sname) - 1);
                raw.sname [(sizeof raw.sname) - 1] = 0;
        }
-
-       /* If the client requested a specific boot file, echo it 
-          back per RFC951; some clients are unable to boot properly
-          without this (e.g. DECstations). */
-       if (packet -> raw -> file[0] != '\0')
-               memcpy (raw.file, packet -> raw -> file, sizeof raw.file);
-       else if (hp -> group -> filename) {
+       if (hp -> group -> filename) {
                strncpy (raw.file, hp -> group -> filename,
-                       (sizeof raw.file) - 1); 
+                        (sizeof raw.file) - 1);
                raw.file [(sizeof raw.file) - 1] = 0;
        } else
                memcpy (raw.file, packet -> raw -> file, sizeof raw.file);