diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-08-27 11:34:43 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2002-08-27 11:34:43 +0000 |
| commit | e1252c8d4a9ef03bcffefb79b4cdfc97962b5abc (patch) | |
| tree | 8e4688a2b01fd035292213e12ab3f609d40ea827 /include | |
| parent | 272c1b225ac46847320d48c6fe133a012cad2262 (diff) | |
| download | zabbix-e1252c8d4a9ef03bcffefb79b4cdfc97962b5abc.tar.gz zabbix-e1252c8d4a9ef03bcffefb79b4cdfc97962b5abc.tar.xz zabbix-e1252c8d4a9ef03bcffefb79b4cdfc97962b5abc.zip | |
- \n changed to \r\n in send_email() (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@466 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/functions.c b/include/functions.c index 3f8d578b..61f012bb 100644 --- a/include/functions.c +++ b/include/functions.c @@ -325,7 +325,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c if(strlen(smtp_helo) != 0) { memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"HELO %s\n",smtp_helo); + sprintf(c,"HELO %s\r\n",smtp_helo); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -352,7 +352,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"MAIL FROM: %s\n",smtp_email); + sprintf(c,"MAIL FROM: %s\r\n",smtp_email); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -378,7 +378,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"RCPT TO: <%s>\n",mailto); + sprintf(c,"RCPT TO: <%s>\r\n",mailto); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -403,7 +403,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"DATA\n"); + sprintf(c,"DATA\r\n"); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -428,7 +428,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"Subject: %s\n%s",mailsubject, mailbody); + sprintf(c,"Subject: %s\r\n%s",mailsubject, mailbody); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -438,7 +438,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"\n.\n"); + sprintf(c,"\r\n.\r\n"); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { @@ -463,7 +463,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c } /* memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"\n"); + sprintf(c,"\r\n"); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e ==- 1) { @@ -482,7 +482,7 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c }*/ memset(c,0,MAX_STRING_LEN+1); - sprintf(c,"QUIT\n"); + sprintf(c,"QUIT\r\n"); e=sendto(s,c,strlen(c),0,(struct sockaddr *)&servaddr_in,sizeof(struct sockaddr_in)); if(e == -1) { |