[dovecot-cvs] dovecot/src/master master-settings.c,1.87,1.88

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv30481

Modified Files:
	master-settings.c 
Log Message:
Default to ssl_disable=no always, even if SSL isn't compiled in. If SSL
isn't compiled in and ssl_disable=no, complain immediately.



Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- master-settings.c	11 Sep 2005 10:52:00 -0000	1.87
+++ master-settings.c	18 Sep 2005 11:46:45 -0000	1.88
@@ -242,11 +242,7 @@
 	MEMBER(listen) "*",
 	MEMBER(ssl_listen) NULL,
 
-#ifdef HAVE_SSL
 	MEMBER(ssl_disable) FALSE,
-#else
-	MEMBER(ssl_disable) TRUE,
-#endif
 	MEMBER(ssl_ca_file) NULL,
 	MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem",
 	MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem",
@@ -572,6 +568,11 @@
 			return FALSE;
 		}
 	}
+#else
+	if (!set->ssl_disable) {
+		i_error("SSL support not compiled in but ssl_disable=no");
+		return FALSE;
+	}
 #endif
 
 	/* fix relative paths */