X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=221e7a96e8621c37b6f2db3d26d4c0accdf9075a;hb=4da04640e6429e6cc61ca9dd4c7293b520d4b3bc;hp=2f234dad542ec7dc4aaf973fe7af068c3e72706d;hpb=b130b35f48d19450240748425e12d21f2c38350f;p=ngircd-alex.git

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 2f234dad..221e7a96 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -88,10 +88,10 @@ static void Init_Server_Struct PARAMS(( CONF_SERVER *Server ));
 #endif
 
 #ifdef HAVE_LIBSSL
-#define DEFAULT_CIPHERS		"HIGH:!aNULL:@STRENGTH"
+#define DEFAULT_CIPHERS		"HIGH:!aNULL:@STRENGTH:!SSLv3"
 #endif
 #ifdef HAVE_LIBGNUTLS
-#define DEFAULT_CIPHERS		"SECURE128"
+#define DEFAULT_CIPHERS		"SECURE128:-VERS-SSL3.0"
 #endif
 
 #ifdef SSL_SUPPORT
@@ -618,6 +618,7 @@ Conf_EnablePassiveServer(const char *Name)
 		    && (Conf_Server[i].port > 0)) {
 			/* BINGO! Enable server */
 			Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
+			Conf_Server[i].lasttry = 0;
 			return true;
 		}
 	}
@@ -806,8 +807,8 @@ Set_Defaults(bool InitServers)
 	Conf_PAM = false;
 #endif
 	Conf_PAMIsOptional = false;
-#ifdef SYSLOG
 	Conf_ScrubCTCP = false;
+#ifdef SYSLOG
 #ifdef LOG_LOCAL5
 	Conf_SyslogFacility = LOG_LOCAL5;
 #else