2020/02/26 01:22:59

Masahiko-Ito · Feb 25, 2020 · 1182617 · 1182617
1 parent 9fd27d6
commit 1182617
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/sample/smtp_filter2.sh b/sample/smtp_filter2.sh
@@ -166,11 +166,13 @@ awk 'BEGIN{
 
     if (out_sw == 1){
         print $0;
+	fflush()
     }
 }
 END{
     if (out_sw == 0){
         printf("[%d]:IP=%-s HOST=%-s REASON=NOT spam, but NO DATA\n", pid, from_ip, from_hostname)
+	fflush()
     }
 }' ${tmp}/smtp_filter2.1.$$.tmp
 #

diff --git a/smtp_wrapper.c b/smtp_wrapper.c
@@ -1228,6 +1228,7 @@ int  sock_read(s, buf, len, read_buf, ptr_tv)
 {
     int ret, read_len, return_len;
     char *ptr_lf, *ptr_null;
+    char tmp_buf[BUF_LEN];
 
     if (strchr(read_buf, '\n') == (char *)NULL){
 
@@ -1273,7 +1274,8 @@ int  sock_read(s, buf, len, read_buf, ptr_tv)
             strncpy(buf, read_buf, return_len);
 
             ptr_null = strchr(read_buf, '\0');
-            strncpy(read_buf, (ptr_lf + 1), ptr_null - ptr_lf);
+            strncpy(tmp_buf, (ptr_lf + 1), ptr_null - ptr_lf);
+            strncpy(read_buf, tmp_buf, ptr_null - ptr_lf);
             ptr_null = strchr(read_buf, '\0');
             bzero(ptr_null + 1, BUF_LEN - (ptr_null - read_buf + 1));
         }