ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/ircd.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/ircd.c (file contents):
Revision 4748 by michael, Thu Oct 16 12:10:27 2014 UTC vs.
Revision 4892 by michael, Wed Nov 19 17:14:30 2014 UTC

# Line 222 | Line 222 | io_loop(void)
222    {
223      if (listing_client_list.head)
224      {
225 <      dlink_node *ptr = NULL, *ptr_next = NULL;
226 <      DLINK_FOREACH_SAFE(ptr, ptr_next, listing_client_list.head)
227 <        safe_list_channels(ptr->data, 0);
225 >      dlink_node *node = NULL, *node_next = NULL;
226 >      DLINK_FOREACH_SAFE(node, node_next, listing_client_list.head)
227 >        safe_list_channels(node->data, 0);
228      }
229  
230      /* Run pending events */
# Line 426 | Line 426 | ssl_init(void)
426      const char *s = ERR_lib_error_string(ERR_get_error());
427  
428      fprintf(stderr, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
429 <    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s\n", s);
429 >    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Server context -- %s", s);
430      exit(EXIT_FAILURE);
431 +    return;  /* Not reached */
432    }
433  
434    SSL_CTX_set_options(ConfigServerInfo.server_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
# Line 435 | Line 436 | ssl_init(void)
436    SSL_CTX_set_verify(ConfigServerInfo.server_ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
437                       always_accept_verify_cb);
438    SSL_CTX_set_session_cache_mode(ConfigServerInfo.server_ctx, SSL_SESS_CACHE_OFF);
439 +  SSL_CTX_set_cipher_list(ConfigServerInfo.server_ctx, "EECDH+HIGH:EDH+HIGH:HIGH:!aNULL");
440  
441   #if OPENSSL_VERSION_NUMBER >= 0x009080FFL && !defined(OPENSSL_NO_ECDH)
442    {
# Line 455 | Line 457 | ssl_init(void)
457      const char *s = ERR_lib_error_string(ERR_get_error());
458  
459      fprintf(stderr, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460 <    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s\n", s);
460 >    ilog(LOG_TYPE_IRCD, "ERROR: Could not initialize the SSL Client context -- %s", s);
461      exit(EXIT_FAILURE);
462 +    return;  /* Not reached */
463    }
464  
465    SSL_CTX_set_options(ConfigServerInfo.client_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TICKET);
# Line 544 | Line 547 | main(int argc, char *argv[])
547    dbuf_init();
548    hash_init();
549    ipcache_init();
547 –  init_host_hash();          /* Host-hashtable. */
550    client_init();
551    class_init();
552    whowas_init();

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)