masqmail

changeset 372:b0708fac99dd

find changesets by author, revision, files, or words in the commit message
Fixed a problem with psb->remote_host, introduced in changeset 412385b57dc4
author markus schnalke <meillo@marmaro.de>
date Tue, 25 Oct 2011 14:31:28 +0200
parents f122535c589e
children 4cab237ce923
files src/deliver.c src/smtp_out.c src/smtp_out.h
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/src/deliver.c	Tue Oct 25 13:51:43 2011 +0200
     1.2 +++ b/src/deliver.c	Tue Oct 25 14:31:28 2011 +0200
     1.3 @@ -368,7 +368,10 @@
     1.4  	}
     1.5  
     1.6  	if (route->wrapper) {
     1.7 -		psb = smtp_out_open_child(route->wrapper, host);
     1.8 +		psb = smtp_out_open_child(route->wrapper);
     1.9 +		if (psb) {
    1.10 +			psb->remote_host = host;
    1.11 +		}
    1.12  	} else {
    1.13  		psb = smtp_out_open(host, port, res_list);
    1.14  	}

     2.1 --- a/src/smtp_out.c	Tue Oct 25 13:51:43 2011 +0200
     2.2 +++ b/src/smtp_out.c	Tue Oct 25 14:31:28 2011 +0200
     2.3 @@ -511,13 +511,12 @@
     2.4  }
     2.5  
     2.6  smtp_base*
     2.7 -smtp_out_open_child(gchar *cmd, char *host)
     2.8 +smtp_out_open_child(gchar *cmd)
     2.9  {
    2.10  	smtp_base *psb;
    2.11  	gint sock;
    2.12  
    2.13  	DEBUG(5) debugf("smtp_out_open_child entered, cmd = %s\n", cmd);
    2.14 -	psb->remote_host = host;
    2.15  	sock = child(cmd);
    2.16  	if (sock <= 0) {
    2.17  		return NULL;

     3.1 --- a/src/smtp_out.h	Tue Oct 25 13:51:43 2011 +0200
     3.2 +++ b/src/smtp_out.h	Tue Oct 25 14:31:28 2011 +0200
     3.3 @@ -76,7 +76,7 @@
     3.4  gboolean set_auth(smtp_base *psb, gchar *name, gchar *login, gchar *secret);
     3.5  void destroy_smtpbase(smtp_base *psb);
     3.6  smtp_base *smtp_out_open(gchar *host, gint port, GList *resolve_list);
     3.7 -smtp_base *smtp_out_open_child(gchar *cmd, char *host);
     3.8 +smtp_base *smtp_out_open_child(gchar *cmd);
     3.9  gboolean smtp_out_rset(smtp_base *psb);
    3.10  gboolean smtp_out_init(smtp_base *psb, gboolean instant_helo);
    3.11  gint smtp_out_msg(smtp_base *psb, message *msg, address *return_path, GList *rcpt_list, GList *hdr_list);