masqmail
diff src/masqmail.c @ 204:5745edd5b769
removed the --disable-smtp-server configure option
masqmail will now always have the possibility to listen on a port compiled in
if you don't want it to listen on a port add this to your masqmail.conf:
listen_addresses = ""
also, if you don't start it as daemon it will not listen neither
author | meillo@marmaro.de |
---|---|
date | Fri, 16 Jul 2010 15:38:53 +0200 |
parents | 89f951be358f |
children | 4fd237550525 |
line diff
1.1 --- a/src/masqmail.c Fri Jul 16 14:48:17 2010 +0200 1.2 +++ b/src/masqmail.c Fri Jul 16 15:38:53 2010 +0200 1.3 @@ -177,7 +177,6 @@ 1.4 listen_port(do_listen ? conf.listen_addresses : NULL, queue_interval, argv); 1.5 } 1.6 1.7 -#ifdef ENABLE_SMTP_SERVER 1.8 static void 1.9 mode_smtp() 1.10 { 1.11 @@ -204,7 +203,6 @@ 1.12 1.13 smtp_in(stdin, stderr, peername, NULL); 1.14 } 1.15 -#endif 1.16 1.17 static void 1.18 mode_accept(address * return_path, gchar * full_sender_name, guint accept_flags, char **addresses, int addr_cnt) 1.19 @@ -500,7 +498,6 @@ 1.20 1.21 if (mta_mode == MODE_VERSION) { 1.22 gchar *with_resolver = ""; 1.23 - gchar *with_smtp_server = ""; 1.24 gchar *with_auth = ""; 1.25 gchar *with_maildir = ""; 1.26 gchar *with_ident = ""; 1.27 @@ -508,9 +505,6 @@ 1.28 #ifdef ENABLE_RESOLVER 1.29 with_resolver = " +resolver"; 1.30 #endif 1.31 -#ifdef ENABLE_SMTP_SERVER 1.32 - with_smtp_server = " +smtp-server"; 1.33 -#endif 1.34 #ifdef ENABLE_AUTH 1.35 with_auth = " +auth"; 1.36 #endif 1.37 @@ -521,7 +515,7 @@ 1.38 with_ident = " +ident"; 1.39 #endif 1.40 1.41 - printf("%s %s%s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, with_smtp_server, 1.42 + printf("%s %s%s%s%s%s\n", PACKAGE, VERSION, with_resolver, 1.43 with_auth, with_maildir, with_ident); 1.44 1.45 exit(EXIT_SUCCESS); 1.46 @@ -646,11 +640,7 @@ 1.47 break; 1.48 1.49 case MODE_SMTP: 1.50 -#ifdef ENABLE_SMTP_SERVER 1.51 mode_smtp(); 1.52 -#else 1.53 - fprintf(stderr, "smtp server support not compiled in\n"); 1.54 -#endif 1.55 break; 1.56 1.57 case MODE_LIST: