namespacing: Add FreeRDPv3 support and drop the FreeRDP version number from project name and project files.

5 files changed, 37 insertions, 37 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29b0a98..9aac03c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,16 +5,16 @@ DISTCLEANFILES =
 EXTRA_DIST =
 
 TESTS =								\
-        test-freerdp2-wrapper					\
+        test-freerdp-wrapper					\
         $(NULL)
 
 check_PROGRAMS =						\
-        test-freerdp2-auth					\
+        test-freerdp-auth					\
         $(TESTS)						\
         $(NULL)
 
 CLEANFILES +=							\
-        test-freerdp2-auth					\
+        test-freerdp-auth					\
         $(TESTS)						\
         $(NULL)
 
@@ -76,42 +76,42 @@ libgtest_main_a_CXXFLAGS =					\
 # Wrapper
 ##########################
 
-test_freerdp2_wrapper: test-freerdp2-auth
+test_freerdp_wrapper: test-freerdp-auth
 
-test_freerdp2_wrapper_SOURCES =					\
+test_freerdp_wrapper_SOURCES =					\
         mock_pam.c mock_pam.h					\
         mock_guest.c mock_guest.h				\
-        test-freerdp2-wrapper.cc				\
+        test-freerdp-wrapper.cc					\
         $(NULL)
 
-test_freerdp2_wrapper_LDADD =					\
+test_freerdp_wrapper_LDADD =					\
         libgtest.a libgtest_main.a				\
-        ${top_srcdir}/src/pam_freerdp2.la			\
-        $(FREERDP2_LIBS)					\
-        $(WINPR2_LIBS)						\
+        ${top_srcdir}/src/pam_freerdp.la			\
+        $(FREERDP_LIBS)						\
+        $(WINPR_LIBS)						\
         $(NULL)
 
-test_freerdp2_wrapper_CPPFLAGS =				\
+test_freerdp_wrapper_CPPFLAGS =					\
         $(AM_CPPFLAGS)						\
         -I${top_srcdir}/include					\
         -I${top_srcdir}/src					\
         $(GTEST_CPPFLAGS)					\
-        $(FREERDP2_CPPFLAGS)					\
-        $(WINPR2_CPPFLAGS)					\
+        $(FREERDP_CPPFLAGS)					\
+        $(WINPR_CPPFLAGS)					\
         $(NULL)
 
-test_freerdp2_wrapper_CXXFLAGS =				\
+test_freerdp_wrapper_CXXFLAGS =					\
         $(AM_CXXFLAGS)						\
-        -DAUTH_CHECK="\"$(abs_builddir)/test-freerdp2-auth\""	\
+        -DAUTH_CHECK="\"$(abs_builddir)/test-freerdp-auth\""	\
         $(GTEST_CXXFLAGS)					\
-        $(FREERDP2_CXXFLAGS)					\
-        $(WINPR2_CXXFLAGS)					\
+        $(FREERDP_CXXFLAGS)					\
+        $(WINPR_CXXFLAGS)					\
         $(NULL)
 
-test_freerdp2_wrapper_LDFLAGS =					\
+test_freerdp_wrapper_LDFLAGS =					\
         $(GTEST_LDFLAGS)					\
-        $(FREERDP2_LDFLAGS)					\
-        $(WINPR2_LDFLAGS)					\
+        $(FREERDP_LDFLAGS)					\
+        $(WINPR_LDFLAGS)					\
         -pthread						\
         $(NULL)
 
@@ -119,6 +119,6 @@ test_freerdp2_wrapper_LDFLAGS =					\
 # Auth tool
 ##########################
 
-test_freerdp2_auth_SOURCES =					\
-        test-freerdp2-auth.c					\
+test_freerdp_auth_SOURCES =					\
+        test-freerdp-auth.c					\
         $(NULL)
diff --git a/tests/mock_guest.c b/tests/mock_guest.c
index 4d10bfb..dad9d5d 100644
--- a/tests/mock_guest.c
+++ b/tests/mock_guest.c
@@ -89,7 +89,7 @@ socket_sucker ()
 
 	serv_addr.sun_family = AF_UNIX;
 
-	unsigned long int printsize = (unsigned long int)snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp2-socket");
+	unsigned long int printsize = (unsigned long int)snprintf(serv_addr.sun_path, sizeof(serv_addr.sun_path) - 1, "%s/%s", home, ".freerdp-socket");
 	if (printsize > sizeof(serv_addr.sun_path) - 1 || printsize < 0) {
 		return -1;
 	}
diff --git a/tests/mock_pam.c b/tests/mock_pam.c
index f32d95f..ca222ba 100644
--- a/tests/mock_pam.c
+++ b/tests/mock_pam.c
@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include "mock_pam.h"
-#include "pam-freerdp2.h"
+#include "pam-freerdp.h"
 
 struct pam_handle {
 	void *item[PAM_NUM_ITEMS];
@@ -33,15 +33,15 @@ int fake_conv (int __attribute__((unused)) num_msg,
 
 	response->resp_retcode = 0;
 
-	if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_GUESTLOGIN) == 0) {
+	if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_GUESTLOGIN) == 0) {
 		response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_USER) == 0) {
 		response->resp = strdup ("ruser");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_HOST) == 0) {
 		response->resp = strdup ("protocol://rhost/dummy");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_PASSWORD) == 0) {
 		response->resp = strdup ("password");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_DOMAIN) == 0) {
 		response->resp = strdup ("domain");
 	} else {
 		free(response);
@@ -66,15 +66,15 @@ int fake_conv_empty_password (int __attribute__((unused)) num_msg,
 
 	response->resp_retcode = 0;
 
-	if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_GUESTLOGIN) == 0) {
+	if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_GUESTLOGIN) == 0) {
 		response->resp = strdup ("guest"); /* IMPORTANT: this needs to be in /etc/passwd */
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_USER) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_USER) == 0) {
 		response->resp = strdup ("ruser");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_HOST) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_HOST) == 0) {
 		response->resp = strdup ("protocol://rhost/dummy");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_PASSWORD) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_PASSWORD) == 0) {
 		response->resp = strdup ("");
-	} else if (strcmp((*msg)->msg, PAM_FREERDP2_PROMPT_DOMAIN) == 0) {
+	} else if (strcmp((*msg)->msg, PAM_FREERDP_PROMPT_DOMAIN) == 0) {
 		response->resp = strdup ("domain");
 	} else {
 		free(response);
diff --git a/tests/test-freerdp2-auth.c b/tests/test-freerdp-auth.c
index a83885e..a83885e 100644
--- a/tests/test-freerdp2-auth.c
+++ b/tests/test-freerdp-auth.c
diff --git a/tests/test-freerdp2-wrapper.cc b/tests/test-freerdp-wrapper.cc
index 33b4168..7555cb1 100644
--- a/tests/test-freerdp2-wrapper.cc
+++ b/tests/test-freerdp-wrapper.cc
@@ -12,7 +12,7 @@ extern "C" {
 #include "mock_pam.h"
 #include "mock_guest.h"
 
-#include "pam-freerdp2-private.h"
+#include "pam-freerdp-private.h"
 
 	int freerdpclient_wrapper (int argc, char * argv[]);
 
@@ -43,13 +43,13 @@ namespace {
     virtual void SetUp() {
       // Code here will be called immediately after the constructor (right
       // before each test).
-		unlink("/tmp/.freerdp2-socket");
+		unlink("/tmp/.freerdp-socket");
     }
 
     virtual void TearDown() {
       // Code here will be called immediately after each test (right
       // before the destructor).
-		unlink("/tmp/.freerdp2-socket");
+		unlink("/tmp/.freerdp-socket");
     }
 
     // Objects declared here can be used by all tests in the test case for Foo.