On Tue, Jun 01, 2010 at 11:25:23AM +0200, Martin Hochreiter wrote:
Possibly. Could you send me a copy of your
perdition.c file as
an attachment? Off-list is fine.
Or - another solution for us ... do you plan to
integrate the patch in
the CentOS RPMs?
(we use ldap as database and need the mailhost field ...)
Yes, but it may be faster
for you to sort the build problem out.
Hi Simon,
please find the files enclosed
Thanks.
I suspect that your installation of vanessa_logger is not the latest
version and that some macros provided by it are causing the problem
that you are seeing. Could you try the following patch for perdition.c ?
It should fix the build-errors that you are seeing, but I'm not sure
that the result will run as expected.
Index: perdition/perdition/perdition.c
===================================================================
--- perdition.orig/perdition/perdition.c 2010-06-02 14:05:21.000000000 +0900
+++ perdition/perdition/perdition.c 2010-06-02 14:06:01.000000000 +0900
@@ -704,15 +704,16 @@ int main (int argc, char **argv, char **
token_flush();
if(status<0){
VANESSA_LOGGER_DEBUG("protocol->in_get_pw");
- if (io_get_err(client_io) == io_err_timeout)
+ if (io_get_err(client_io) == io_err_timeout) {
VANESSA_LOGGER_ERR_UNSAFE("Fatal Error: Timeout reading "
"authentication information from "
"client%s: Exiting child",
from_to_host_str);
- else
+ } else {
VANESSA_LOGGER_ERR_UNSAFE("Fatal Error reading authentication "
"information from client%s: "
"Exiting child", from_to_host_str);
+ }
perdition_exit_cleanly(-1);
}
else if(status == 1){
@@ -944,11 +945,12 @@ int main (int argc, char **argv, char **
}
else if(status<0){
VANESSA_LOGGER_DEBUG_UNSAFE("protocol->out_authenticate %d", status);
- if (io_get_err(client_io) == io_err_timeout)
+ if (io_get_err(client_io) == io_err_timeout) {
VANESSA_LOGGER_ERR("Fatal error: Timeout authenticating user. "
"Exiting child.");
- else
+ } else {
VANESSA_LOGGER_ERR("Fatal error authenticating user. Exiting child.");
+ }
perdition_exit_cleanly(-1);
}
@@ -992,11 +994,12 @@ int main (int argc, char **argv, char **
if(io_pipe(server_io, client_io, buffer, BUFFER_SIZE,
&bytes_written, &bytes_read, &auth_log)<0){
VANESSA_LOGGER_DEBUG("vanessa_socket_pipe");
- if (io_get_err(client_io) == io_err_timeout)
+ if (io_get_err(client_io) == io_err_timeout) {
VANESSA_LOGGER_ERR("Fatal error: Timeout piping data. "
"Exiting child.");
- else
+ } else {
VANESSA_LOGGER_ERR("Fatal error piping data. Exiting child.");
+ }
perdition_exit_cleanly(-1);
}