- req_str = string_append(req_str, 3,
- "Rcpt: <", recipients_list[i].address, ">\r\n");
- if ((s = expand_string(US"$sender_helo_name")) && *s)
- req_str = string_append(req_str, 3, "Helo: ", s, "\r\n");
- if ((s = expand_string(US"$sender_host_name")) && *s)
- req_str = string_append(req_str, 3, "Hostname: ", s, "\r\n");
- if (sender_host_address)
- req_str = string_append(req_str, 3, "IP: ", sender_host_address, "\r\n");
- if ((s = expand_string(US"$authenticated_id")) && *s)
- req_str = string_append(req_str, 3, "User: ", s, "\r\n");
- req_str = string_catn(req_str, US"\r\n", 2);
+ req_str = string_sprintf("%sRcpt: <%s>\r\n", req_str, recipients_list[i].address);
+ if ((helo = expand_string(US"$sender_helo_name")) != NULL && *helo != '\0')
+ req_str = string_sprintf("%sHelo: %s\r\n", req_str, helo);
+ if ((fcrdns = expand_string(US"$sender_host_name")) != NULL && *fcrdns != '\0')
+ req_str = string_sprintf("%sHostname: %s\r\n", req_str, fcrdns);
+ if (sender_host_address != NULL)
+ req_str = string_sprintf("%sIP: %s\r\n", req_str, sender_host_address);
+ if ((authid = expand_string(US"$authenticated_id")) != NULL && *authid != '\0')
+ req_str = string_sprintf("%sUser: %s\r\n", req_str, authid);
+ req_str = string_sprintf("%s\r\n", req_str);