masqmail
diff src/conf.c @ 311:e230bcd0f1c6
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 diff
1.1 --- a/src/conf.c Sun Apr 24 19:14:38 2011 +0200 1.2 +++ b/src/conf.c Sun Apr 24 19:37:56 2011 +0200 1.3 @@ -620,7 +620,6 @@ 1.4 route->filename = g_strdup(filename); 1.5 route->name = g_strdup(filename); /* quick hack */ 1.6 1.7 - route->protocol = g_strdup("smtp"); 1.8 route->expand_h_sender_address = TRUE; 1.9 1.10 route->is_local_net = is_local_net; 1.11 @@ -635,9 +634,7 @@ 1.12 1.13 gchar lval[256], rval[2048]; 1.14 while (read_statement(in, lval, 256, rval, 2048)) { 1.15 - if (strcmp(lval, "protocol") == 0) 1.16 - route->protocol = g_strdup(rval); 1.17 - else if (strcmp(lval, "mail_host") == 0) 1.18 + if (strcmp(lval, "mail_host") == 0) 1.19 route->mail_host = parse_interface(rval, 25); 1.20 else if (strcmp(lval, "helo_name") == 0) 1.21 route->helo_name = g_strdup(rval); 1.22 @@ -803,8 +800,6 @@ 1.23 { 1.24 if (r->filename) 1.25 g_free(r->filename); 1.26 - if (r->protocol) 1.27 - g_free(r->protocol); 1.28 if (r->mail_host) { 1.29 g_free(r->mail_host->address); 1.30 g_free(r->mail_host); 1.31 @@ -890,7 +885,6 @@ 1.32 return NULL; 1.33 } 1.34 memset(route, 0, sizeof(connect_route)); 1.35 - route->protocol = g_strdup("smtp"); 1.36 route->is_local_net = TRUE; 1.37 route->name = g_strdup("default local_net_route"); 1.38 route->expand_h_sender_address = TRUE;