diff options
| author | obrien <obrien@FreeBSD.org> | 1999-06-24 04:38:03 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-06-24 04:38:03 +0000 |
| commit | 9cddb41c75e01d97f1699ecb4dfb60e98451a95a (patch) | |
| tree | bb207b00d8931668d1c3c453bc5e2bd731fe9a0c | |
| parent | 7fb26aeeff2a91335897e7a9ca9b668d1393d67c (diff) | |
| download | FreeBSD-src-9cddb41c75e01d97f1699ecb4dfb60e98451a95a.zip FreeBSD-src-9cddb41c75e01d97f1699ecb4dfb60e98451a95a.tar.gz | |
Clean up conflicts.
| -rw-r--r-- | contrib/isc-dhcp/client/dhclient.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index 3a445f4..a4f0b35 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -56,10 +56,11 @@ #ifndef lint static char ocopyright[] = -"$Id: dhclient.c,v 1.44.2.37 1999/04/24 16:55:19 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhclient.c,v 1.44.2.39 1999/06/22 13:36:46 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" +#include "version.h" TIME cur_time; TIME default_lease_time = 43200; /* 12 hours... */ @@ -93,7 +94,7 @@ int onetry; static char copyright[] = "Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; static char arr [] = "All rights reserved."; -static char message [] = "Internet Software Consortium DHCP Client V2.0b1pl27"; +static char message [] = "Internet Software Consortium DHCP Client"; static char contrib [] = "Please contribute if you find this software useful."; static char url [] = "For info, please visit http://www.isc.org/dhcp-contrib.html"; @@ -110,7 +111,7 @@ int main (argc, argv, envp) int quiet = 1; char *s; - s = strchr (argv [0], '/'); + s = strrchr (argv [0], '/'); if (!s) s = argv [0]; else @@ -171,7 +172,7 @@ int main (argc, argv, envp) } if (!quiet) { - note (message); + note ("%s %s", message, DHCP_VERSION); note (copyright); note (arr); note (""); |
