main.c (dovecot-2.3.16) | : | main.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 49 | skipping to change at line 49 | |||
master_service_client_connection_accept(conn); | master_service_client_connection_accept(conn); | |||
if (strcmp(conn->name, "http") == 0) { | if (strcmp(conn->name, "http") == 0) { | |||
doveadm_client = client_connection_http_create(conn->fd, conn->ss l); | doveadm_client = client_connection_http_create(conn->fd, conn->ss l); | |||
} else { | } else { | |||
doveadm_client = client_connection_tcp_create(conn->fd, conn->lis ten_fd, | doveadm_client = client_connection_tcp_create(conn->fd, conn->lis ten_fd, | |||
conn->ssl); | conn->ssl); | |||
} | } | |||
} | } | |||
void help(const struct doveadm_cmd *cmd) | ||||
{ | ||||
i_fatal("Client sent invalid command. Usage: %s %s", | ||||
cmd->name, cmd->short_usage); | ||||
} | ||||
void help_ver2(const struct doveadm_cmd_ver2 *cmd) | void help_ver2(const struct doveadm_cmd_ver2 *cmd) | |||
{ | { | |||
i_fatal("Client sent invalid command. Usage: %s %s", | i_fatal("Client sent invalid command. Usage: %s %s", | |||
cmd->name, cmd->usage); | cmd->name, cmd->usage); | |||
} | } | |||
static void main_preinit(void) | static void main_preinit(void) | |||
{ | { | |||
restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); | restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL); | |||
restrict_access_allow_coredumps(TRUE); | restrict_access_allow_coredumps(TRUE); | |||
skipping to change at line 108 | skipping to change at line 102 | |||
dict_drivers_unregister_builtin(); | dict_drivers_unregister_builtin(); | |||
doveadm_print_deinit(); | doveadm_print_deinit(); | |||
doveadm_cmds_deinit(); | doveadm_cmds_deinit(); | |||
doveadm_settings_deinit(); | doveadm_settings_deinit(); | |||
} | } | |||
int main(int argc, char *argv[]) | int main(int argc, char *argv[]) | |||
{ | { | |||
enum master_service_flags service_flags = | enum master_service_flags service_flags = | |||
MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN | | MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN | | |||
MASTER_SERVICE_FLAG_HAVE_STARTTLS | | MASTER_SERVICE_FLAG_HAVE_STARTTLS; | |||
MASTER_SERVICE_FLAG_USE_SSL_SETTINGS; | ||||
int c; | int c; | |||
master_service = master_service_init("doveadm", service_flags, | master_service = master_service_init("doveadm", service_flags, | |||
&argc, &argv, "D"); | &argc, &argv, "D"); | |||
while ((c = master_getopt(master_service)) > 0) { | while ((c = master_getopt(master_service)) > 0) { | |||
switch (c) { | switch (c) { | |||
case 'D': | case 'D': | |||
doveadm_debug = TRUE; | doveadm_debug = TRUE; | |||
doveadm_verbose = TRUE; | doveadm_verbose = TRUE; | |||
break; | break; | |||
End of changes. 2 change blocks. | ||||
8 lines changed or deleted | 1 lines changed or added |