2 files changed, 29 insertions, 26 deletions

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index a41a86e9..9b62b3e2 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -274,7 +274,7 @@ int main(int argc, char **argv){
 
         /* this plugin almost certainly needs root permissions. */
         np_warn_if_not_root();
-        
+
         /* create socket for DHCP communications */
         dhcp_socket=create_dhcp_socket();
 
@@ -316,7 +316,7 @@ int get_hardware_address(int sock,char *interface_name){
 
         strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1);
         ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0';
-        
+
         /* try and grab hardware address of requested interface */
         if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){
                 printf(_("Error: Could not get hardware address of interface '%s'\n"),interface_name);
@@ -506,7 +506,7 @@ int send_dhcp_discover(int sock){
                 opts += sizeof(requested_address);
                 }
         discover_packet.options[opts++]=DHCP_OPTION_END;
-        
+
         /* unicast fields */
         if(unicast)
                 discover_packet.giaddr.s_addr = my_ip.s_addr;
@@ -571,7 +571,7 @@ int get_dhcp_offer(int sock){
 
                 result=OK;
                 result=receive_dhcp_packet(&offer_packet,sizeof(offer_packet),sock,dhcpoffer_timeout,&source);
-                
+
                 if(result!=OK){
                         if(verbose)
                                 printf(_("Result=ERROR\n"));
@@ -952,7 +952,7 @@ int free_requested_server_list(void){
                 next_server=this_server->next;
                 free(this_server);
                 }
-        
+
         return OK;
         }
 
@@ -977,7 +977,7 @@ int get_results(void){
                                 /* get max lease time we were offered */
                                 if(temp_offer->lease_time>max_lease_time || temp_offer->lease_time==DHCP_INFINITE_TIME)
                                         max_lease_time=temp_offer->lease_time;
-                                
+
                                 /* see if we got the address we requested */
                                 if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
                                         received_requested_address=TRUE;
@@ -1009,7 +1009,7 @@ int get_results(void){
                         /* get max lease time we were offered */
                         if(temp_offer->lease_time>max_lease_time || temp_offer->lease_time==DHCP_INFINITE_TIME)
                                 max_lease_time=temp_offer->lease_time;
-                                
+
                         /* see if we got the address we requested */
                         if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
                                 received_requested_address=TRUE;
@@ -1387,7 +1387,7 @@ void print_help(void){
 
         printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
         printf (COPYRIGHT, copyright, email);
-        
+
         printf("%s\n", _("This plugin tests the availability of DHCP servers on a network."));
 
   printf ("\n\n");
@@ -1411,17 +1411,18 @@ void print_help(void){
   printf (" %s\n", "-u, --unicast");
   printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
 
+  printf (_(UT_SUPPORT));
         return;
         }
 
 
 void
 print_usage(void){
-        
+
   printf (_("Usage:"));
   printf (" %s [-v] [-u] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
   printf ("                  [-i interface] [-m mac]\n");
-  
+
         return;
         }
 
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 8e7f6d0b..a059f266 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -378,7 +378,7 @@ main(int argc, char **argv)
         setlocale (LC_ALL, "");
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
-        
+
         /* print a helpful error message if geteuid != 0 */
         np_warn_if_not_root();
 
@@ -646,7 +646,7 @@ run_checks()
                                                                  table[t]->name);
                                 continue;
                         }
-                        
+
                         /* we're still in the game, so send next packet */
                         (void)send_icmp_ping(icmp_sock, table[t]);
                         result = wait_for_reply(icmp_sock, target_interval);
@@ -1253,16 +1253,16 @@ print_help(void)
 {
 
   /*print_revision (progname, revision);*/ /* FIXME: Why? */
-  
+
   printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
   printf (COPYRIGHT, copyright, email);
-  
+
   printf ("\n\n");
-  
+
   print_usage ();
-  
+
   printf (_(UT_HELP_VRSN));
-  
+
   printf (" %s\n", "-H");
   printf ("    %s\n", _("specify a target"));
   printf (" %s\n", "-w");
@@ -1297,23 +1297,25 @@ print_help(void)
   printf ("    %s\n", _("verbose"));
 
   printf ("\n");
-        printf ("%s\n\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
-  printf ("%s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
-  printf ("%s\n", _("packet loss.  The default values should work well for most users."));
-  printf ("%s\n", _("You can specify different RTA factors using the standardized abbreviations"));
-  printf ("%s\n\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
+  printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
+  printf ("\n");
+  printf (" %s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
+  printf (" %s\n", _("packet loss.  The default values should work well for most users."));
+  printf (" %s\n", _("You can specify different RTA factors using the standardized abbreviations"));
+  printf (" %s\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
 /* -d not yet implemented */
 /*  printf ("%s\n", _("Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops"));
   printf ("%s\n", _("are spent and CRITICAL if >= 14 hops are spent."));
   printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
-  printf ("%s\n\n", _("The -v switch can be specified several times for increased verbosity."));
+  printf ("\n");
+  printf (" %s\n", _("The -v switch can be specified several times for increased verbosity."));
 
 /*  printf ("%s\n", _("Long options are currently unsupported."));
   printf ("%s\n", _("Options marked with * require an argument"));
 */
+
   printf (_(UT_SUPPORT));
-  
-  printf (_(UT_NOWARRANTY));
 }
 
 
@@ -1322,5 +1324,5 @@ void
 print_usage (void)
 {
   printf (_("Usage:"));
-  printf(" %s [options] [-H] host1 host2 hostn\n", progname);
+  printf(" %s [options] [-H] host1 host2 hostN\n", progname);
 }