>From 3af7f4d403a6569ac5f237e01183eab334a1c2e5 Mon Sep 17 00:00:00 2001 From: Frank Dittrich Date: Fri, 15 Jun 2012 23:10:23 +0200 Subject: [PATCH] Improve error message for invalid incremental mode name $ ./john --stdout --inc=invalid Unknown incremental mode: invalid instead of $ ./john --stdout --inc=invalid No charset defined for mode: invalid --- src/inc.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/inc.c b/src/inc.c index b986cb5..a631bea 100644 --- a/src/inc.c +++ b/src/inc.c @@ -440,14 +440,23 @@ void do_incremental_crack(struct db_main *db, char *mode) log_event("Proceeding with \"incremental\" mode: %.100s", mode); if (!(charset = cfg_get_param(SECTION_INC, mode, "File"))) { - log_event("! No charset defined"); + if(cfg_get_section(SECTION_INC, mode) == NULL) { + log_event("! Unknown incremental mode: %s", mode); #ifdef HAVE_MPI - if (mpi_id == 0) + if (mpi_id == 0) #endif - fprintf(stderr, "No charset defined for mode: %s\n", mode); - error(); + fprintf(stderr, "Unknown incremental mode: %s\n", mode); + error(); + } + else { + log_event("! No charset defined"); +#ifdef HAVE_MPI + if (mpi_id == 0) +#endif + fprintf(stderr, "No charset defined for mode: %s\n", mode); + error(); + } } - extra = cfg_get_param(SECTION_INC, mode, "Extra"); if ((min_length = cfg_get_int(SECTION_INC, mode, "MinLen")) < 0) -- 1.7.7.6