From 9c300ea820946e706a70f6994245a8485dedea72 Mon Sep 17 00:00:00 2001
From: Henry Robalino <animetauren@users.noreply.github.com>
Date: Mon, 15 Jun 2020 15:51:22 -0400
Subject: [PATCH] Refactoring libfreerdp

Removing double entry of libfreerdp in hydra.c and hydra-rdp.c
---
 hydra-rdp.c |  2 +-
 hydra.c     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hydra-rdp.c b/hydra-rdp.c
index 282846d..6a000a4 100644
--- a/hydra-rdp.c
+++ b/hydra-rdp.c
@@ -10,7 +10,7 @@
 #include "hydra-mod.h"
 
 extern char *HYDRA_EXIT;
-#if !defined(LIBFREERDP2) || (LIBFREERDP3)
+#ifndef LIBFREERDP
 void dummy_rdp() { printf("\n"); }
 #else
 
diff --git a/hydra.c b/hydra.c
index db7837d..aa7f9ee 100644
--- a/hydra.c
+++ b/hydra.c
@@ -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 int32_t service_sip_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 #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 int32_t service_rdp_init(char *ip, int32_t sp, unsigned char options, char *miscptr, FILE *fp, int32_t port, char *hostname);
 #endif
@@ -426,7 +426,7 @@ static const struct {
 #endif
                 SERVICE(redis),
                 SERVICE(rexec),
-#if defined(LIBFREERDP2) || (LIBFREERDP3)
+#ifdef LIBFREERDP
                 SERVICE3("rdp", rdp),
 #endif
                 SERVICE(rlogin),
@@ -2237,7 +2237,7 @@ int main(int argc, char *argv[]) {
   strcat(unsupported, "SSL-services (ftps, sip, rdp, oracle-services, ...) ");
 #endif
 
-#if !defined(LIBFREERDP2) || (LIBFREERDP3)
+#ifndef LIBFREERDP
   // for rdp
   SERVICES = hydra_string_replace(SERVICES, " rdp", "");
 #endif
@@ -2905,8 +2905,8 @@ int main(int argc, char *argv[]) {
     }
 
     if (strcmp(hydra_options.service, "rdp") == 0) {
-#if !defined(LIBFREERDP2)|| (LIBFREERDP3)
-      bail("Compiled without FREERDP2 or FREERDP3 support, modules not available!");
+#ifndef LIBFREERDP
+      bail("Compiled without FREERDP support, modules not available!");
 #endif
     }
     if (strcmp(hydra_options.service, "pcnfs") == 0) {