Attachment #175409 for bug #213185

View | Details | Raw Unified | Return to bug 213185
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	xrdp
PORTVERSION=	0.6.2
DISTVERSIONPREFIX=	v
PORTREVISION=	7
PORTEPOCH=	1
CATEGORIES=	net
DIST_SUBDIR=	${PORTNAME}

LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	yes
USES=		autoreconf:build libtool pkgconfig ssl
USE_LDCONFIG=	${PREFIX}/lib/xrdp
USE_OPENSSL=	yes
USE_RC_SUBR=	xrdp
USE_XORG=	x11 xfixes


Lines 1-2 Link Here

(-)net/xrdp/distinfo (-2 / +3 lines)
1	SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b	1	TIMESTAMP = 1475561595
2	SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359	2	SHA256 (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1e12e41537b3cac15f5c216663fc18a15df5a16e9eb2bc1768bea16190815438
		3	SIZE (xrdp/neutrinolabs-xrdp-v0.6.2_GH0.tar.gz) = 1559505

Removed Link Here

(-)net/xrdp/files/patch-common__os_calls.c (-17 lines)
1	diff --git common/os_calls.c common/os_calls.c
2	index 692dc01..7075ee3 100644
3	--- common/os_calls.c
4	+++ common/os_calls.c
5	@@ -2115,8 +2115,12 @@ g_clearenv(void)
6	{
7	#if defined(_WIN32)
8	#else
9	+#if defined(BSD)
10	+ environ[0] = 0;
11	+#else
12	environ = 0;
13	#endif
14	+#endif
15	}
16
17	/*****************************************************************************/




diff --git sesman/verify_user_pam.c sesman/verify_user_pam.c
index e3d8596..281e297 100644
--- sesman/verify_user_pam.c
+++ sesman/verify_user_pam.c
@@ -117,6 +117,14 @@ auth_userpass(char* user, char* pass)
     g_free(auth_info);
     return 0;
   }
+
+  error = pam_set_item(auth_info->ph, PAM_TTY, service_name);
+  if (error != PAM_SUCCESS)
+  {
+    g_printf("pam_set_item failed: %s\r\n",
+                         pam_strerror(auth_info->ph, error));
+  }
+
   error = pam_authenticate(auth_info->ph, 0);
   if (error != PAM_SUCCESS)
   {

Return to bug 213185

Lines 2-10 Link Here

(-)net/xrdp/Makefile (-4 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xrdp	4	PORTNAME= xrdp
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.6.2
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 7
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= net	8	CATEGORIES= net
10	DIST_SUBDIR= ${PORTNAME}	9	DIST_SUBDIR= ${PORTNAME}
Lines 16-24 LICENSE= GPLv2 Link Here
16	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
17		16
18	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
19	USES= autoreconf:build libtool pkgconfig	18	USES= autoreconf:build libtool pkgconfig ssl
20	USE_LDCONFIG= ${PREFIX}/lib/xrdp	19	USE_LDCONFIG= ${PREFIX}/lib/xrdp
21	USE_OPENSSL= yes
22	USE_RC_SUBR= xrdp	20	USE_RC_SUBR= xrdp
23	USE_XORG= x11 xfixes	21	USE_XORG= x11 xfixes
24		22

Removed Link Here

(-)net/xrdp/files/patch-sesman__verify_user_pam.c (-19 lines)
1	diff --git sesman/verify_user_pam.c sesman/verify_user_pam.c
2	index e3d8596..281e297 100644
3	--- sesman/verify_user_pam.c
4	+++ sesman/verify_user_pam.c
5	@@ -117,6 +117,14 @@ auth_userpass(char* user, char* pass)
6	g_free(auth_info);
7	return 0;
8	}
9	+
10	+ error = pam_set_item(auth_info->ph, PAM_TTY, service_name);
11	+ if (error != PAM_SUCCESS)
12	+ {
13	+ g_printf("pam_set_item failed: %s\r\n",
14	+ pam_strerror(auth_info->ph, error));
15	+ }
16	+
17	error = pam_authenticate(auth_info->ph, 0);
18	if (error != PAM_SUCCESS)
19	{