[src/netbsd-1-5]: src/usr.sbin/dhcp/common pull up difference between 1.1.1.1...

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

details:   https://anonhg.NetBSD.org/src/rev/501addc1a46c
branches:  netbsd-1-5
changeset: 488644:501addc1a46c
user:      mellon <mellon%NetBSD.org@localhost>
date:      Sat Jul 22 05:04:43 2000 +0000

description:
pull up difference between 1.1.1.10 and 1.1.1.11

diffstat:

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

diffs (29 lines):

diff -r 7dd4e64e1c62 -r 501addc1a46c usr.sbin/dhcp/common/socket.c
--- a/usr.sbin/dhcp/common/socket.c     Sat Jul 22 05:03:07 2000 +0000
+++ b/usr.sbin/dhcp/common/socket.c     Sat Jul 22 05:04:43 2000 +0000
@@ -51,7 +51,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: socket.c,v 1.1.1.10 2000/06/10 18:04:51 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: socket.c,v 1.1.1.10.2.1 2000/07/22 05:04:43 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -137,8 +137,14 @@
                log_fatal ("Can't set SO_BROADCAST option on dhcp socket: %m");
 
        /* Bind the socket to this interface's IP address. */
-       if (bind (sock, (struct sockaddr *)&name, sizeof name) < 0)
-               log_fatal ("Can't bind to dhcp address: %m");
+       if (bind (sock, (struct sockaddr *)&name, sizeof name) < 0) {
+               log_error ("Can't bind to dhcp address: %m");
+               log_error ("Please make sure there is no other dhcp server");
+               log_error ("running and that there's no entry for dhcp or");
+               log_error ("bootp in /etc/inetd.conf.   Also make sure you");
+               log_error ("are not running HP JetAdmin software, which");
+               log_fatal ("includes a bootp server.");
+       }
 
 #if defined (HAVE_SO_BINDTODEVICE)
        /* Bind this socket to this interface. */