From 0267b464a19a8bce1eb420e2aeadce5d0a5cbba2 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 9 Mar 2009 17:29:08 +0000 Subject: [PATCH] As of r1.88, the show-status page can use a single line for warnings about ignored directives and the names of the ignored directives themselves. Reminded by Lee, finally closes #1856559. --- loadcfg.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/loadcfg.c b/loadcfg.c index 518df682..83a0da2e 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.89 2009/03/01 18:46:33 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.90 2009/03/07 17:58:02 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,11 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.89 2009/03/01 18:46:33 fabiankeil * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.90 2009/03/07 17:58:02 fabiankeil + * Fix two mingw32-only buffer overflows. Note that triggering + * them requires control over the configuration file in which + * case all bets are off anyway. + * * Revision 1.89 2009/03/01 18:46:33 fabiankeil * - Help clang understand that we aren't * dereferencing NULL pointers here. @@ -1752,7 +1757,7 @@ struct configuration_spec * load_config(void) log_error(LOG_LEVEL_ERROR, "Ignoring unrecognized directive '%s' (%luul) in line %lu " "in configuration file (%s).", buf, directive_hash, linenum, configfile); string_append(&config->proxy_args, - " Warning: ignored unrecognized directive above.
"); + " Warning: Ignoring unrecognized directive:"); break; /* *************************************************************************/ -- 2.39.2