Mercurial > masqmail

diff src/deliver.c @ 311:e230bcd0f1c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed protocol option from route config It was somehow redundant. Now, if `pipe' is set, the protocol will be pipe, otherwise it'll be smtp. That's just natural.
author meillo@marmaro.de
date Sun, 24 Apr 2011 19:37:56 +0200
parents f10a56dc7481
children c98aa884d2cb
line wrap: on
line diff
--- a/src/deliver.c	Sun Apr 24 19:14:38 2011 +0200
+++ b/src/deliver.c	Sun Apr 24 19:37:56 2011 +0200
@@ -268,11 +268,6 @@
 
 	DEBUG(5) debugf("deliver_msglist_host_pipe entered\n");
 
-	if (route->pipe == NULL) {
-		logwrite(LOG_ALERT, "no pipe command given for route (protocol is pipe!)\n");
-		return FALSE;
-	}
-
 	foreach(msgout_list, msgout_node) {
 		msg_out *msgout = (msg_out *) (msgout_node->data);
 		gboolean flag, ok_fail = FALSE;
@@ -475,11 +470,12 @@
 gboolean
 deliver_msglist_host(connect_route * route, GList * msgout_list, gchar * host, GList * res_list)
 {
-	DEBUG(5) debugf("protocol = %s\n", route->protocol);
 
-	if (strcmp(route->protocol, "pipe") == 0) {
+	if (route->pipe) {
+		DEBUG(5) debugf("with pipe\n");
 		return deliver_msglist_host_pipe(route, msgout_list, host, res_list);
 	} else {
+		DEBUG(5) debugf("with smtp\n");
 		return deliver_msglist_host_smtp(route, msgout_list, host, res_list);
 	}
 }