# HG changeset patch
# User meillo@marmaro.de
# Date 1279182833 -7200
# Node ID dc89737b27aa3b5d6828be80edf0e79862cadc4c
# Parent  bfa7a8b566daef251638a58578078ee6c4edfa59
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

diff -r bfa7a8b566da -r dc89737b27aa examples/example.get
--- a/examples/example.get	Thu Jul 15 00:33:09 2010 +0200
+++ b/examples/example.get	Thu Jul 15 10:33:53 2010 +0200
@@ -14,8 +14,6 @@
 # and the password:
 pass="keepInMind"
 
-# if you just use this for SMTP after POP, you do not need the settings below:
-
 # the (local) address, where the retrieved mail should be sent to:
 address=okurth@localhost
 
diff -r bfa7a8b566da -r dc89737b27aa examples/example.route
--- a/examples/example.route	Thu Jul 15 00:33:09 2010 +0200
+++ b/examples/example.route	Thu Jul 15 10:33:53 2010 +0200
@@ -82,11 +82,3 @@
 #auth_name="cram-md5"
 #auth_login="yourname"
 #auth_secret="dontTellAnyBody"
-
-# if your mail server requires smtp after POP (eg. gmx), set this.
-# It is not necessary if you fetch from the pop server just before you
-# send mail (either masqmail, fetchmail or any other pop client).
-# Set it to a get file.
-# You need to compile masqmail with pop3 support (default)
-# pop3_login = "/etc/masqmail/example.get"
-# see also: man 5 masqmail.route, man 5 masqmail.get
diff -r bfa7a8b566da -r dc89737b27aa man/masqmail.route.5
--- a/man/masqmail.route.5	Thu Jul 15 00:33:09 2010 +0200
+++ b/man/masqmail.route.5	Thu Jul 15 10:33:53 2010 +0200
@@ -252,13 +252,6 @@
 Your secret for ESMTP AUTH authentication.
 
 .TP
-\fBpop3_login\fR = \fIfile\fR
-
-If your Mail server requires SMTP-after-POP,
-set this to a get configuration (see \fBmasqmail.get(5)\fR).
-If you login to the POP server before you send, this is not necessary.
-
-.TP
 \fBwrapper\fR = \fIcommand\fR
 
 If set, instead of opening a connection to a remote server,
diff -r bfa7a8b566da -r dc89737b27aa src/deliver.c
--- a/src/deliver.c	Thu Jul 15 00:33:09 2010 +0200
+++ b/src/deliver.c	Thu Jul 15 10:33:53 2010 +0200
@@ -335,13 +335,6 @@
 		port = route->mail_host->port;
 	}
 
-#ifdef ENABLE_POP3
-	if (route->pop3_login) {
-		if (!(pop_before_smtp(route->pop3_login)))
-			return FALSE;
-	}
-#endif
-
 	if ((psb = (route->wrapper ? smtp_out_open_child(route->wrapper) : smtp_out_open(host, port, res_list)))) {
 
 		if (route->wrapper) {
diff -r bfa7a8b566da -r dc89737b27aa src/get.c
--- a/src/get.c	Thu Jul 15 00:33:09 2010 +0200
+++ b/src/get.c	Thu Jul 15 10:33:53 2010 +0200
@@ -369,30 +369,4 @@
 	}
 }
 
-gboolean
-pop_before_smtp(gchar * fname)
-{
-	gboolean ok = FALSE;
-	GList *resolve_list = NULL;
-	get_conf *gc = read_get_conf(fname);
-	guint flags = 0;
-
-#ifdef ENABLE_RESOLVER
-	resolve_list = g_list_append(resolve_list, resolve_dns_a);
 #endif
-	resolve_list = g_list_append(resolve_list, resolve_byname);
-
-	if (strcmp(gc->protocol, "pop3") == 0) {
-		DEBUG(3) debugf("attempting to login for user %s, host = %s with pop3\n", gc->login_user, gc->server_name);
-		ok = pop3_login(gc->server_name, gc->server_port, resolve_list, gc->login_user, gc->login_pass, flags);
-	} else if (strcmp(gc->protocol, "apop") == 0) {
-		DEBUG(3) debugf ("attempting to login for user %s, host = %s with apop\n", gc->login_user, gc->server_name);
-		ok = pop3_login(gc->server_name, gc->server_port, resolve_list, gc->login_user,
-		                gc->login_pass, flags | POP3_FLAG_APOP);
-	} else {
-		logwrite(LOG_ALERT, "get protocol %s unknown\n", gc->protocol);
-	}
-	return ok;
-}
-
-#endif
diff -r bfa7a8b566da -r dc89737b27aa src/masqmail.h
--- a/src/masqmail.h	Thu Jul 15 00:33:09 2010 +0200
+++ b/src/masqmail.h	Thu Jul 15 10:33:53 2010 +0200
@@ -481,7 +481,6 @@
 gboolean get_all(void);
 void get_online(void);
 void get_daemon(gint gival, char *argv[]);
-gboolean pop_before_smtp(gchar * fname);
 
 /* interface.c */
 gboolean init_sockaddr(struct sockaddr_in *name, interface * iface);
diff -r bfa7a8b566da -r dc89737b27aa src/pop3_in.c
--- a/src/pop3_in.c	Thu Jul 15 00:33:09 2010 +0200
+++ b/src/pop3_in.c	Thu Jul 15 10:33:53 2010 +0200
@@ -780,28 +780,4 @@
 	return ok;
 }
 
-/* function just to log into a pop server,
-   for pop_before_smtp (or is it smtp_after_pop?)
-*/
-
-gboolean
-pop3_login(gchar * host, gint port, GList * resolve_list, gchar * user, gchar * pass, guint flags)
-{
-	gboolean ok = FALSE;
-	pop3_base *popb;
-
-	signal(SIGCHLD, SIG_IGN);
-
-	if ((popb = pop3_in_open(host, port, resolve_list, flags))) {
-		if (pop3_in_init(popb)) {
-			if (pop3_in_login(popb, user, pass))
-				ok = TRUE;
-			else
-				logwrite(LOG_ALERT | LOG_VERBOSE, "pop3 login failed for user %s, host = %s\n", user, host);
-		}
-		pop3_in_close(popb);
-	}
-	return ok;
-}
-
 #endif