masqmail

changeset 189:dc89737b27aa

find changesets by author, revision, files, or words in the commit message
removed the pop-before-smtp (smtp-after-pop) function this kind of authentication is superseded by SMTP AUTH today removing it is a step towards removing the POP stuff completely If you still rely on pop-before-smtp, stay with 0.2.x or run an arbitrary pop client before
author meillo@marmaro.de
date Thu, 15 Jul 2010 10:33:53 +0200
parents bfa7a8b566da
children 6b4a101a2455
files examples/example.get examples/example.route man/masqmail.route.5 src/deliver.c src/get.c src/masqmail.h src/pop3_in.c
diffstat 7 files changed, 0 insertions(+), 75 deletions(-) [+]
line diff
     1.1 --- a/examples/example.get	Thu Jul 15 00:33:09 2010 +0200
     1.2 +++ b/examples/example.get	Thu Jul 15 10:33:53 2010 +0200
     1.3 @@ -14,8 +14,6 @@
     1.4  # and the password:
     1.5  pass="keepInMind"
     1.6  
     1.7 -# if you just use this for SMTP after POP, you do not need the settings below:
     1.8 -
     1.9  # the (local) address, where the retrieved mail should be sent to:
    1.10  address=okurth@localhost
    1.11  

     2.1 --- a/examples/example.route	Thu Jul 15 00:33:09 2010 +0200
     2.2 +++ b/examples/example.route	Thu Jul 15 10:33:53 2010 +0200
     2.3 @@ -82,11 +82,3 @@
     2.4  #auth_name="cram-md5"
     2.5  #auth_login="yourname"
     2.6  #auth_secret="dontTellAnyBody"
     2.7 -
     2.8 -# if your mail server requires smtp after POP (eg. gmx), set this.
     2.9 -# It is not necessary if you fetch from the pop server just before you
    2.10 -# send mail (either masqmail, fetchmail or any other pop client).
    2.11 -# Set it to a get file.
    2.12 -# You need to compile masqmail with pop3 support (default)
    2.13 -# pop3_login = "/etc/masqmail/example.get"
    2.14 -# see also: man 5 masqmail.route, man 5 masqmail.get

     3.1 --- a/man/masqmail.route.5	Thu Jul 15 00:33:09 2010 +0200
     3.2 +++ b/man/masqmail.route.5	Thu Jul 15 10:33:53 2010 +0200
     3.3 @@ -252,13 +252,6 @@
     3.4  Your secret for ESMTP AUTH authentication.
     3.5  
     3.6  .TP
     3.7 -\fBpop3_login\fR = \fIfile\fR
     3.8 -
     3.9 -If your Mail server requires SMTP-after-POP,
    3.10 -set this to a get configuration (see \fBmasqmail.get(5)\fR).
    3.11 -If you login to the POP server before you send, this is not necessary.
    3.12 -
    3.13 -.TP
    3.14  \fBwrapper\fR = \fIcommand\fR
    3.15  
    3.16  If set, instead of opening a connection to a remote server,

     4.1 --- a/src/deliver.c	Thu Jul 15 00:33:09 2010 +0200
     4.2 +++ b/src/deliver.c	Thu Jul 15 10:33:53 2010 +0200
     4.3 @@ -335,13 +335,6 @@
     4.4  		port = route->mail_host->port;
     4.5  	}
     4.6  
     4.7 -#ifdef ENABLE_POP3
     4.8 -	if (route->pop3_login) {
     4.9 -		if (!(pop_before_smtp(route->pop3_login)))
    4.10 -			return FALSE;
    4.11 -	}
    4.12 -#endif
    4.13 -
    4.14  	if ((psb = (route->wrapper ? smtp_out_open_child(route->wrapper) : smtp_out_open(host, port, res_list)))) {
    4.15  
    4.16  		if (route->wrapper) {

     5.1 --- a/src/get.c	Thu Jul 15 00:33:09 2010 +0200
     5.2 +++ b/src/get.c	Thu Jul 15 10:33:53 2010 +0200
     5.3 @@ -369,30 +369,4 @@
     5.4  	}
     5.5  }
     5.6  
     5.7 -gboolean
     5.8 -pop_before_smtp(gchar * fname)
     5.9 -{
    5.10 -	gboolean ok = FALSE;
    5.11 -	GList *resolve_list = NULL;
    5.12 -	get_conf *gc = read_get_conf(fname);
    5.13 -	guint flags = 0;
    5.14 -
    5.15 -#ifdef ENABLE_RESOLVER
    5.16 -	resolve_list = g_list_append(resolve_list, resolve_dns_a);
    5.17  #endif
    5.18 -	resolve_list = g_list_append(resolve_list, resolve_byname);
    5.19 -
    5.20 -	if (strcmp(gc->protocol, "pop3") == 0) {
    5.21 -		DEBUG(3) debugf("attempting to login for user %s, host = %s with pop3\n", gc->login_user, gc->server_name);
    5.22 -		ok = pop3_login(gc->server_name, gc->server_port, resolve_list, gc->login_user, gc->login_pass, flags);
    5.23 -	} else if (strcmp(gc->protocol, "apop") == 0) {
    5.24 -		DEBUG(3) debugf ("attempting to login for user %s, host = %s with apop\n", gc->login_user, gc->server_name);
    5.25 -		ok = pop3_login(gc->server_name, gc->server_port, resolve_list, gc->login_user,
    5.26 -		                gc->login_pass, flags | POP3_FLAG_APOP);
    5.27 -	} else {
    5.28 -		logwrite(LOG_ALERT, "get protocol %s unknown\n", gc->protocol);
    5.29 -	}
    5.30 -	return ok;
    5.31 -}
    5.32 -
    5.33 -#endif

     6.1 --- a/src/masqmail.h	Thu Jul 15 00:33:09 2010 +0200
     6.2 +++ b/src/masqmail.h	Thu Jul 15 10:33:53 2010 +0200
     6.3 @@ -481,7 +481,6 @@
     6.4  gboolean get_all(void);
     6.5  void get_online(void);
     6.6  void get_daemon(gint gival, char *argv[]);
     6.7 -gboolean pop_before_smtp(gchar * fname);
     6.8  
     6.9  /* interface.c */
    6.10  gboolean init_sockaddr(struct sockaddr_in *name, interface * iface);

     7.1 --- a/src/pop3_in.c	Thu Jul 15 00:33:09 2010 +0200
     7.2 +++ b/src/pop3_in.c	Thu Jul 15 10:33:53 2010 +0200
     7.3 @@ -780,28 +780,4 @@
     7.4  	return ok;
     7.5  }
     7.6  
     7.7 -/* function just to log into a pop server,
     7.8 -   for pop_before_smtp (or is it smtp_after_pop?)
     7.9 -*/
    7.10 -
    7.11 -gboolean
    7.12 -pop3_login(gchar * host, gint port, GList * resolve_list, gchar * user, gchar * pass, guint flags)
    7.13 -{
    7.14 -	gboolean ok = FALSE;
    7.15 -	pop3_base *popb;
    7.16 -
    7.17 -	signal(SIGCHLD, SIG_IGN);
    7.18 -
    7.19 -	if ((popb = pop3_in_open(host, port, resolve_list, flags))) {
    7.20 -		if (pop3_in_init(popb)) {
    7.21 -			if (pop3_in_login(popb, user, pass))
    7.22 -				ok = TRUE;
    7.23 -			else
    7.24 -				logwrite(LOG_ALERT | LOG_VERBOSE, "pop3 login failed for user %s, host = %s\n", user, host);
    7.25 -		}
    7.26 -		pop3_in_close(popb);
    7.27 -	}
    7.28 -	return ok;
    7.29 -}
    7.30 -
    7.31  #endif