Permalink
Browse files

The previous patch reset a FLG_NONE behaviour that Jumbo did not have

before. This had unexpected consequences so this is now reverted
(FLG_NONE is 0 again). Also a cosmetic (code) fix for loopback.
  • Loading branch information...
1 parent 11ecdb0 commit 8a9d91909f0f9af78bc95f9a81ff61b62b02ba16 @magnumripper committed Nov 16, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/options.c
  2. +3 −3 src/options.h
View
@@ -55,7 +55,7 @@ static struct opt_entry opt_list[] = {
OPT_FMT_STR_ALLOC, &options.loader.activesinglerules},
{"wordlist", FLG_WORDLIST_SET, FLG_CRACKING_CHK,
0, 0, OPT_FMT_STR_ALLOC, &options.wordlist},
- {"loopback", FLG_LOOPBACK_SET | FLG_DUPESUPP, FLG_CRACKING_CHK,
+ {"loopback", FLG_LOOPBACK_SET, FLG_CRACKING_CHK,
0, 0, OPT_FMT_STR_ALLOC, &options.wordlist},
{"encoding", FLG_NONE, FLG_NONE,
0, 0, OPT_FMT_STR_ALLOC, &options.encoding},
View
@@ -19,6 +19,8 @@
/*
* Core Option flags bitmasks (low 32 bits):
*/
+/* Some option that doesn't have its own flag is specified */
+#define FLG_NONE 0x00000000
/* An action requested */
#define FLG_ACTION 0x00000001
/* Password files specified */
@@ -27,8 +29,6 @@
#define FLG_PWD_SUP 0x00000004
/* An option requires password files */
#define FLG_PWD_REQ (0x00000008 | FLG_PWD_SUP)
-/* Some option that doesn't have its own flag is specified */
-#define FLG_NONE 0x00000010
/* A cracking mode enabled */
#define FLG_CRACKING_CHK 0x00000020
#define FLG_CRACKING_SUP 0x00000040
@@ -95,7 +95,7 @@
* we use the active .pot file */
#define FLG_LOOPBACK_CHK 0x0000000100000000
#define FLG_LOOPBACK_SET \
- (FLG_LOOPBACK_CHK | FLG_WORDLIST_SET | FLG_CRACKING_SET)
+ (FLG_LOOPBACK_CHK | FLG_WORDLIST_SET | FLG_CRACKING_SET | FLG_DUPESUPP)
/* pipe mode enabled, reading from stdin with rules support */
#define FLG_PIPE_CHK 0x0000000200000000
#define FLG_PIPE_SET (FLG_PIPE_CHK | FLG_WORDLIST_SET)

0 comments on commit 8a9d919

Please sign in to comment.