mirror of
https://github.com/vanhauser-thc/thc-hydra.git
synced 2025-08-22 14:23:54 -07:00
dry hydra
This commit is contained in:
parent
bf9116f480
commit
9421b1c298
2 changed files with 1 additions and 16 deletions
5
bfg.c
5
bfg.c
|
@ -1,8 +1,5 @@
|
||||||
|
|
||||||
/* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh,
|
/* code original by Jan Dlabal <dlabaljan@gmail.com>, partially rewritten by vh*/
|
||||||
<<<<<<< HEAD
|
|
||||||
rainy tweaks by yvain douard*/
|
|
||||||
rainy tweaks by owein <yvain29@gmail.com>*/
|
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
|
@ -1284,22 +1284,10 @@ ptr_header_node initialize(char *ip, unsigned char options, char *miscptr) {
|
||||||
*ptr++ = 0;
|
*ptr++ = 0;
|
||||||
|
|
||||||
cond = ptr;
|
cond = ptr;
|
||||||
<<<<<<< HEAD
|
|
||||||
while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\'))
|
while (*ptr != 0 && (*ptr != ':' || *(ptr - 1) == '\\'))
|
||||||
ptr++;
|
ptr++;
|
||||||
if (*ptr != 0)
|
if (*ptr != 0)
|
||||||
*ptr++ = 0;
|
*ptr++ = 0;
|
||||||
=======
|
|
||||||
|
|
||||||
if ((ptr2 = index(ptr, ':')) != NULL) {
|
|
||||||
*ptr2++ = 0;
|
|
||||||
if (*ptr2)
|
|
||||||
optional1 = ptr2;
|
|
||||||
else
|
|
||||||
optional1 = NULL;
|
|
||||||
} else
|
|
||||||
optional1 = NULL;
|
|
||||||
>>>>>>> 6fc51db156b0f0dc533941bb24aa4f24f07f2124
|
|
||||||
|
|
||||||
optional1 = ptr;
|
optional1 = ptr;
|
||||||
if (strstr(url, "\\:") != NULL) {
|
if (strstr(url, "\\:") != NULL) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue