Fossil

Differences From Artifact [a6f58c4b38]:

• File src/alerts.c — part of check-in [488af3639e] at 2019-07-22 16:12:52 on branch trunk — In the alert sending logic, if no "email-self" is specified, then substitute the bogus email address "nobody@invalid". (user: drh size: 89198)

To Artifact [2ea635f210]:

• File src/alerts.c — part of check-in [4c73b4afb9] at 2019-07-22 19:06:28 on branch trunk — Bail out of the alert_send() routine if the notification system is misconfigured with a blank email-self value. (user: drh size: 89221) [more...]

803
804
805
806
807
808
809
810
811
812
813
814
815
816
817

    }
  }else{
    blob_init(&all, 0, 0);
    pOut = &all;
  }
  blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr));
  if( p->zFrom==0 || p->zFrom[0]==0 ){
    blob_appendf(pOut, "From: <nobody@invalid>\r\n");
  }else if( zFromName ){
    blob_appendf(pOut, "From: %s <%s@%s>\r\n",
       zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom));
    blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom);
  }else{
    blob_appendf(pOut, "From: <%s>\r\n", p->zFrom);
  }

|

803
804
805
806
807
808
809
810
811
812
813
814
815
816
817

    }
  }else{
    blob_init(&all, 0, 0);
    pOut = &all;
  }
  blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr));
  if( p->zFrom==0 || p->zFrom[0]==0 ){
    return;  /* email-self is not set.  Error will be reported separately */
  }else if( zFromName ){
    blob_appendf(pOut, "From: %s <%s@%s>\r\n",
       zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom));
    blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom);
  }else{
    blob_appendf(pOut, "From: <%s>\r\n", p->zFrom);
  }