projects
/
ossec-hids.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
novi upstream verzije 2.8.3
[ossec-hids.git]
/
src
/
os_maild
/
sendcustomemail.c
diff --git
a/src/os_maild/sendcustomemail.c
b/src/os_maild/sendcustomemail.c
index
a597fcc
..
9026d02
100755
(executable)
--- a/
src/os_maild/sendcustomemail.c
+++ b/
src/os_maild/sendcustomemail.c
@@
-35,8
+35,10
@@
#define TO "To: <%s>\r\n"
#define CC "Cc: <%s>\r\n"
#define SUBJECT "Subject: %s\r\n"
#define TO "To: <%s>\r\n"
#define CC "Cc: <%s>\r\n"
#define SUBJECT "Subject: %s\r\n"
+#define ENDHEADER "\r\n"
#define ENDDATA "\r\n.\r\n"
#define QUITMSG "QUIT\r\n"
#define ENDDATA "\r\n.\r\n"
#define QUITMSG "QUIT\r\n"
+#define XHEADER "X-IDS-OSSEC: %s\r\n"
/* Error messages - Can be translated */
/* Error messages - Can be translated */
@@
-56,7
+58,7
@@
/* OS_SendCustomEmail
*/
/* OS_SendCustomEmail
*/
-int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, FILE *fp, struct tm *p)
+int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, char *idsname, FILE *fp, struct tm *p)
{
int socket,i = 0;
char *msg;
{
int socket,i = 0;
char *msg;
@@
-233,6
+235,13
@@
int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, F
OS_SendTCP(socket,snd_msg);
OS_SendTCP(socket,snd_msg);
+ if (idsname)
+ {
+ /* Sending server name header */
+ memset(snd_msg,'\0',128);
+ snprintf(snd_msg,127, XHEADER, idsname);
+ OS_SendTCP(socket, snd_msg);
+ }
/* Sending subject */
memset(snd_msg, '\0', 128);
/* Sending subject */
memset(snd_msg, '\0', 128);
@@
-240,6
+249,7
@@
int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, F
OS_SendTCP(socket, snd_msg);
OS_SendTCP(socket, snd_msg);
+ OS_SendTCP(socket,ENDHEADER);
/* Sending body */
/* Sending body */