[dovecot-cvs] dovecot/src/master main.c,1.36,1.37

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv32357

Modified Files:
	main.c 
Log Message:
Don't listen in imaps/pop3s if ssl_disable = yes. Even if they're listed in
protocols.



Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- main.c	22 Feb 2003 16:16:40 -0000	1.36
+++ main.c	23 Feb 2003 10:43:38 -0000	1.37
@@ -257,11 +257,13 @@
 		if (strcasecmp(*proto, "imap") == 0) {
 			fd = &mail_fd[FD_IMAP]; ip = imap_ip; port = imap_port;
 		} else if (strcasecmp(*proto, "imaps") == 0) {
-			fd = &mail_fd[FD_IMAPS]; ip = imaps_ip; port = imaps_port;
+			fd = &mail_fd[FD_IMAPS]; ip = imaps_ip;
+			port = set->ssl_disable ? 0 : imaps_port;
 		} else if (strcasecmp(*proto, "pop3") == 0) {
 			fd = &mail_fd[FD_POP3]; ip = pop3_ip; port = pop3_port;
 		} else if (strcasecmp(*proto, "pop3s") == 0) {
-			fd = &mail_fd[FD_POP3S]; ip = pop3s_ip; port = pop3s_port;
+			fd = &mail_fd[FD_POP3S]; ip = pop3s_ip;
+			port = set->ssl_disable ? 0 : pop3s_port;
 		} else {
 			i_fatal("Unknown protocol %s", *proto);
 		}