Mercurial > masqmail

diff src/conf.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 55b7bde95d37
line wrap: on
line diff
--- a/src/conf.c	Sun Apr 24 19:14:38 2011 +0200
+++ b/src/conf.c	Sun Apr 24 19:37:56 2011 +0200
@@ -620,7 +620,6 @@
 	route->filename = g_strdup(filename);
 	route->name = g_strdup(filename);  /* quick hack */
 
-	route->protocol = g_strdup("smtp");
 	route->expand_h_sender_address = TRUE;
 
 	route->is_local_net = is_local_net;
@@ -635,9 +634,7 @@
 
 	gchar lval[256], rval[2048];
 	while (read_statement(in, lval, 256, rval, 2048)) {
-		if (strcmp(lval, "protocol") == 0)
-			route->protocol = g_strdup(rval);
-		else if (strcmp(lval, "mail_host") == 0)
+		if (strcmp(lval, "mail_host") == 0)
 			route->mail_host = parse_interface(rval, 25);
 		else if (strcmp(lval, "helo_name") == 0)
 			route->helo_name = g_strdup(rval);
@@ -803,8 +800,6 @@
 {
 	if (r->filename)
 		g_free(r->filename);
-	if (r->protocol)
-		g_free(r->protocol);
 	if (r->mail_host) {
 		g_free(r->mail_host->address);
 		g_free(r->mail_host);
@@ -890,7 +885,6 @@
 		return NULL;
 	}
 	memset(route, 0, sizeof(connect_route));
-	route->protocol = g_strdup("smtp");
 	route->is_local_net = TRUE;
 	route->name = g_strdup("default local_net_route");
 	route->expand_h_sender_address = TRUE;