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

Comparing ircd-hybrid/branches/8.2.x/src/conf.c (file contents):
Revision 7247 by michael, Thu Feb 4 17:19:38 2016 UTC vs.
Revision 7257 by michael, Sat Feb 6 17:28:28 2016 UTC

# Line 747 | Line 747 | set_default_conf(void)
747    ConfigServerInfo.max_nick_length = 9;
748    ConfigServerInfo.max_topic_length = 80;
749    ConfigServerInfo.hub = 0;
750 +  ConfigServerInfo.libgeoip_database_options = 0;
751  
752    log_del_all();
753  
# Line 1158 | Line 1159 | clear_out_old_conf(void)
1159  
1160    pseudo_clear();  /* Clear pseudo {} items */
1161  
1162 + #ifdef HAVE_LIBGEOIP
1163 +  GeoIP_delete(GeoIPv4_ctx);
1164 +  GeoIPv4_ctx = NULL;
1165 +  GeoIP_delete(GeoIPv6_ctx);
1166 +  GeoIPv6_ctx = NULL;
1167 + #endif
1168 +
1169    /* Clean out ConfigServerInfo */
1170    xfree(ConfigServerInfo.description);
1171    ConfigServerInfo.description = NULL;
# Line 1165 | Line 1173 | clear_out_old_conf(void)
1173    ConfigServerInfo.network_name = NULL;
1174    xfree(ConfigServerInfo.network_desc);
1175    ConfigServerInfo.network_desc = NULL;
1176 <
1176 >  xfree(ConfigServerInfo.libgeoip_ipv6_database_file);
1177 >  ConfigServerInfo.libgeoip_ipv6_database_file = NULL;
1178 >  xfree(ConfigServerInfo.libgeoip_ipv4_database_file);
1179 >  ConfigServerInfo.libgeoip_ipv4_database_file = NULL;
1180    xfree(ConfigServerInfo.rsa_private_key_file);
1181    ConfigServerInfo.rsa_private_key_file = NULL;
1182    xfree(ConfigServerInfo.ssl_certificate_file);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines