|
|
|
@ -463,14 +463,14 @@ int user_options_sanity (user_options_t *user_options, restore_ctx_t *restore_ct
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((user_options->increment == true) && (user_options->increment_min_chgd == true))
|
|
|
|
|
if ((user_options->increment == false) && (user_options->increment_min_chgd == true))
|
|
|
|
|
{
|
|
|
|
|
log_error ("ERROR: Increment-min is only supported combined with increment switch");
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((user_options->increment == true) && (user_options->increment_max_chgd == true))
|
|
|
|
|
if ((user_options->increment == false) && (user_options->increment_max_chgd == true))
|
|
|
|
|
{
|
|
|
|
|
log_error ("ERROR: Increment-max is only supported combined with increment switch");
|
|
|
|
|
|
|
|
|
@ -856,17 +856,6 @@ int user_options_extra_init (user_options_t *user_options, restore_ctx_t *restor
|
|
|
|
|
if (user_options->attack_mode == ATTACK_MODE_BF)
|
|
|
|
|
{
|
|
|
|
|
user_options_extra->wordlist_mode = WL_MODE_MASK;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* still needed?
|
|
|
|
|
if (user_options_extra->wordlist_mode == WL_MODE_STDIN)
|
|
|
|
|
{
|
|
|
|
|
// enable status (in stdin mode) whenever we do not use --stdout together with an outfile
|
|
|
|
|
|
|
|
|
|
if (user_options->stdout_flag == true) user_options->status = true;
|
|
|
|
|
else if (user_options->outfile) user_options->status = true;
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// default mask
|
|
|
|
|
|
|
|
|
@ -887,6 +876,17 @@ int user_options_extra_init (user_options_t *user_options, restore_ctx_t *restor
|
|
|
|
|
user_options->increment = true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* still needed?
|
|
|
|
|
if (user_options_extra->wordlist_mode == WL_MODE_STDIN)
|
|
|
|
|
{
|
|
|
|
|
// enable status (in stdin mode) whenever we do not use --stdout together with an outfile
|
|
|
|
|
|
|
|
|
|
if (user_options->stdout_flag == true) user_options->status = true;
|
|
|
|
|
else if (user_options->outfile) user_options->status = true;
|
|
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|