From 4b936128c3dcd992e594d8c3f789267dfd1a3211 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Wed, 7 Feb 2024 22:40:39 +0100 Subject: [PATCH] Revert "Detailed error message when writing collections" --- apache2/apache2_config.c | 3 --- apache2/persist_dbm.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 6b71dea7..74c76a58 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -1749,9 +1749,6 @@ char *parser_conn_limits_operator(apr_pool_t *mp, const char *p2, apr_filepath_merge(&file, config_orig_path, param, APR_FILEPATH_TRUENAME, mp); - if (config_orig_path == NULL) { - return apr_psprintf(mp, "ModSecurity: failed to duplicate filename in parser_conn_limits_operator"); - } if ((strncasecmp(p2, "!@ipMatchFromFile", strlen("!@ipMatchFromFile")) == 0) || (strncasecmp(p2, "!@ipMatchF", strlen("!@ipMatchF")) == 0)) { diff --git a/apache2/persist_dbm.c b/apache2/persist_dbm.c index b71796bd..edd41c11 100644 --- a/apache2/persist_dbm.c +++ b/apache2/persist_dbm.c @@ -608,8 +608,8 @@ int collection_store(modsec_rec *msr, apr_table_t *col) { rc = apr_sdbm_store(dbm, key, value, APR_SDBM_REPLACE); if (rc != APR_SUCCESS) { - msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s (key=%s, length=%d)", dbm_filename, - get_apr_error(msr->mp, rc), key.dptr, value.dsize); + msr_log(msr, 1, "collection_store: Failed to write to DBM file \"%s\": %s", dbm_filename, + get_apr_error(msr->mp, rc)); if (dbm != NULL) { #ifdef GLOBAL_COLLECTION_LOCK apr_sdbm_close(dbm);