{
smtp_transport_options_block * ob;
- if ( !( tp->info->driver_name == US"smtp"
+ if ( !( Ustrcmp(tp->info->driver_name, "smtp") == 0
&& (ob = (smtp_transport_options_block *)tp->options_block)
&& ob->hosts_override && ob->hosts
)
#ifdef SUPPORT_TLS
if (cutthrough.is_tls)
{
- smtp_peer_options |= PEER_OFFERED_TLS;
+ smtp_peer_options |= OPTION_TLS;
sending_ip_address = cutthrough.snd_ip;
sending_port = cutthrough.snd_port;