service.c (dovecot-2.3.16) | : | service.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 433 | skipping to change at line 433 | |||
service_list->master_log_fd[0] = -1; | service_list->master_log_fd[0] = -1; | |||
service_list->master_log_fd[1] = -1; | service_list->master_log_fd[1] = -1; | |||
service_list->master_fd = -1; | service_list->master_fd = -1; | |||
service_settings = array_get(&set->services, &count); | service_settings = array_get(&set->services, &count); | |||
p_array_init(&service_list->services, pool, count); | p_array_init(&service_list->services, pool, count); | |||
for (i = 0; i < count; i++) { | for (i = 0; i < count; i++) { | |||
if (!service_want(service_settings[i])) | if (!service_want(service_settings[i])) | |||
continue; | continue; | |||
service = service_create(pool, service_settings[i], | T_BEGIN { | |||
service_list, &error); | service = service_create(pool, service_settings[i], | |||
service_list, &error); | ||||
} T_END_PASS_STR_IF(service == NULL, &error); | ||||
if (service == NULL) { | if (service == NULL) { | |||
*error_r = t_strdup_printf("service(%s) %s", | *error_r = t_strdup_printf("service(%s) %s", | |||
service_settings[i]->name, error); | service_settings[i]->name, error); | |||
return -1; | return -1; | |||
} | } | |||
switch (service->type) { | switch (service->type) { | |||
case SERVICE_TYPE_LOG: | case SERVICE_TYPE_LOG: | |||
if (service_list->log != NULL) { | if (service_list->log != NULL) { | |||
*error_r = "Multiple log services specified"; | *error_r = "Multiple log services specified"; | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 4 lines changed or added |