[src/netbsd-3-0]: src/dist/dhcp/server Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/9a52320910df
branches:  netbsd-3-0
changeset: 579362:9a52320910df
user:      ghen <ghen%NetBSD.org@localhost>
date:      Fri Jan 05 15:10:04 2007 +0000

description:
Pull up following revision(s) (requested by drochner in ticket #1619):
        dist/dhcp/server/dhcp.c: revision 1.10
PR/33174: Wolfgang Stukenbrock: dhcpd fails to deliver hostnames for dynamic
ranges because it is using the wrong universe in the host lookup.

diffstat:

 dist/dhcp/server/dhcp.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 24327ee3b47b -r 9a52320910df dist/dhcp/server/dhcp.c
--- a/dist/dhcp/server/dhcp.c   Mon Dec 18 20:27:41 2006 +0000
+++ b/dist/dhcp/server/dhcp.c   Fri Jan 05 15:10:04 2007 +0000
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.6 2004/06/11 19:54:02 mellon Exp $ Copyright (c) 1995-2002 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.6.4.1 2007/01/05 15:10:04 ghen Exp $ Copyright (c) 1995-2002 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -2497,7 +2497,7 @@
        /* If we don't have a hostname yet, and we've been asked to do
           a reverse lookup to find the hostname, do it. */
        j = SV_GET_LEASE_HOSTNAMES;
-       if (!lookup_option (&server_universe, state -> options, i) &&
+       if (!lookup_option (&dhcp_universe, state -> options, i) &&
            (evaluate_boolean_option_cache
             (&ignorep, packet, lease, (struct client_state *)0,
              packet -> options, state -> options, &lease -> scope,