diff --git a/apache2/mlogc-src/mlogc-batch-load.pl.in b/apache2/mlogc-src/mlogc-batch-load.pl.in index 75d43ba5..a32f57fa 100755 --- a/apache2/mlogc-src/mlogc-batch-load.pl.in +++ b/apache2/mlogc-src/mlogc-batch-load.pl.in @@ -1,7 +1,7 @@ #!@PERL@ # # ModSecurity for Apache 2.x, http://www.modsecurity.org/ -# Copyright (c) 2004-2008 Breach Security, Inc. (http://www.breach.com/) +# Copyright (c) 2004-2009 Breach Security, Inc. (http://www.breach.com/) # # This product is released under the terms of the General Public Licence, # version 2 (GPLv2). Please refer to the file LICENSE (included with this diff --git a/apache2/mlogc-src/mlogc.c b/apache2/mlogc-src/mlogc.c index a36e155a..6e5bd81b 100644 --- a/apache2/mlogc-src/mlogc.c +++ b/apache2/mlogc-src/mlogc.c @@ -1,6 +1,6 @@ /* * ModSecurity for Apache 2.x, http://www.modsecurity.org/ - * Copyright (c) 2004-2008 Breach Security, Inc. (http://www.breach.com/) + * Copyright (c) 2004-2009 Breach Security, Inc. (http://www.breach.com/) * * This product is released under the terms of the General Public Licence, * version 2 (GPLv2). Please refer to the file LICENSE (included with this @@ -363,7 +363,7 @@ static void error_log(int level, void *thread, const char *text, ...) apr_file_write_full(error_log_fd, msg2, nbytes, &nbytes_written); } else { - fprintf(stderr, msg2); + fprintf(stderr, "%s", msg2); } va_end(ap); @@ -1051,7 +1051,7 @@ static void logc_init() /* Pre-configure the handle. */ curl_easy_setopt(curl, CURLOPT_UPLOAD, TRUE); curl_easy_setopt(curl, CURLOPT_PUT, TRUE); - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, NULL); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, (char *)NULL); curl_easy_setopt(curl, CURLOPT_URL, console_uri); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE); @@ -1289,7 +1289,7 @@ static void * APR_THREAD_FUNC thread_worker(apr_thread_t *thread, void *data) curl_easy_setopt(curl, CURLOPT_DEBUGDATA, thread); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_error_buffer); curl_easy_setopt(curl, CURLOPT_USERPWD, credentials); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, response_buf); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, (char *)response_buf); headerlist = curl_slist_append(headerlist, "Expect:"); headerlist = curl_slist_append(headerlist, hash);