[dovecot-cvs] dovecot/src/master main.c,1.15,1.16

[cras at procontrol.fi]

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

Modified Files:
	main.c 
Log Message:
If ssl_disabled = yes, we shouldn't listen in imaps port.



Index: main.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- main.c	1 Dec 2002 15:39:21 -0000	1.15
+++ main.c	1 Dec 2002 21:44:42 -0000	1.16
@@ -158,9 +158,7 @@
 	fd_close_on_exec(imap_fd, TRUE);
 
 #ifdef HAVE_SSL
-	imaps_fd = set_ssl_cert_file == NULL || *set_ssl_cert_file == '\0' ||
-		set_ssl_key_file == NULL || *set_ssl_key_file == '\0' ||
-		set_imaps_port == 0 ? dup(null_fd) :
+	imaps_fd = set_ssl_disable || set_imaps_port == 0 ? dup(null_fd) :
 		net_listen(imaps_ip, &set_imaps_port);
 #else
 	imaps_fd = dup(null_fd);