[src/netbsd-1-5]: src/usr.sbin/dhcp/server Pull up differences between 1.20 a...

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

details:   https://anonhg.NetBSD.org/src/rev/92b51de2bc8d
branches:  netbsd-1-5
changeset: 488635:92b51de2bc8d
user:      mellon <mellon%NetBSD.org@localhost>
date:      Sat Jul 22 04:59:41 2000 +0000

description:
Pull up differences between 1.20 and 1.21

diffstat:

 usr.sbin/dhcp/server/dhcpd.c |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (57 lines):

diff -r da71db311705 -r 92b51de2bc8d usr.sbin/dhcp/server/dhcpd.c
--- a/usr.sbin/dhcp/server/dhcpd.c      Sat Jul 22 04:59:27 2000 +0000
+++ b/usr.sbin/dhcp/server/dhcpd.c      Sat Jul 22 04:59:41 2000 +0000
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.17.2.1 2000/07/10 19:58:53 mellon Exp $ Copyright 1995-2000 Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.17.2.2 2000/07/22 04:59:41 mellon Exp $ Copyright 1995-2000 Internet Software Consortium.";
 #endif
 
   static char copyright[] =
@@ -166,6 +166,9 @@
        struct parse *parse;
        int lose;
        int omapi_port;
+       int no_dhcpd_conf = 0;
+       int no_dhcpd_db = 0;
+       int no_dhcpd_pid = 0;
 
        /* Set up the client classification system. */
        classification_setup ();
@@ -221,14 +224,17 @@
                        if (++i == argc)
                                usage ();
                        path_dhcpd_conf = argv [i];
+                       no_dhcpd_conf = 1;
                } else if (!strcmp (argv [i], "-lf")) {
                        if (++i == argc)
                                usage ();
                        path_dhcpd_db = argv [i];
+                       no_dhcpd_db = 1;
                } else if (!strcmp (argv [i], "-pf")) {
                        if (++i == argc)
                                usage ();
                        path_dhcpd_pid = argv [i];
+                       no_dhcpd_pid = 1;
                 } else if (!strcmp (argv [i], "-t")) {
                        /* test configurations only */
 #ifndef DEBUG
@@ -268,6 +274,16 @@
                }
        }
 
+       if (!no_dhcpd_conf && (s = getenv ("PATH_DHCPD_CONF"))) {
+               path_dhcpd_conf = s;
+       }
+       if (!no_dhcpd_db && (s = getenv ("PATH_DHCPD_DB"))) {
+               path_dhcpd_db = s;
+       }
+       if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) {
+               path_dhcpd_pid = s;
+       }
+
        if (!quiet) {
                log_info ("%s %s", message, DHCP_VERSION);
                log_info (copyright);