Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts in pl20a merge.

This commit is contained in:
mellon 1999-03-30 00:12:14 +00:00
parent 4f34fd30b5
commit 029f7c27bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/dhcp/client/dhclient.c
View File

@ -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 @@ int main (argc, argv, envp)
note (message);
note (copyright);
note (arr);
note ("")
note ("");
note (contrib);
note (url);
note ("")
note ("");
}
/* Default to the DHCP/BOOTP port. */

4
usr.sbin/dhcp/server/dhcpd.c
View File

@ -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 @@ int main (argc, argv, envp)
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",