[src/trunk]: src/usr.sbin/dhcp Resolve conflicts in pl20a merge.

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

details:   https://anonhg.NetBSD.org/src/rev/0817177e3b57
branches:  trunk
changeset: 467826:0817177e3b57
user:      mellon <mellon%NetBSD.org@localhost>
date:      Tue Mar 30 00:12:14 1999 +0000

description:
Resolve conflicts in pl20a merge.

diffstat:

 usr.sbin/dhcp/client/dhclient.c |  6 +++---
 usr.sbin/dhcp/server/dhcpd.c    |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 307987ec96fa -r 0817177e3b57 usr.sbin/dhcp/client/dhclient.c
--- a/usr.sbin/dhcp/client/dhclient.c   Tue Mar 30 00:10:08 1999 +0000
+++ b/usr.sbin/dhcp/client/dhclient.c   Tue Mar 30 00:12:14 1999 +0000
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.17 1999/03/29 23:08:21 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.18 1999/03/30 00:12:14 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -175,10 +175,10 @@
                note (message);
                note (copyright);
                note (arr);
-               note ("")
+               note ("");
                note (contrib);
                note (url);
-               note ("")
+               note ("");
        }
 
        /* Default to the DHCP/BOOTP port. */
diff -r 307987ec96fa -r 0817177e3b57 usr.sbin/dhcp/server/dhcpd.c
--- a/usr.sbin/dhcp/server/dhcpd.c      Tue Mar 30 00:10:08 1999 +0000
+++ b/usr.sbin/dhcp/server/dhcpd.c      Tue Mar 30 00:12:14 1999 +0000
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.8 1999/03/29 23:08:23 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.9 1999/03/30 00:12:15 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 #endif
 
 static char copyright[] =
@@ -117,7 +117,7 @@
        for (i = 1; i < argc; i++) {
                if (!strcmp (argv [i], "-p")) {
                        if (++i == argc)
-                               usage ();
+                               usage (appname);
                        for (s = argv [i]; *s; s++)
                                if (!isdigit (*s))
                                        error ("%s: not a valid UDP port",