diff options
Diffstat (limited to 'net-misc/xrdp/files')
| -rw-r--r-- | net-misc/xrdp/files/startwm.sh | 8 | ||||
| -rw-r--r-- | net-misc/xrdp/files/xrdp-0.8.0-crypt-null-return.patch | 36 | ||||
| -rw-r--r-- | net-misc/xrdp/files/xrdp-initd | 28 | ||||
| -rw-r--r-- | net-misc/xrdp/files/xrdp-sesman.pamd | 4 |
4 files changed, 76 insertions, 0 deletions
diff --git a/net-misc/xrdp/files/startwm.sh b/net-misc/xrdp/files/startwm.sh new file mode 100644 index 000000000000..df3dd787f2b5 --- /dev/null +++ b/net-misc/xrdp/files/startwm.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# try hard to respect Gentoo's wm choice +. /etc/profile +[ -f /etc/rc.conf ] && . /etc/rc.conf +export XSESSION + +. /etc/X11/xinit/xinitrc diff --git a/net-misc/xrdp/files/xrdp-0.8.0-crypt-null-return.patch b/net-misc/xrdp/files/xrdp-0.8.0-crypt-null-return.patch new file mode 100644 index 000000000000..44543906a5e0 --- /dev/null +++ b/net-misc/xrdp/files/xrdp-0.8.0-crypt-null-return.patch @@ -0,0 +1,36 @@ +From 851c762ee722a84d15348b2512b3b578282e590b Mon Sep 17 00:00:00 2001 +From: Jay Sorg <jay.sorg@gmail.com> +Date: Wed, 29 Oct 2014 17:54:11 -0700 +Subject: [PATCH] sesman: check for null from crypt() + +--- + sesman/verify_user.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/sesman/verify_user.c b/sesman/verify_user.c +index 98d3dd3..49c475c 100644 +--- a/sesman/verify_user.c ++++ b/sesman/verify_user.c +@@ -51,6 +51,7 @@ long DEFAULT_CC + auth_userpass(char *user, char *pass, int *errorcode) + { + const char *encr; ++ const char *epass; + struct passwd *spw; + struct spwd *stp; + +@@ -84,8 +85,12 @@ auth_userpass(char *user, char *pass, int *errorcode) + /* old system with only passwd */ + encr = spw->pw_passwd; + } +- +- return (strcmp(encr, crypt(pass, encr)) == 0); ++ epass = crypt(pass, encr); ++ if (epass == 0) ++ { ++ return 0; ++ } ++ return (strcmp(encr, epass) == 0); + } + + /******************************************************************************/ diff --git a/net-misc/xrdp/files/xrdp-initd b/net-misc/xrdp/files/xrdp-initd new file mode 100644 index 000000000000..797dfda61f2b --- /dev/null +++ b/net-misc/xrdp/files/xrdp-initd @@ -0,0 +1,28 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + use net logger +} + +start() { + ebegin "Starting X remote desktop daemon" + start-stop-daemon --start --pidfile /var/run/xrdp.pid --exec /usr/sbin/xrdp > /dev/null + eend $? || return $? + + ebegin "Starting remote desktop session manager" + start-stop-daemon --start --pidfile /var/run/xrdp-sesman.pid --exec /usr/sbin/xrdp-sesman > /dev/null + eend $? +} + +stop() { + ebegin "Stopping X remote desktop daemon" + start-stop-daemon --stop --pidfile /var/run/xrdp.pid + eend $? + + ebegin "Stopping remote desktop session manager" + start-stop-daemon --stop --pidfile /var/run/xrdp-sesman.pid + eend $? +} diff --git a/net-misc/xrdp/files/xrdp-sesman.pamd b/net-misc/xrdp/files/xrdp-sesman.pamd new file mode 100644 index 000000000000..4712aa8aec0d --- /dev/null +++ b/net-misc/xrdp/files/xrdp-sesman.pamd @@ -0,0 +1,4 @@ +auth include system-remote-login +account include system-remote-login +password include system-remote-login +session include system-remote-login |