From b8f88efb4644349f118ea7056543ed80e464173d Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 31 May 2016 11:18:45 +0200 Subject: [PATCH 1/2] Remove some compiler warnings --- hydra-http-form.c | 2 +- hydra-teamspeak.c | 2 +- hydra.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hydra-http-form.c b/hydra-http-form.c index 5ab2926..72f3970 100644 --- a/hydra-http-form.c +++ b/hydra-http-form.c @@ -322,7 +322,7 @@ void hdrrepv(ptr_header_node * ptr_head, char *hdrname, char *new_value) { if (cur_ptr->value) strcpy(cur_ptr->value, new_value); else { - hydra_report(stderr, "[ERROR] Out of memory (hdrrepv %d)", strlen(new_value) + 1); + hydra_report(stderr, "[ERROR] Out of memory (hdrrepv %lu)", strlen(new_value) + 1); hydra_child_exit(0); } } diff --git a/hydra-teamspeak.c b/hydra-teamspeak.c index c257e4c..7416116 100644 --- a/hydra-teamspeak.c +++ b/hydra-teamspeak.c @@ -71,7 +71,7 @@ int start_teamspeak(int s, char *ip, int port, unsigned char options, char *misc strcpy((char *) &teamspeak.login, ""); #ifdef HAVE_ZLIB - teamspeak.crc = crc32(0L, &teamspeak, sizeof(struct team_speak)); + teamspeak.crc = crc32(0L, (const Bytef *)&teamspeak, sizeof(struct team_speak)); #else teamspeak.crc = crc32(&teamspeak, sizeof(struct team_speak)); #endif diff --git a/hydra.c b/hydra.c index 33c15e0..22c5c4b 100644 --- a/hydra.c +++ b/hydra.c @@ -732,7 +732,7 @@ void hydra_restore_write(int print_msg) { for (j = 0; j < hydra_options.max_use; j++) { memcpy((char *) &hh, hydra_heads[j], sizeof(hydra_head)); if (j == 0 && debug) { - printf("[DEBUG] sizeof hydra_head: %d\n", sizeof(hydra_head)); + printf("[DEBUG] sizeof hydra_head: %lu\n", sizeof(hydra_head)); printf("[DEBUG] memcmp: %d\n", memcmp(hydra_heads[j], &hh, sizeof(hydra_head))); } hh.active = 0; // re-enable disabled heads From a6702462b35070efe6b081ae2a5502623645a7a1 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Tue, 31 May 2016 16:17:41 +0200 Subject: [PATCH 2/2] Fix warning in ncurses compilation. "lines" is a macro defined in term.h, hence a local var named lines causes a clash. --- hydra.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hydra.c b/hydra.c index 22c5c4b..fb9aacf 100644 --- a/hydra.c +++ b/hydra.c @@ -10,6 +10,11 @@ #include "hydra.h" #include "bfg.h" +#ifdef LIBNCURSES +#include +#include +#endif + extern void service_asterisk(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); extern void service_telnet(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); extern void service_ftp(char *ip, int sp, unsigned char options, char *miscptr, FILE * fp, int port); @@ -1000,7 +1005,7 @@ void kill_children(int signo) { } unsigned long int countlines(FILE * fd, int colonmode) { - size_t lines = 0; + size_t clines = 0; char *buf = malloc(MAXLINESIZE); int only_one_empty_line = 0; @@ -1024,10 +1029,10 @@ unsigned long int countlines(FILE * fd, int colonmode) { if (buf[0] == '\r' || buf[0] == '\n') { if (only_one_empty_line == 0) { only_one_empty_line = 1; - lines++; + clines++; } } else { - lines++; + clines++; } } } @@ -1038,7 +1043,7 @@ unsigned long int countlines(FILE * fd, int colonmode) { rewind(fp); #endif free(buf); - return lines; + return clines; } void fill_mem(char *ptr, FILE * fd, int colonmode) {