github/thc-hydra
1
0
Fork 0
mirror of https://github.com/vanhauser-thc/thc-hydra.git synced 2025-07-30 11:39:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactoring libfreerdp

Browse source 
Removing double entry of libfreerdp in hydra.c and hydra-rdp.c
This commit is contained in:
Henry Robalino 2020-06-15 15:51:22 -04:00 • committed by GitHub
parent 70fb9e4fa5
commit 9c300ea820
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hydra-rdp.c
View file

@ -10,7 +10,7 @@
#include "hydra-mod.h" #include "hydra-mod.h"
extern char *HYDRA_EXIT; extern char *HYDRA_EXIT;
#if !defined(LIBFREERDP2) || (LIBFREERDP3) #ifndef LIBFREERDP
void dummy_rdp() { printf("\n"); } void dummy_rdp() { printf("\n"); }
#else #else

10
hydra.c
View file

@ -117,7 +117,7 @@ extern int32_t service_oracle_sid_init(char *ip, int32_t sp, unsigned char optio
extern void service_sip(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname); extern void service_sip(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
extern int32_t service_sip_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname); extern int32_t service_sip_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
#endif #endif
#if defined(LIBFREERDP2) || (LIBFREERDP3) #ifdef LIBFREERDP
extern void service_rdp(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname); extern void service_rdp(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
extern int32_t service_rdp_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname); extern int32_t service_rdp_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
#endif #endif
@ -426,7 +426,7 @@ static const struct {
#endif #endif
SERVICE(redis), SERVICE(redis),
SERVICE(rexec), SERVICE(rexec),
#if defined(LIBFREERDP2) || (LIBFREERDP3) #ifdef LIBFREERDP
SERVICE3("rdp", rdp), SERVICE3("rdp", rdp),
#endif #endif
SERVICE(rlogin), SERVICE(rlogin),
@ -2237,7 +2237,7 @@ int main(int argc, char *argv[]) {
strcat(unsupported, "SSL-services (ftps, sip, rdp, oracle-services, ...) "); strcat(unsupported, "SSL-services (ftps, sip, rdp, oracle-services, ...) ");
#endif #endif
#if !defined(LIBFREERDP2) || (LIBFREERDP3) #ifndef LIBFREERDP
// for rdp // for rdp
SERVICES = hydra_string_replace(SERVICES, " rdp", ""); SERVICES = hydra_string_replace(SERVICES, " rdp", "");
#endif #endif
@ -2905,8 +2905,8 @@ int main(int argc, char *argv[]) {
} }
if (strcmp(hydra_options.service, "rdp") == 0) { if (strcmp(hydra_options.service, "rdp") == 0) {
#if !defined(LIBFREERDP2)|| (LIBFREERDP3) #ifndef LIBFREERDP
bail("Compiled without FREERDP2 or FREERDP3 support, modules not available!"); bail("Compiled without FREERDP support, modules not available!");
#endif #endif
} }
if (strcmp(hydra_options.service, "pcnfs") == 0) { if (strcmp(hydra_options.service, "pcnfs") == 0) {