diff options
| author | Paul J Stevens <paul@nfg.nl> | 2010-05-28 15:41:00 +0200 |
|---|---|---|
| committer | Paul J Stevens <paul@nfg.nl> | 2010-05-28 15:41:00 +0200 |
| commit | 0fb20077e7f188a3dea609227c467caac56e9d73 (patch) | |
| tree | 9bc10342dc9e3dadf90eb08ac86a9cfc6df30c3f | |
| parent | 80f99c98d1261696d1217f1a5fc89fa6c3af8214 (diff) | |
cleanups
| -rw-r--r-- | src/server.c | 9 | ||||
| -rwxr-xr-x | test-scripts/testlmtp.py | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/server.c b/src/server.c index 7720b2d8..dd757cf2 100644 --- a/src/server.c +++ b/src/server.c @@ -435,17 +435,20 @@ static void server_create_sockets(serverConfig_t * conf) conf->listenSockets = g_new0(int, MAXSOCKETS); conf->ssl_listenSockets = g_new0(int, MAXSOCKETS); - if (strlen(conf->socket) > 0) { + if (conf->socket && strlen(conf->socket)) conf->listenSockets[conf->socketcount++] = create_unix_socket(conf); - } + tls_load_certs(conf); + if (conf->ssl) tls_load_ciphers(conf); - if (strlen(conf->port)) { + + if (conf->port && strlen(conf->port)) { for (i = 0; i < conf->ipcount; i++) { create_inet_socket(conf, i, FALSE); } } + if (conf->ssl && strlen(conf->ssl_port)) { for (i = 0; i < conf->ipcount; i++) { create_inet_socket(conf, i, TRUE); diff --git a/test-scripts/testlmtp.py b/test-scripts/testlmtp.py index 8999e127..ee24f211 100755 --- a/test-scripts/testlmtp.py +++ b/test-scripts/testlmtp.py @@ -15,7 +15,7 @@ USERNAME = "testuser1" # number of messages to send per session RECONNECT = 5 -import smtplib, thread, time, sys, email, mailbox, os, string +import smtplib, thread, time, sys, mailbox, string from optparse import OptionParser DEBUG=False |