diff -Naur -x '*.orig' -x '*.rej' -x '*~' john-1.7.3.4-jumbo/run/john.conf john-1.7.3.4-fhs/run/john.conf --- john-1.7.3.4-jumbo/run/john.conf 2009-09-21 13:50:01.000000000 +0200 +++ john-1.7.3.4-fhs/run/john.conf 2009-09-21 13:51:16.000000000 +0200 @@ -5,9 +5,9 @@ [Options] # Wordlist file name, to be used in batch mode -Wordlist = $JOHN/password.lst +Wordlist = /usr/share/john/password.lst # Default Markov mode settings -Statsfile = $JOHN/stats +Statsfile = /usr/share/john/stats MkvLvl = 200 MkvMaxLen = 12 # Use idle cycles only @@ -327,31 +327,31 @@ # Incremental modes [Incremental:All] -File = $JOHN/all.chr +File = /usr/share/john/all.chr MinLen = 0 MaxLen = 8 CharCount = 95 [Incremental:Alpha] -File = $JOHN/alpha.chr +File = /usr/share/john/alpha.chr MinLen = 1 MaxLen = 8 CharCount = 26 [Incremental:Digits] -File = $JOHN/digits.chr +File = /usr/share/john/digits.chr MinLen = 1 MaxLen = 8 CharCount = 10 [Incremental:Alnum] -File = $JOHN/alnum.chr +File = /usr/share/john/alnum.chr MinLen = 1 MaxLen = 8 CharCount = 36 [Incremental:LanMan] -File = $JOHN/lanman.chr +File = /usr/share/john/lanman.chr MinLen = 0 MaxLen = 7 CharCount = 69 diff -Naur -x '*.orig' -x '*.rej' -x '*~' john-1.7.3.4-jumbo/src/params.h john-1.7.3.4-fhs/src/params.h --- john-1.7.3.4-jumbo/src/params.h 2009-09-21 13:50:01.000000000 +0200 +++ john-1.7.3.4-fhs/src/params.h 2009-09-21 13:50:31.000000000 +0200 @@ -54,7 +54,7 @@ #if JOHN_SYSTEMWIDE #ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */ -#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john" +#define JOHN_SYSTEMWIDE_EXEC "/usr/john" #endif #ifndef JOHN_SYSTEMWIDE_HOME #define JOHN_SYSTEMWIDE_HOME "/usr/share/john" @@ -101,7 +101,7 @@ /* * File names. */ -#define CFG_FULL_NAME "$JOHN/john.conf" +#define CFG_FULL_NAME "/etc/john.conf" #define CFG_ALT_NAME "$JOHN/john.ini" #if JOHN_SYSTEMWIDE #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" @@ -116,7 +116,7 @@ #endif #define LOG_SUFFIX ".log" #define RECOVERY_SUFFIX ".rec" -#define WORDLIST_NAME "$JOHN/password.lst" +#define WORDLIST_NAME "/usr/share/john/password.lst" /* * Configuration file section names.