Nagios Support Forum

This is a multi-part message in MIME format.
--------------090600000806030000060405
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable

On 11/05/2010 04:46 PM, Andreas Ericsson wrote:
> I'd prefer if you write them against git at git://git.op5.org/nagios.gi=
t
> (which I keep up to date with my tree) and then email patches with
> git-send-email, Cc'ing me and To'ing this list.

Unless you want to become betatester for the first attempts at git of
someone who's still happier (not to mention faster) coding with "vi"
within a myEclipse workspace, rather than using the developers'
myEclipse itself, I'd rather stick to "diff" and e-mail ...

> One patch at a time in separate emails with a brief explanation would
> work too though, but then I'll take them as and when I have time instea=
d
> of just applying them directly if they make sense.

1/3, coming through ...

What: Make url_encode() encode control characters correctly;
remove corresponding workaround from Command Expansion code
Why: check_commands may contain control chars (e.g., passing a
regexp with a into one of the command_line's $ARGn$s),
but url_encode() changed all control chars to (encoded) spaces.
Since Command Expansion receives the check_command to expand
via URL, it did not receive, much less expand, such
check_commands correctly.
--=20
Jochen Bern, Systemingenieur --- LINworks GmbH
Postfach 100121, 64201 Darmstadt | Robert-Koch-Str. 9, 64331 Weiterstadt
PGP (1024D/4096g) FP =3D D18B 41B1 16C0 11BA 7F8C DCF7 E1D5 FAF4 444E 1C2=
7
Tel. +49 6151 9067-231, Zentr. -0, Fax -299 - Amtsg. Darmstadt HRB 85202
Unternehmenssitz Weiterstadt, Gesch=E4ftsf=FChrer Metin Dogan, Oliver Mic=
hel

--------------090600000806030000060405
Content-Type: text/plain;
name="nagios-3.2.3-CommandExpandFix01-patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="nagios-3.2.3-CommandExpandFix01-patch.txt"

diff -aur nagios-3.2.3-CVS-20101105/cgi/cgiutils.c nagios-3.2.3+Fixes/cgi/cgiutils.c
--- nagios-3.2.3-CVS-20101105/cgi/cgiutils.c 2010-10-23 11:57:45.000000000 +0200
+++ nagios-3.2.3+Fixes/cgi/cgiutils.c 2010-11-05 13:18:34.000000000 +0100
@@ -920,7 +920,7 @@
}

/* spaces are pluses */
- else if((char)input[x]dangling whitespace:\n",bg_class,bg_class);
printf("$ARG%u$=",bg_class,i);
for (c=command_args,j=0;c&&isspace(*c);c++,j++)
- /* TODO: As long as the hyperlinks change all whitespace into actual spaces,
- we'll output "[WS]" (whitespace) instead of "[SP]"(ace). */
- /* if ((*c)==' ') printf("[SP]"); */
- if ((*c)==' ') printf("[WS]");
+ if ((*c)==' ') printf("[SP]");
else if ((*c)=='\f') printf("[FF]");
else if ((*c)=='\n') printf("[LF]");
else if ((*c)=='\r') printf("[CR]");
@@ -2391,10 +2388,7 @@
for (;c&&((*c)!='\0')&&(j");
for (;c&&((*c)!='\0');c++)
- /* TODO: As long as the hyperlinks change all whitespace into actual spaces,
- we'll output "[WS]" (whitespace) instead of "[SP]"(ace). */
- /* if ((*c)==' ') printf("[SP]"); */
- if ((*c)==' ') printf("[WS]");
+ if ((*c)==' ') printf("[SP]");
else if ((*c)=='\f') printf("[FF]");
else if ((*c)=='\n') printf("[LF]");
else if ((*c)=='\r') printf("[CR]");

--------------090600000806030000060405--





This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]