Cosmetics: fix #1400 indentation and help message

Felipe Zimmerle · Felipe Zimmerle · commit d6bd0badc5d6 · 2017-05-08T16:01:37.000-03:00
diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c
@@ -1278,7 +1278,7 @@ void sec_audit_logger_json(modsec_rec *msr) {
             yajl_gen_map_close(g); // sanitized args map is finished
         }
 #ifdef LOG_NO_SERVER_CONTEXT
-		}
+	}
 #endif
 
         /* Web application info. */
@@ -2100,10 +2100,10 @@ void sec_audit_logger_native(modsec_rec *msr) {
             }
         }
 #ifdef LOG_NO_SERVER_CONTEXT
-		}
+	}
 #endif
 
-		/* Web application info. */
+	/* Web application info. */
         if ( ((msr->txcfg->webappid != NULL)&&(strcmp(msr->txcfg->webappid, "default") != 0))
             || (msr->sessionid != NULL) || (msr->userid != NULL))
         {
diff --git a/configure.ac b/configure.ac
@@ -520,7 +520,7 @@ AC_ARG_ENABLE(stopwatch-logging,
 # Disable logging of server context
 AC_ARG_ENABLE(server-context-logging,
               AS_HELP_STRING([--enable-server-context-logging],
-                             [Enable logging of server info (log producer, sanitized objects, ...) in audit log when log level < 9. This is the default]),
+                             [Enable logging of server info (log producer, sanitized objects, ...) in audit log even when log level < 9. This is the default]),
 [
   if test "$enableval" != "no"; then
     log_server_context=

Original file line number	Diff line number	Diff line change
`@@ -1278,7 +1278,7 @@ void sec_audit_logger_json(modsec_rec *msr) {`
`1278`	`1278`	`yajl_gen_map_close(g); // sanitized args map is finished`
`1279`	`1279`	`}`
`1280`	`1280`	`#ifdef LOG_NO_SERVER_CONTEXT`
`1281`		`- }`
	`1281`	`+ }`
`1282`	`1282`	`#endif`
`1283`	`1283`
`1284`	`1284`	`/* Web application info. */`
`@@ -2100,10 +2100,10 @@ void sec_audit_logger_native(modsec_rec *msr) {`
`2100`	`2100`	`}`
`2101`	`2101`	`}`
`2102`	`2102`	`#ifdef LOG_NO_SERVER_CONTEXT`
`2103`		`- }`
	`2103`	`+ }`
`2104`	`2104`	`#endif`
`2105`	`2105`
`2106`		`- /* Web application info. */`
	`2106`	`+ /* Web application info. */`
`2107`	`2107`	`if ( ((msr->txcfg->webappid != NULL)&&(strcmp(msr->txcfg->webappid, "default") != 0))`
`2108`	`2108`	`\|\| (msr->sessionid != NULL) \|\| (msr->userid != NULL))`
`2109`	`2109`	`{`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ AC_ARG_ENABLE(stopwatch-logging,`
`520`	`520`	`# Disable logging of server context`
`521`	`521`	`AC_ARG_ENABLE(server-context-logging,`
`522`	`522`	`AS_HELP_STRING([--enable-server-context-logging],`
`523`		`- [Enable logging of server info (log producer, sanitized objects, ...) in audit log when log level < 9. This is the default]),`
	`523`	`+ [Enable logging of server info (log producer, sanitized objects, ...) in audit log even when log level < 9. This is the default]),`
`524`	`524`	`[`
`525`	`525`	`if test "$enableval" != "no"; then`
`526`	`526`	`log_server_context=`