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

14 files changed, 146 insertions, 92 deletions

diff --git a/README.md b/README.md
index 94ff9b7..630da88 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# PAM FreeRDP2
+# PAM FreeRDP
 
-A small PAM module to check an RDP Server (using FreeRDP2) for credentials.
+A small PAM module to check an RDP Server (using FreeRDPv2/FreeRDPv3) for credentials.
 
 This PAM module is needed for Arctica Greeter's Remote Logon feature.
diff --git a/configure.ac b/configure.ac
index 68a6cec..2423b37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libpam-freerdp2], [2.0.0])
+AC_INIT([libpam-freerdp], [2.0.0])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([m4])
 
@@ -26,8 +26,44 @@ fi
 # FreeRDP
 ###########################
 
-PKG_CHECK_MODULES(FREERDP2, freerdp2)
-PKG_CHECK_MODULES(WINPR2, winpr2)
+dnl GTK version selection.
+AC_MSG_CHECKING([whether to build against FreeRDPv3])
+AC_ARG_ENABLE([freerdp3],
+              [AS_HELP_STRING([--enable-freerdp3],
+                              [Build against FreeRDPv3])],
+              [enable_freerdp3=$enableval],
+              [enable_freerdp3=no])
+AC_MSG_RESULT([$enable_freerdp3])
+with_freerdp3=$enable_freerdp3
+
+AS_IF([test "x$enable_freerdp3" != 'xno'],
+      [PKG_CHECK_MODULES([FREERDP],
+                         [freerdp3],
+                         [freerdp3_modules=yes],
+                         [freerdp3_modules=no])
+       PKG_CHECK_MODULES([WINPR],
+                         [winpr3])
+       AC_MSG_CHECKING([for FreeRDPv3 libraries])
+       AC_MSG_RESULT([$freerdp3_modules])
+       AS_IF([test "x$freerdp3_modules" = 'xno'],
+             [AC_MSG_ERROR([requested FreeRDPv3, but not found])],
+             [with_freerdp3=yes])])
+AS_IF([test "x$with_freerdp3" = 'xno'],
+      [PKG_CHECK_MODULES([FREERDP],
+                         [freerdp2],
+                         [freerdp2_modules=yes],
+                         [freerdp2_modules=no])
+       PKG_CHECK_MODULES([WINPR],
+                         [winpr2])
+       AC_MSG_CHECKING([for FreeRDPv2 libraries])
+       AC_MSG_RESULT([$freerdp2_modules])
+       AS_IF([test "x$freerdp2_modules" = 'xno'],
+             [AC_MSG_ERROR([requested FreeRDPv2, but not found])])])
+AC_SUBST([FREERDP_CFLAGS])
+AC_SUBST([FREERDP_LIBS])
+AC_SUBST([WINPR_CFLAGS])
+AC_SUBST([WINPR_LIBS])
+AM_CONDITIONAL([HAVE_FREERDP3], [test "x$with_freerdp3" != 'xno'])
 
 ###########################
 # PAM Module dir
diff --git a/include/pam-freerdp2.h b/include/pam-freerdp.h
index 3635a4f..7d5e277 100644
--- a/include/pam-freerdp2.h
+++ b/include/pam-freerdp.h
@@ -17,13 +17,13 @@
  * Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
  */
 
-#ifndef _PAM_FREERDP2_H_
-#define _PAM_FREERDP2_H_
+#ifndef _PAM_FREERDP_H_
+#define _PAM_FREERDP_H_
 
-#define PAM_FREERDP2_PROMPT_GUESTLOGIN		"login:"
-#define PAM_FREERDP2_PROMPT_USER		"remote login:"
-#define PAM_FREERDP2_PROMPT_HOST		"remote host:"
-#define PAM_FREERDP2_PROMPT_DOMAIN		"remote domain:"
-#define PAM_FREERDP2_PROMPT_PASSWORD		"password:"
+#define PAM_FREERDP_PROMPT_GUESTLOGIN		"login:"
+#define PAM_FREERDP_PROMPT_USER		"remote login:"
+#define PAM_FREERDP_PROMPT_HOST		"remote host:"
+#define PAM_FREERDP_PROMPT_DOMAIN		"remote domain:"
+#define PAM_FREERDP_PROMPT_PASSWORD		"password:"
 
-#endif //_PAM_FREERDP2_H_
+#endif //_PAM_FREERDP_H_
diff --git a/src/Makefile.am b/src/Makefile.am
index ab3deed..7e25fd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,62 +1,62 @@
 NULL =
 
 pamlibdir = $(PAMMODULEDIR)
-pamlib_LTLIBRARIES = pam_freerdp2.la
+pamlib_LTLIBRARIES = pam_freerdp.la
 
-pam_freerdp2_la_SOURCES = \
+pam_freerdp_la_SOURCES = \
         auth-check-path.c auth-check-path.h			\
-        pam-freerdp2.c						\
-        pam-freerdp2-children.c					\
+        pam-freerdp.c						\
+        pam-freerdp-children.c					\
         $(NULL)
 
-pam_freerdp2_la_LDFLAGS =					\
+pam_freerdp_la_LDFLAGS =					\
         -no-undefined						\
         -module							\
         -avoid-version						\
         $(COVERAGE_LDFLAGS)					\
         $(NULL)
 
-pam_freerdp2_la_CFLAGS =					\
+pam_freerdp_la_CFLAGS =						\
         -Wall -Werror						\
-        -DAUTH_CHECK="\"$(libexecdir)/freerdp2-auth-check\""	\
+        -DAUTH_CHECK="\"$(libexecdir)/freerdp-auth-check\""	\
         $(COVERAGE_CFLAGS)					\
         $(NULL)
 
-pam_freerdp2_la_CPPFLAGS =					\
+pam_freerdp_la_CPPFLAGS =					\
         -I$(top_srcdir)/include					\
         $(NULL)
 
-pam_freerdp2_la_LIBADD = \
+pam_freerdp_la_LIBADD = \
         -lpam							\
         $(NULL)
 
-pam_freerdp2includedir = $(includedir)/security/
-pam_freerdp2include_HEADERS =					\
-        $(top_srcdir)/include/pam-freerdp2.h			\
+pam_freerdpincludedir = $(includedir)/security/
+pam_freerdpinclude_HEADERS =					\
+        $(top_srcdir)/include/pam-freerdp.h			\
         $(NULL)
 
 libexec_PROGRAMS =						\
-        freerdp2-auth-check					\
+        freerdp-auth-check					\
         $(NULL)
 
-freerdp2_auth_check_SOURCES =					\
-        freerdp2-auth-check.c					\
+freerdp_auth_check_SOURCES =					\
+        freerdp-auth-check.c					\
         $(NULL)
 
-freerdp2_auth_check_CFLAGS =					\
+freerdp_auth_check_CFLAGS =					\
         -Wall -Werror						\
-        $(FREERDP2_CFLAGS)					\
-        $(WINPR2_CFLAGS)					\
+        $(FREERDP_CFLAGS)					\
+        $(WINPR_CFLAGS)						\
         $(COVERAGE_CFLAGS)					\
         $(NULL)
 
-freerdp2_auth_check_LDADD =					\
-        $(FREERDP2_LIBS)					\
-        $(WINPR2_LIBS)						\
+freerdp_auth_check_LDADD =					\
+        $(FREERDP_LIBS)						\
+        $(WINPR_LIBS)						\
         $(NULL)
 
-freerdp2_auth_check_LDFLAGS =					\
-        $(FREERDP2_LDFLAGS)					\
-        $(WINPR2_LDFLAGS)					\
+freerdp_auth_check_LDFLAGS =					\
+        $(FREERDP_LDFLAGS)					\
+        $(WINPR_LDFLAGS)					\
         $(COVERAGE_LDFLAGS)					\
         $(NULL)
diff --git a/src/freerdp2-auth-check.c b/src/freerdp-auth-check.c
index ab3b1fd..7a60f7e 100644
--- a/src/freerdp2-auth-check.c
+++ b/src/freerdp-auth-check.c
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 {
 	char password[512];
 	if (argc != 4) {
-		printf("Usage: echo <passwd> | freerdp2-auth-check <host>[:<port>] <user> <domain>\n\n");
+		printf("Usage: echo <passwd> | freerdp-auth-check <host>[:<port>] <user> <domain>\n\n");
 		printf("ERROR: Incorrect number of parameters.\n\n");
 		return -1;
 	}
@@ -91,15 +91,26 @@ main (int argc, char *argv[])
 		/* We've got a port to deal with */
 		colonloc[0] = '\0';
 		colonloc++;
-
+#if FREERDP_VERSION_MAJOR >= 3
+		freerdp_settings_set_uint32(instance->context->settings, FreeRDP_ServerPort, strtoul(colonloc, NULL, 10));
+#else
 		instance->settings->ServerPort = strtoul(colonloc, NULL, 10);
+#endif
 	}
 
+#if FREERDP_VERSION_MAJOR >= 3
+	freerdp_settings_set_bool(instance->context->settings, FreeRDP_AuthenticationOnly, TRUE);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_ServerHostname, argv[1]);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Username, argv[2]);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Domain, argv[3]);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Password, password);
+#else
 	instance->settings->AuthenticationOnly = TRUE;
 	instance->settings->ServerHostname = argv[1];
 	instance->settings->Username = argv[2];
 	instance->settings->Domain = argv[3];
 	instance->settings->Password = password;
+#endif
 
 	BOOL connection_successful;
 	connection_successful = freerdp_connect(instance);
@@ -107,10 +118,17 @@ main (int argc, char *argv[])
 
 	memset(password, 0, sizeof(password));
 	munlock(password, sizeof(password));
+#if FREERDP_VERSION_MAJOR >= 3
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Password, NULL);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_ServerHostname, NULL);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Username, NULL);
+	freerdp_settings_set_string(instance->context->settings, FreeRDP_Domain, NULL);
+#else
 	instance->settings->Password = NULL;
 	instance->settings->ServerHostname = NULL;
 	instance->settings->Username = NULL;
 	instance->settings->Domain = NULL;
+#endif
 
 	int retval = 0;
 	if (!connection_successful) {
diff --git a/src/pam-freerdp2-children.c b/src/pam-freerdp-children.c
index 91b4a3a..8cd4ef8 100644
--- a/src/pam-freerdp2-children.c
+++ b/src/pam-freerdp-children.c
@@ -34,7 +34,7 @@
 #include <security/pam_modutil.h>
 #include <security/pam_appl.h>
 
-#include "pam-freerdp2-children.h"
+#include "pam-freerdp-children.h"
 #include "auth-check-path.h"
 
 void
@@ -172,7 +172,7 @@ session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruse
 	memset(&socket_addr, 0, sizeof(struct sockaddr_un));
 	socket_addr.sun_family = AF_UNIX;
 	strncpy(socket_addr.sun_path, pwdent->pw_dir, sizeof(socket_addr.sun_path) - 1);
-	strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.freerdp2-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1);
+	strncpy(socket_addr.sun_path + strlen(pwdent->pw_dir), "/.freerdp-socket", (sizeof(socket_addr.sun_path) - strlen(pwdent->pw_dir)) - 1);
 
 	/* We bind the socket before forking so that we ensure that
 	   there isn't a race condition to get to it.  Things will block
diff --git a/src/pam-freerdp2-children.h b/src/pam-freerdp-children.h
index dac3b19..1109587 100644
--- a/src/pam-freerdp2-children.h
+++ b/src/pam-freerdp-children.h
@@ -16,8 +16,8 @@
  * Author: Ted Gould <ted@canonical.com>
  */
 
-#ifndef _PAM_FREERDP2_CHILDREN_H_
-#define _PAM_FREERDP2_CHILDREN_H_
+#ifndef _PAM_FREERDP_CHILDREN_H_
+#define _PAM_FREERDP_CHILDREN_H_
 
 #define PAM_TYPE_RDP_USER   1234
 #define PAM_TYPE_RDP_SERVER 1235
@@ -29,4 +29,4 @@ pam_sm_authenticate_helper (int *stdinpipe, const char* username, const char* rh
 
 int
 session_socket_handler (struct passwd * pwdent, int readypipe, const char * ruser, const char * rhost, const char * rdomain, const char * password);
-#endif //_PAM_FREERDP2_CHILDREN_H_
+#endif //_PAM_FREERDP_CHILDREN_H_
diff --git a/src/pam-freerdp2-private.h b/src/pam-freerdp-private.h
index 74663ef..0b7520f 100644
--- a/src/pam-freerdp2-private.h
+++ b/src/pam-freerdp-private.h
@@ -17,8 +17,8 @@
  * Author libpam-freerdp (where we forked from): Ted Gould <ted@canonical.com>
  */
 
-#ifndef _PAM_FREERDP2_PRIVATE_H_
-#define _PAM_FREERDP2_PRIVATE_H_
+#ifndef _PAM_FREERDP_PRIVATE_H_
+#define _PAM_FREERDP_PRIVATE_H_
 
 PAM_EXTERN int
 pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, const char **argv);
@@ -29,4 +29,4 @@ pam_sm_close_session (pam_handle_t *pamh, int flags, int argc, const char **argv
 PAM_EXTERN int
 pam_sm_setcred (pam_handle_t *pamh, int flags, int argc, const char ** argv);
 
-#endif //_PAM_FREERDP2_PRIVATE_H_
+#endif //_PAM_FREERDP_PRIVATE_H_
diff --git a/src/pam-freerdp2.c b/src/pam-freerdp.c
index 593dde5..8bf505f 100644
--- a/src/pam-freerdp2.c
+++ b/src/pam-freerdp.c
@@ -36,9 +36,9 @@
 #include <security/pam_modutil.h>
 #include <security/pam_appl.h>
 
-#include "pam-freerdp2.h"
+#include "pam-freerdp.h"
 
-#include "pam-freerdp2-children.h"
+#include "pam-freerdp-children.h"
 #include "auth-check-path.h"
 
 static int unpriveleged_kill (struct passwd * pwdent);
@@ -93,20 +93,20 @@ get_item (pam_handle_t * pamh, int type)
 
 	switch (type) {
 	case PAM_USER:
-		message.msg = PAM_FREERDP2_PROMPT_GUESTLOGIN;
+		message.msg = PAM_FREERDP_PROMPT_GUESTLOGIN;
 		break;
 	case PAM_TYPE_RDP_USER:
-		message.msg = PAM_FREERDP2_PROMPT_USER;
+		message.msg = PAM_FREERDP_PROMPT_USER;
 		break;
 	case PAM_TYPE_RDP_SERVER:
-		message.msg = PAM_FREERDP2_PROMPT_HOST;
+		message.msg = PAM_FREERDP_PROMPT_HOST;
 		break;
 	case PAM_AUTHTOK:
-		message.msg = PAM_FREERDP2_PROMPT_PASSWORD;
+		message.msg = PAM_FREERDP_PROMPT_PASSWORD;
 		message.msg_style = PAM_PROMPT_ECHO_OFF;
 		break;
 	case PAM_TYPE_RDP_DOMAIN:
-		message.msg = PAM_FREERDP2_PROMPT_DOMAIN;
+		message.msg = PAM_FREERDP_PROMPT_DOMAIN;
 		break;
 	default:
 		return NULL;
@@ -460,7 +460,7 @@ pam_sm_setcred (pam_handle_t __attribute__((unused)) *pamh, int __attribute__((u
 #ifdef PAM_STATIC
 
 struct pam_module _pam_freerdp_modstruct = {
-     "pam_freerdp2",
+     "pam_freerdp",
      pam_sm_authenticate,
      pam_sm_setcred,
      NULL,
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.