[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ossec-dev] errno messages
- To: ossec-dev@xxxxxxxxx
- Subject: [ossec-dev] errno messages
- From: "Robert Millan [ackstorm]" <rmillan@xxxxxxxxxxx>
- Date: Wed, 21 Mar 2007 12:01:26 +0100
- Organization: http://www.ackstorm.es/
Please could you try to add errno messages to the standard error handling
routinges? It is hard to debug things when reasons of the failure are not
given. I'm sending a patch for QUEUE_ERROR as an example of what I mean.
--
Robert Millan
ACK STORM, S.L. - http://www.ackstorm.es/
diff -ur ossec-hids-1.0.old/src/analysisd/analysisd.c ossec-hids-1.0/src/analysisd/analysisd.c
--- ossec-hids-1.0.old/src/analysisd/analysisd.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/analysisd/analysisd.c 2007-03-21 11:50:23.000000000 +0100
@@ -329,7 +329,7 @@
/* Setting the queue */
if((m_queue = StartMQ(DEFAULTQUEUE,READ)) < 0)
- ErrorExit(QUEUE_ERROR,ARGV0,DEFAULTQUEUE);
+ ErrorExit(QUEUE_ERROR,ARGV0,DEFAULTQUEUE,strerror(errno));
/* White list */
diff -ur ossec-hids-1.0.old/src/client-agent/agentd.c ossec-hids-1.0/src/client-agent/agentd.c
--- ossec-hids-1.0.old/src/client-agent/agentd.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/client-agent/agentd.c 2007-03-21 11:50:23.000000000 +0100
@@ -63,7 +63,7 @@
* Exit if fails.
*/
if((logr->m_queue = StartMQ(DEFAULTQUEUE,READ)) < 0)
- ErrorExit(QUEUE_ERROR,ARGV0,DEFAULTQUEUE);
+ ErrorExit(QUEUE_ERROR,ARGV0,DEFAULTQUEUE,strerror(errno));
maxfd = logr->m_queue;
diff -ur ossec-hids-1.0.old/src/error_messages/error_messages.h ossec-hids-1.0/src/error_messages/error_messages.h
--- ossec-hids-1.0.old/src/error_messages/error_messages.h 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/error_messages/error_messages.h 2007-03-21 11:50:23.000000000 +0100
@@ -58,7 +58,7 @@
#define SETGID_ERROR "%s(1207): Unable to switch to group: '%d'."
#define SETUID_ERROR "%s(1208): Unable to switch to user: '%s'."
#define CHROOT_ERROR "%s(1209): Unable to chroot to directory: '%s'."
-#define QUEUE_ERROR "%s(1210): Queue '%s' not accessible."
+#define QUEUE_ERROR "%s(1210): Queue '%s' not accessible: %s."
#define QUEUE_FATAL "%s(1211): Unable to access queue: '%s'. Giving up.."
#define PID_ERROR "%s(1212): Unable to create PID file."
#define DENYIP_ERROR "%s(1213): Message from %s not allowed."
Binary files ossec-hids-1.0.old/src/external/libz.a and ossec-hids-1.0/src/external/libz.a differ
Binary files ossec-hids-1.0.old/src/external/zlib-1.2.3/libz.a and ossec-hids-1.0/src/external/zlib-1.2.3/libz.a differ
Binary files ossec-hids-1.0.old/src/os_crypto/blowfish/bf_op.a and ossec-hids-1.0/src/os_crypto/blowfish/bf_op.a differ
Binary files ossec-hids-1.0.old/src/os_crypto/md5/md5_op.a and ossec-hids-1.0/src/os_crypto/md5/md5_op.a differ
Binary files ossec-hids-1.0.old/src/os_crypto/os_crypto.a and ossec-hids-1.0/src/os_crypto/os_crypto.a differ
Binary files ossec-hids-1.0.old/src/os_crypto/sha1/sha1_op.a and ossec-hids-1.0/src/os_crypto/sha1/sha1_op.a differ
Binary files ossec-hids-1.0.old/src/os_crypto/shared/shared.a and ossec-hids-1.0/src/os_crypto/shared/shared.a differ
diff -ur ossec-hids-1.0.old/src/os_execd/execd.c ossec-hids-1.0/src/os_execd/execd.c
--- ossec-hids-1.0.old/src/os_execd/execd.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/os_execd/execd.c 2007-03-21 11:50:23.000000000 +0100
@@ -129,7 +129,7 @@
/* Starting queue (exec queue) */
if((m_queue = StartMQ(EXECQUEUEPATH,READ)) < 0)
- ErrorExit(QUEUE_ERROR,ARGV0,EXECQUEUEPATH);
+ ErrorExit(QUEUE_ERROR,ARGV0,EXECQUEUEPATH,strerror(errno));
/* Start up message */
@@ -323,7 +323,7 @@
/* Receiving the message */
if(recv(q, buffer, OS_MAXSTR, 0) == -1)
{
- merror(QUEUE_ERROR, ARGV0, EXECQUEUEPATH);
+ merror(QUEUE_ERROR, ARGV0, EXECQUEUEPATH,strerror(errno));
continue;
}
diff -ur ossec-hids-1.0.old/src/remoted/ar-forward.c ossec-hids-1.0/src/remoted/ar-forward.c
--- ossec-hids-1.0.old/src/remoted/ar-forward.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/remoted/ar-forward.c 2007-03-21 11:50:23.000000000 +0100
@@ -45,7 +45,7 @@
/* Creating the unix queue */
if((arq = StartMQ(ARQUEUE, READ)) < 0)
{
- ErrorExit(QUEUE_ERROR, ARGV0, ARQUEUE);
+ ErrorExit(QUEUE_ERROR, ARGV0, ARQUEUE,strerror(errno));
}
memset(msg, '\0', OS_SIZE_1024 +1);
diff -ur ossec-hids-1.0.old/src/remoted/secure.c ossec-hids-1.0/src/remoted/secure.c
--- ossec-hids-1.0.old/src/remoted/secure.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/remoted/secure.c 2007-03-21 11:50:23.000000000 +0100
@@ -185,7 +185,7 @@
if(SendMSG(logr.m_queue, tmp_msg, srcmsg,
SECURE_MQ) < 0)
{
- merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE,strerror(errno));
if((logr.m_queue = StartMQ(DEFAULTQUEUE, WRITE)) < 0)
{
diff -ur ossec-hids-1.0.old/src/remoted/syslog.c ossec-hids-1.0/src/remoted/syslog.c
--- ossec-hids-1.0.old/src/remoted/syslog.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/remoted/syslog.c 2007-03-21 11:50:23.000000000 +0100
@@ -124,7 +124,7 @@
else if(SendMSG(logr.m_queue, buffer_pt, srcip,
SYSLOG_MQ) < 0)
{
- merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE,strerror(errno));
if((logr.m_queue = StartMQ(DEFAULTQUEUE,READ)) < 0)
{
ErrorExit(QUEUE_FATAL,ARGV0,DEFAULTQUEUE);
diff -ur ossec-hids-1.0.old/src/remoted/syslogtcp.c ossec-hids-1.0/src/remoted/syslogtcp.c
--- ossec-hids-1.0.old/src/remoted/syslogtcp.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/remoted/syslogtcp.c 2007-03-21 11:50:23.000000000 +0100
@@ -141,7 +141,7 @@
/* Sending to the queue */
if(SendMSG(logr.m_queue, buffer_pt, srcip,SYSLOG_MQ) < 0)
{
- merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQUEUE,strerror(errno));
if((logr.m_queue = StartMQ(DEFAULTQUEUE,READ)) < 0)
{
ErrorExit(QUEUE_FATAL,ARGV0,DEFAULTQUEUE);
diff -ur ossec-hids-1.0.old/src/rootcheck/rootcheck.c ossec-hids-1.0/src/rootcheck/rootcheck.c
--- ossec-hids-1.0.old/src/rootcheck/rootcheck.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/rootcheck/rootcheck.c 2007-03-21 11:53:04.000000000 +0100
@@ -19,6 +19,7 @@
/* Included from the Rootcheck project */
+#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -187,14 +188,14 @@
/* Starting the queue. */
if((rootcheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
{
- merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH,strerror(errno));
/* 5 seconds to see if the agent starts */
sleep(5);
if((rootcheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
{
/* more 10 seconds wait.. */
- merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH,strerror(errno));
sleep(10);
if((rootcheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
ErrorExit(QUEUE_FATAL,ARGV0,DEFAULTQPATH);
diff -ur ossec-hids-1.0.old/src/shared/mq_op.c ossec-hids-1.0/src/shared/mq_op.c
--- ossec-hids-1.0.old/src/shared/mq_op.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/shared/mq_op.c 2007-03-21 11:50:23.000000000 +0100
@@ -41,7 +41,7 @@
sleep(5);
if(File_DateofChange(path) < 0)
{
- merror(QUEUE_ERROR, __local_name, path);
+ merror(QUEUE_ERROR, __local_name, path,strerror(errno));
sleep(15);
if(File_DateofChange(path) < 0)
{
@@ -62,7 +62,7 @@
sleep(2);
if((rc = OS_ConnectUnixDomain(path)) < 0)
{
- merror(QUEUE_ERROR, __local_name, path);
+ merror(QUEUE_ERROR, __local_name, path,strerror(errno));
return(-1);
}
}
diff -ur ossec-hids-1.0.old/src/syscheckd/syscheck.c ossec-hids-1.0/src/syscheckd/syscheck.c
--- ossec-hids-1.0.old/src/syscheckd/syscheck.c 2007-03-21 11:49:31.000000000 +0100
+++ ossec-hids-1.0/src/syscheckd/syscheck.c 2007-03-21 11:50:23.000000000 +0100
@@ -246,13 +246,13 @@
/* Connect to the queue */
if((syscheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
{
- merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH,strerror(errno));
sleep(5);
if((syscheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
{
/* more 10 seconds of wait.. */
- merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH);
+ merror(QUEUE_ERROR,ARGV0,DEFAULTQPATH,strerror(errno));
sleep(10);
if((syscheck.queue = StartMQ(DEFAULTQPATH,WRITE)) < 0)
ErrorExit(QUEUE_FATAL,ARGV0,DEFAULTQPATH);
OSSEC home |
Main Index |
Thread Index
OSSEC project: www.ossec.net.
Mailling list information: http://www.ossec.net/en/mailing_lists.html.