[Nagiosplug-checkins] nagiosplug/plugins check_http.c, 1.97, 1.98 check_ldap.c, 1.33, 1.34

[Thomas Guyot]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv8554/plugins

Modified Files:
	check_http.c check_ldap.c 
Log Message:
Fix bug #1632091: printf format string typos. Add some more cosmetic changes.


Index: check_ldap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ldap.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- check_ldap.c	22 Oct 2006 22:24:27 -0000	1.33
+++ check_ldap.c	20 Jan 2007 07:18:12 -0000	1.34
@@ -378,9 +378,9 @@
   printf ("    %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
   printf (" %s\n", "-b [--base]");
   printf ("    %s\n", _("ldap base (eg. ou=my unit, o=my org, c=at"));
-  printf (" %s\n," "-D [--bind]");
+  printf (" %s\n", "-D [--bind]");
   printf ("    %s\n", _("ldap bind DN (if required)"));
-  printf (" %s\n," "-P [--pass]");
+  printf (" %s\n", "-P [--pass]");
   printf ("    %s\n", _("ldap password (if required)"));
 
 #ifdef HAVE_LDAP_SET_OPTION
@@ -410,9 +410,9 @@
 {
   printf (_("Usage:"));
 	printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
-  printf ("[-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]\n",
+  printf ("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
 #ifdef HAVE_LDAP_SET_OPTION
-			" [-2|-3] [-4|-6]"
+			"\n       [-2|-3] [-4|-6]"
 #else
 			""
 #endif

Index: check_http.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_http.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- check_http.c	20 Dec 2006 22:33:29 -0000	1.97
+++ check_http.c	20 Jan 2007 07:18:12 -0000	1.98
@@ -1263,13 +1263,13 @@
 
   printf (" %s\n", "-e, --expect=STRING");
   printf ("    %s\n", _("String to expect in first (status) line of server response (default: "));
-  printf ("%s\n", HTTP_EXPECT);
+  printf ("%s)\n", HTTP_EXPECT);
   printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
   printf (" %s\n", "-s, --string=STRING");
   printf ("    %s\n", _("String to expect in the content"));
   printf (" %s\n", "-u, --url=PATH");
   printf ("    %s\n", _("URL to GET or POST (default: /)"));
-  printf (" %s\n," "-P, --post=STRING");
+  printf (" %s\n", "-P, --post=STRING");
   printf ("    %s\n", _("URL encoded http POST data"));
   printf (" %s\n", "-N, --no-body");
   printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));