"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/plugins/mail-crypt/doveadm-mail-crypt.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.

doveadm-mail-crypt.c  (dovecot-2.3.16)	:	doveadm-mail-crypt.c  (dovecot-2.3.17)
skipping to change at line 738		skipping to change at line 738
if (ctx->new_password != NULL) {		if (ctx->new_password != NULL) {
doveadm_print("new password specified, cannot ask for it" );		doveadm_print("new password specified, cannot ask for it" );
_ctx->exit_code = EX_USAGE;		_ctx->exit_code = EX_USAGE;
return -1;		return -1;
}		}
if (!cli) {		if (!cli) {
doveadm_print("No cli - cannot ask for password");		doveadm_print("No cli - cannot ask for password");
_ctx->exit_code = EX_USAGE;		_ctx->exit_code = EX_USAGE;
return -1;		return -1;
}		}
ctx->new_password =		const char *passw;
p_strdup(_ctx->pool, t_askpass("New password: "));		passw = t_askpass("New password: ");
		if (strcmp(passw, t_askpass("Confirm new password: ")) != 0) {
		doveadm_print("Passwords don't match, aborting");
		_ctx->exit_code = EX_USAGE;
		return -1;
		}
		ctx->new_password = p_strdup(_ctx->pool, passw);
}		}
if (ctx->clear_password &&		if (ctx->clear_password &&
(ctx->new_password != NULL ||		(ctx->new_password != NULL ||
mail_user_plugin_getenv(user, MAIL_CRYPT_USERENV_PASSWORD) != NULL)) {		mail_user_plugin_getenv(user, MAIL_CRYPT_USERENV_PASSWORD) != NULL)) {
doveadm_print("clear password and new password specified");		doveadm_print("clear password and new password specified");
_ctx->exit_code = EX_USAGE;		_ctx->exit_code = EX_USAGE;
return -1;		return -1;
}		}
skipping to change at line 1026		skipping to change at line 1032
struct doveadm_cmd_ver2 doveadm_cmd_mcp_key_password = {		struct doveadm_cmd_ver2 doveadm_cmd_mcp_key_password = {
.name = "mailbox cryptokey password",		.name = "mailbox cryptokey password",
.mail_cmd = cmd_mcp_key_password_alloc,		.mail_cmd = cmd_mcp_key_password_alloc,
.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-NOC] [-opassword] [-npassword]" ,		.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-NOC] [-opassword] [-npassword]" ,
DOVEADM_CMD_PARAMS_START		DOVEADM_CMD_PARAMS_START
DOVEADM_CMD_MAIL_COMMON		DOVEADM_CMD_MAIL_COMMON
DOVEADM_CMD_PARAM('C', "clear-password", CMD_PARAM_BOOL, 0)		DOVEADM_CMD_PARAM('C', "clear-password", CMD_PARAM_BOOL, 0)
DOVEADM_CMD_PARAM('N', "ask-new-password", CMD_PARAM_BOOL, 0)		DOVEADM_CMD_PARAM('N', "ask-new-password", CMD_PARAM_BOOL, 0)
DOVEADM_CMD_PARAM('n', "new-password", CMD_PARAM_STR, 0)		DOVEADM_CMD_PARAM('n', "new-password", CMD_PARAM_STR, 0)
DOVEADM_CMD_PARAM('O', "ask-old-password", CMD_PARAM_STR, 0)		DOVEADM_CMD_PARAM('O', "ask-old-password", CMD_PARAM_BOOL, 0)
DOVEADM_CMD_PARAM('o', "old-password", CMD_PARAM_STR, 0)		DOVEADM_CMD_PARAM('o', "old-password", CMD_PARAM_STR, 0)
DOVEADM_CMD_PARAMS_END		DOVEADM_CMD_PARAMS_END
};		};
void doveadm_mail_crypt_plugin_init(struct module *mod ATTR_UNUSED)		void doveadm_mail_crypt_plugin_init(struct module *mod ATTR_UNUSED)
{		{
doveadm_cmd_register_ver2(&doveadm_cmd_mcp_keypair_generate);		doveadm_cmd_register_ver2(&doveadm_cmd_mcp_keypair_generate);
doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_list);		doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_list);
doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_export);		doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_export);
doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_password);		doveadm_cmd_register_ver2(&doveadm_cmd_mcp_key_password);
End of changes. 2 change blocks.
3 lines changed or deleted		9 lines changed or added

---