[master] Output copyright et al with usage in dhcrelay

    Merges in rt41865.

diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 64b580b6c67fc3512e00fc38966caecdcabd058d..897a776656f5d4c74d5410f2bc45fe7d87af0e5f 100644 (file)
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -142,7 +142,7 @@ static int strip_relay_agent_options(struct interface_info *,
 static void request_v4_interface(const char* name, int flags);
 
 static const char copyright[] =
-"Copyright 2004-2016 Internet Systems Consortium.";
+"Copyright 2004-2017 Internet Systems Consortium.";
 static const char arr[] = "All rights reserved.";
 static const char message[] =
 "Internet Systems Consortium DHCP Relay Agent";
@@ -207,6 +207,10 @@ static const char use_v6command[] = "Command not used for DHCPv4: %s";
 
 static void
 usage(const char *sfmt, const char *sarg) {
+       log_info("%s %s", message, PACKAGE_VERSION);
+       log_info(copyright);
+       log_info(arr);
+       log_info(url);
 
        /* If desired print out the specific error message */
 #ifdef PRINT_SPECIFIC_CL_ERRORS

diff --git a/server/dhcpd.c b/server/dhcpd.c
index b8a371141dd0218f114ace1f5b8970a87d03ee52..19c6a6879a9c33a101a3a0675d127ed8b7f03b6c 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -27,7 +27,7 @@
  */
 
 static const char copyright[] =
-"Copyright 2004-2016 Internet Systems Consortium.";
+"Copyright 2004-2017 Internet Systems Consortium.";
 static const char arr [] = "All rights reserved.";
 static const char message [] = "Internet Systems Consortium DHCP Server";
 static const char url [] =
@@ -198,6 +198,7 @@ usage(const char *sfmt, const char *sarg) {
        log_info("%s %s", message, PACKAGE_VERSION);
        log_info(copyright);
        log_info(arr);
+       log_info(url);
 
        /* If desired print out the specific error message */
 #ifdef PRINT_SPECIFIC_CL_ERRORS