Skip to content

Commit dc70f20

Browse files
committed
Fix problems introduced with 4aef53ce6 (john-local.conf)
The Test Suite's john-local.conf would no longer load automatically. Now, our jtrts.conf will instead start with including $JOHN/john.conf, and we run john with --config=jtrts.conf
1 parent e90890b commit dc70f20

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

john-local.conf jtrts.conf

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.include "$JOHN/john.conf"
2+
13
[Local:Options]
24

35
# we might want to look at these.

jtrts.pl

+3-2
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ sub setup {
394394
push(@caps, "dupe_suppression");
395395
ScreenOutV("--dupe-suppression option is valid\n");
396396
}
397-
# can we use --config=john.conf ?
397+
# can we use --config=jtrts.conf ?
398398
if (grepUsage("--config=FILE")) { push(@caps, "config_valid");
399399
ScreenOutV("--config=FILE option is valid\n");
400400
}
@@ -462,6 +462,8 @@ sub setup {
462462
ScreenOutV("Capabilities in this build of john:\n");
463463
ScreenOutV(@caps);
464464
ScreenOutV("\n");
465+
466+
if (stringInArray("config_valid", @caps)) { $JOHN_EXE .= " -config=jtrts.conf"; }
465467
}
466468

467469
###############################################################################
@@ -858,7 +860,6 @@ sub process {
858860
my $line_num = 0;
859861
my $cmd_head = "$JOHN_EXE -ses=tst- $pass_thru";
860862
if ($skip) { $cmd_head .= " -skip" }
861-
#if (stringInArray("config_valid", @caps)) { $cmd_head = "$cmd_head -config=john.conf"; }
862863
if (stringInArray("local_pot_valid", @caps)) { $cmd_head .= $pot_opt = " -pot=tst-.pot"; }
863864
else {
864865
# handle john 'core' behavior. We save off existing john.pot, then it is overwritten

0 commit comments

Comments
 (0)