"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/lib-master/master-service.c" between
dovecot-2.3.16.tar.gz and dovecot-2.3.17.tar.gz

About: Dovecot is an IMAP and POP3 server, written with security primarily in mind.

master-service.c  (dovecot-2.3.16):master-service.c  (dovecot-2.3.17)
skipping to change at line 307 skipping to change at line 307
service->version_string = PACKAGE_VERSION; service->version_string = PACKAGE_VERSION;
} }
/* listener configuration */ /* listener configuration */
value = getenv("SOCKET_COUNT"); value = getenv("SOCKET_COUNT");
if (value != NULL && str_to_uint(value, &service->socket_count) < 0) if (value != NULL && str_to_uint(value, &service->socket_count) < 0)
i_fatal("Invalid SOCKET_COUNT environment"); i_fatal("Invalid SOCKET_COUNT environment");
T_BEGIN { T_BEGIN {
master_service_init_socket_listeners(service); master_service_init_socket_listeners(service);
} T_END; } T_END;
service->want_ssl_settings = service->want_ssl_server ||
(service->flags & MASTER_SERVICE_FLAG_USE_SSL_SETTINGS) != 0;
#ifdef HAVE_SSL #ifdef HAVE_SSL
/* load SSL module if necessary */ /* Load the SSL module if we already know it is necessary. It can also
if (service->want_ssl_settings) { get loaded later on-demand. */
if (service->want_ssl_server) {
const char *error; const char *error;
if (ssl_module_load(&error) < 0) if (ssl_module_load(&error) < 0)
i_fatal("Cannot load SSL module: %s", error); i_fatal("Cannot load SSL module: %s", error);
service->ssl_module_loaded = TRUE;
} }
#endif #endif
/* set up some kind of logging until we know exactly how and where /* set up some kind of logging until we know exactly how and where
we want to log */ we want to log */
if (getenv("LOG_SERVICE") != NULL) if (getenv("LOG_SERVICE") != NULL)
i_set_failure_internal(); i_set_failure_internal();
if (getenv("USER") != NULL) { if (getenv("USER") != NULL) {
i_set_failure_prefix("%s(%s): ", service->configured_name, i_set_failure_prefix("%s(%s): ", service->configured_name,
getenv("USER")); getenv("USER"));
skipping to change at line 1531 skipping to change at line 1529
ret = FALSE; ret = FALSE;
else { else {
ret = str_uint_equals(t_strdup_until(line, p), ret = str_uint_equals(t_strdup_until(line, p),
major_version); major_version);
if (str_to_uint(p+1, minor_version_r) < 0) if (str_to_uint(p+1, minor_version_r) < 0)
ret = FALSE; ret = FALSE;
} }
} T_END; } T_END;
return ret; return ret;
} }
bool master_service_is_ssl_module_loaded(struct master_service *service)
{
/* if this is TRUE, then ssl module is loaded by init */
return service->ssl_module_loaded;
}
 End of changes. 4 change blocks. 
5 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)