is an IMAP and POP3 server, written with security primarily in mind.
| doveadm-cmd.h (dovecot-2.3.16) | : | doveadm-cmd.h (dovecot-2.3.17) |
|---|
| | |
| skipping to change at line 35 | | skipping to change at line 35 |
|---|
| typedef enum { | | typedef enum { |
| CMD_PARAM_FLAG_NONE = 0x0, | | CMD_PARAM_FLAG_NONE = 0x0, |
| CMD_PARAM_FLAG_POSITIONAL = 0x1, | | CMD_PARAM_FLAG_POSITIONAL = 0x1, |
| CMD_PARAM_FLAG_DO_NOT_EXPOSE = 0x2, | | CMD_PARAM_FLAG_DO_NOT_EXPOSE = 0x2, |
| } doveadm_cmd_param_flag_t; | | } doveadm_cmd_param_flag_t; |
| | |
| typedef enum { | | typedef enum { |
| CMD_FLAG_NONE = 0x0, | | CMD_FLAG_NONE = 0x0, |
| CMD_FLAG_HIDDEN = 0x1, | | CMD_FLAG_HIDDEN = 0x1, |
| CMD_FLAG_NO_PRINT = 0x2, | | CMD_FLAG_NO_PRINT = 0x2, |
|
| | /* Don't parse any -options for the command. */ |
| | CMD_FLAG_NO_OPTIONS = 0x4, |
| | /* Prevent GNU getopt() from finding options after the first |
| | non-option is seen (e.g. "-1 arg -2" would parse -1 but not -2 |
| | as option). */ |
| | CMD_FLAG_NO_UNORDERED_OPTIONS = 0x8, |
| } doveadm_cmd_flag_t; | | } doveadm_cmd_flag_t; |
| | |
| struct doveadm_cmd_param { | | struct doveadm_cmd_param { |
| char short_opt; | | char short_opt; |
| const char *name; | | const char *name; |
| doveadm_cmd_param_t type; | | doveadm_cmd_param_t type; |
| bool value_set; | | bool value_set; |
| struct { | | struct { |
| bool v_bool; | | bool v_bool; |
| int64_t v_int64; | | int64_t v_int64; |
| | |
| skipping to change at line 56 | | skipping to change at line 62 |
|---|
| ARRAY_TYPE(const_string) v_array; | | ARRAY_TYPE(const_string) v_array; |
| struct ip_addr v_ip; | | struct ip_addr v_ip; |
| struct istream* v_istream; | | struct istream* v_istream; |
| } value; | | } value; |
| doveadm_cmd_param_flag_t flags; | | doveadm_cmd_param_flag_t flags; |
| }; | | }; |
| ARRAY_DEFINE_TYPE(doveadm_cmd_param_arr_t, struct doveadm_cmd_param); | | ARRAY_DEFINE_TYPE(doveadm_cmd_param_arr_t, struct doveadm_cmd_param); |
| | |
| typedef void doveadm_command_ver2_t(struct doveadm_cmd_context *cctx); | | typedef void doveadm_command_ver2_t(struct doveadm_cmd_context *cctx); |
| | |
|
| struct doveadm_cmd { | | |
| doveadm_command_t *cmd; | | |
| const char *name; | | |
| const char *short_usage; | | |
| }; | | |
| | | |
| struct doveadm_cmd_ver2 { | | struct doveadm_cmd_ver2 { |
| doveadm_command_ver2_t *cmd; | | doveadm_command_ver2_t *cmd; |
|
| doveadm_command_t *old_cmd; | | |
| struct doveadm_mail_cmd_context *(*mail_cmd)(void); | | struct doveadm_mail_cmd_context *(*mail_cmd)(void); |
| const char *name; | | const char *name; |
| const char *usage; | | const char *usage; |
| doveadm_cmd_flag_t flags; | | doveadm_cmd_flag_t flags; |
| const struct doveadm_cmd_param *parameters; | | const struct doveadm_cmd_param *parameters; |
| }; | | }; |
| | |
| struct doveadm_cmd_context { | | struct doveadm_cmd_context { |
| const struct doveadm_cmd_ver2 *cmd; /* for help */ | | const struct doveadm_cmd_ver2 *cmd; /* for help */ |
| | |
| | |
| skipping to change at line 87 | | skipping to change at line 86 |
|---|
| | |
| const char *username; | | const char *username; |
| struct ip_addr local_ip, remote_ip; | | struct ip_addr local_ip, remote_ip; |
| in_port_t local_port, remote_port; | | in_port_t local_port, remote_port; |
| | |
| enum doveadm_client_type conn_type; | | enum doveadm_client_type conn_type; |
| struct istream *input; | | struct istream *input; |
| struct ostream *output; | | struct ostream *output; |
| }; | | }; |
| | |
|
| ARRAY_DEFINE_TYPE(doveadm_cmd, struct doveadm_cmd); | | |
| extern ARRAY_TYPE(doveadm_cmd) doveadm_cmds; | | |
| | | |
| ARRAY_DEFINE_TYPE(doveadm_cmd_ver2, struct doveadm_cmd_ver2); | | ARRAY_DEFINE_TYPE(doveadm_cmd_ver2, struct doveadm_cmd_ver2); |
| extern ARRAY_TYPE(doveadm_cmd_ver2) doveadm_cmds_ver2; | | extern ARRAY_TYPE(doveadm_cmd_ver2) doveadm_cmds_ver2; |
| | |
|
| extern struct doveadm_cmd doveadm_cmd_dump; | | |
| extern struct doveadm_cmd doveadm_cmd_pw; | | |
| extern struct doveadm_cmd doveadm_cmd_mailbox_mutf7; | | |
| extern struct doveadm_cmd doveadm_cmd_sis_deduplicate; | | |
| extern struct doveadm_cmd doveadm_cmd_sis_find; | | |
| extern struct doveadm_cmd doveadm_cmd_zlibconnect; | | |
| | |
| void doveadm_register_cmd(const struct doveadm_cmd *cmd); | | |
| | |
| const struct doveadm_cmd * | | |
| doveadm_cmd_find_with_args(const char *cmd_name, int *argc, | | |
| const char *const *argv[]); | | |
| | | |
| void doveadm_register_auth_commands(void); | | void doveadm_register_auth_commands(void); |
| void doveadm_register_auth_server_commands(void); | | void doveadm_register_auth_server_commands(void); |
| void doveadm_register_director_commands(void); | | void doveadm_register_director_commands(void); |
| void doveadm_register_proxy_commands(void); | | void doveadm_register_proxy_commands(void); |
| void doveadm_register_log_commands(void); | | void doveadm_register_log_commands(void); |
| void doveadm_register_instance_commands(void); | | void doveadm_register_instance_commands(void); |
| void doveadm_register_mount_commands(void); | | void doveadm_register_mount_commands(void); |
| void doveadm_register_replicator_commands(void); | | void doveadm_register_replicator_commands(void); |
| void doveadm_register_dict_commands(void); | | void doveadm_register_dict_commands(void); |
| void doveadm_register_fs_commands(void); | | void doveadm_register_fs_commands(void); |
| | |
| void doveadm_cmds_init(void); | | void doveadm_cmds_init(void); |
| void doveadm_cmds_deinit(void); | | void doveadm_cmds_deinit(void); |
| | |
|
| void doveadm_cmd_ver2_to_cmd_wrapper(struct doveadm_cmd_context *cctx); | | |
| void doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx); | | void doveadm_cmd_ver2_to_mail_cmd_wrapper(struct doveadm_cmd_context *cctx); |
| | |
| void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd); | | void doveadm_cmd_register_ver2(struct doveadm_cmd_ver2 *cmd); |
| const struct doveadm_cmd_ver2 * | | const struct doveadm_cmd_ver2 * |
| doveadm_cmd_find_with_args_ver2(const char *cmd_name, int *argc, | | doveadm_cmd_find_with_args_ver2(const char *cmd_name, int *argc, |
| const char *const *argv[]); | | const char *const *argv[]); |
| const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name); | | const struct doveadm_cmd_ver2 *doveadm_cmd_find_ver2(const char *cmd_name); |
| /* Returns FALSE if cmd_name doesn't exist, TRUE if it exists. */ | | /* Returns FALSE if cmd_name doesn't exist, TRUE if it exists. */ |
| bool doveadm_cmd_try_run_ver2(const char *cmd_name, | | bool doveadm_cmd_try_run_ver2(const char *cmd_name, |
| int argc, const char *const argv[], | | int argc, const char *const argv[], |
| | |
| skipping to change at line 152 | | skipping to change at line 134 |
|---|
| bool doveadm_cmd_param_ip(const struct doveadm_cmd_context *cctx, | | bool doveadm_cmd_param_ip(const struct doveadm_cmd_context *cctx, |
| const char *name, struct ip_addr *value_r); | | const char *name, struct ip_addr *value_r); |
| bool doveadm_cmd_param_array(const struct doveadm_cmd_context *cctx, | | bool doveadm_cmd_param_array(const struct doveadm_cmd_context *cctx, |
| const char *name, const char *const **value_r); | | const char *name, const char *const **value_r); |
| bool doveadm_cmd_param_istream(const struct doveadm_cmd_context *cctx, | | bool doveadm_cmd_param_istream(const struct doveadm_cmd_context *cctx, |
| const char *name, struct istream **value_r); | | const char *name, struct istream **value_r); |
| | |
| void doveadm_cmd_params_clean(ARRAY_TYPE(doveadm_cmd_param_arr_t) *pargv); | | void doveadm_cmd_params_clean(ARRAY_TYPE(doveadm_cmd_param_arr_t) *pargv); |
| void doveadm_cmd_params_null_terminate_arrays(ARRAY_TYPE(doveadm_cmd_param_arr_t
) *pargv); | | void doveadm_cmd_params_null_terminate_arrays(ARRAY_TYPE(doveadm_cmd_param_arr_t
) *pargv); |
| | |
|
| | extern struct doveadm_cmd_ver2 doveadm_cmd_dump; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_service_stop_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_service_stop_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_service_status_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_service_status_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_process_status_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_process_status_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_stop_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_reload_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_stats_dump_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_stats_dump_ver2; |
|
| | extern struct doveadm_cmd_ver2 doveadm_cmd_stats_add_ver2; |
| | extern struct doveadm_cmd_ver2 doveadm_cmd_stats_remove_ver2; |
| | extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_mutf7; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_reset_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_reset_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_dump_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_dump_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_top_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_oldstats_top_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_penalty_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_penalty_ver2; |
|
| | extern struct doveadm_cmd_ver2 doveadm_cmd_pw; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_kick_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_kick_ver2; |
| extern struct doveadm_cmd_ver2 doveadm_cmd_who_ver2; | | extern struct doveadm_cmd_ver2 doveadm_cmd_who_ver2; |
|
| | extern struct doveadm_cmd_ver2 doveadm_cmd_sis_deduplicate; |
| | extern struct doveadm_cmd_ver2 doveadm_cmd_sis_find; |
| | extern struct doveadm_cmd_ver2 doveadm_cmd_zlibconnect; |
| | |
| #endif | | #endif |
| | | |
| End of changes. 10 change blocks. |
|---|
| 24 lines changed or deleted | | 14 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 