Fossil SCM
In the alert sending logic, if no "email-self" is specified, then substitute the bogus email address "nobody@invalid".
Commit
488af3639e4744041b90eb813e6eef91fbc0c83ea07005bcd89161cd34c48dd6
Parent
dc0a342d76fedfa…
1 file changed
+3
-1
+3
-1
| --- src/alerts.c | ||
| +++ src/alerts.c | ||
| @@ -804,11 +804,13 @@ | ||
| 804 | 804 | }else{ |
| 805 | 805 | blob_init(&all, 0, 0); |
| 806 | 806 | pOut = &all; |
| 807 | 807 | } |
| 808 | 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | - if( zFromName ){ | |
| 809 | + if( p->zFrom==0 || p->zFrom[0]==0 ){ | |
| 810 | + blob_appendf(pOut, "From: <nobody@invalid>\r\n"); | |
| 811 | + }else if( zFromName ){ | |
| 810 | 812 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 811 | 813 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 812 | 814 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 813 | 815 | }else{ |
| 814 | 816 | blob_appendf(pOut, "From: <%s>\r\n", p->zFrom); |
| 815 | 817 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -804,11 +804,13 @@ | |
| 804 | }else{ |
| 805 | blob_init(&all, 0, 0); |
| 806 | pOut = &all; |
| 807 | } |
| 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | if( zFromName ){ |
| 810 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 811 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 812 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 813 | }else{ |
| 814 | blob_appendf(pOut, "From: <%s>\r\n", p->zFrom); |
| 815 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -804,11 +804,13 @@ | |
| 804 | }else{ |
| 805 | blob_init(&all, 0, 0); |
| 806 | pOut = &all; |
| 807 | } |
| 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | if( p->zFrom==0 || p->zFrom[0]==0 ){ |
| 810 | blob_appendf(pOut, "From: <nobody@invalid>\r\n"); |
| 811 | }else if( zFromName ){ |
| 812 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 813 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 814 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 815 | }else{ |
| 816 | blob_appendf(pOut, "From: <%s>\r\n", p->zFrom); |
| 817 |