diff -rub john-1.7.6-jumbo-6/src/options.c john-1.7.6-jumbo-6-jmk/src/options.c --- john-1.7.6-jumbo-6/src/options.c 2010-07-28 11:03:54.157485013 -0500 +++ john-1.7.6-jumbo-6-jmk/src/options.c 2010-07-28 11:06:52.090957931 -0500 @@ -96,8 +96,8 @@ "%u", &options.loader.max_fix_state_delay}, {"field-separator-char", FLG_NONE, FLG_NONE, 0, OPT_REQ_PARAM, OPT_FMT_STR_ALLOC, &field_sep_char_string}, - {"config", FLG_CONFIG_OPT, FLG_CONFIG_CLI, FLG_CONFIG_CLI, - OPT_REQ_PARAM, OPT_FMT_STR_ALLOC, &options.config}, + {"config", FLG_CONFIG_CLI, FLG_NONE, 0, OPT_REQ_PARAM, + OPT_FMT_STR_ALLOC, &options.config}, {NULL} }; diff -rub john-1.7.6-jumbo-6/src/options.h john-1.7.6-jumbo-6-jmk/src/options.h --- john-1.7.6-jumbo-6/src/options.h 2010-07-28 11:03:54.157485013 -0500 +++ john-1.7.6-jumbo-6-jmk/src/options.h 2010-07-28 11:05:48.719710873 -0500 @@ -91,16 +91,8 @@ #define FLG_MKV_CHK 0x40000000 #define FLG_MKV_SET (FLG_MKV_CHK | FLG_CRACKING_SET) -/* - * Command-line config file. - * - * FLG_CONFIG_DEFAULT is probably not needed. The author if this patch didn't - * recall why it was added: - * http://www.openwall.com/lists/john-users/2010/05/04/1 - */ -#define FLG_CONFIG_DEFAULT 0x10000000 -#define FLG_CONFIG_CLI 0x80000000 -#define FLG_CONFIG_OPT (FLG_CONFIG_DEFAULT | FLG_CONFIG_CLI) +/* Command-line config file */ +#define FLG_CONFIG_CLI 0x10000000 /* * Structure with option flags and all the parameters.