Commit Graph

2300 Commits

Author SHA1 Message Date
Jay Sorg
a330789e5b xup: fix for when Xorg/X11rdp to xup message payload is zero 2015-07-18 22:48:07 -07:00
Itamar Reis Peixoto
d4791b39e1 Merge pull request #265 from itamarjp/devel
improve systemd unit files
2015-07-15 15:06:18 -03:00
Itamar Reis Peixoto
26780d7fea improve systemd unit files 2015-07-15 14:23:39 -03:00
Itamar Reis Peixoto
99b433a130 Merge pull request #261 from itamarjp/devel
add missing files into extra_dist, this is required when using make dist to generate a tarball
2015-07-14 15:33:28 -03:00
itamarjp
c5cac75593 add more missing files into extra_dist 2015-07-14 12:16:25 -03:00
itamarjp
960cc62a0e add missing files into extra_dist,
this is required when using make dist to generate a tarball
2015-07-14 11:35:33 -03:00
Jay Sorg
2ed8108d77 Merge branch 'devel' of git:neutrinolabs/xrdp into devel 2015-07-13 01:10:58 -07:00
Jay Sorg
6c23b85593 add timeout to trans_get_wait_objs_rw 2015-07-13 01:10:48 -07:00
jsorg71
7daeb4ddd7 Merge pull request #252 from metalefty/freebsd/instfiles
instfiles: merge rc script from FreeBSD
2015-07-12 02:00:04 -07:00
Jay Sorg
136e072513 fix problem caused by b56aa98 for tls connections 2015-07-12 01:38:30 -07:00
Jay Sorg
527bac0624 move libvnc to trans for io 2015-07-12 01:07:10 -07:00
Jay Sorg
fc1e4c645c update the copyright year 2015-07-12 01:06:04 -07:00
Jay Sorg
72f84fd2ec set the source for xup module 2015-07-11 01:18:02 -07:00
Jay Sorg
5d73cbd636 set the source for chansrv 2015-07-11 01:17:32 -07:00
Jay Sorg
914b4acf39 fix for libxrdp_reset 2015-07-11 00:13:50 -07:00
Jay Sorg
4a553e07af update the module API 2015-07-10 21:57:04 -07:00
Jay Sorg
65de5e971b xup: move to trans for io 2015-07-10 20:38:27 -07:00
Jay Sorg
b56aa9832e work on main loop changes 2015-07-05 23:14:46 -07:00
Koichiro IWAO
0f8f03e9cf instfiles: merge rc script from FreeBSD
- merge rc script from FreeBSD
- modify Makefile.am to detect OS and install suitable files
2015-06-18 16:25:39 +09:00
jsorg71
f8432d0bb7 Merge pull request #251 from metalefty/freebsd/sesman
sesman: merge FreeBSD local patch for session.c
2015-06-17 09:48:21 -07:00
Koichiro IWAO
67ff276d4d sesman: add copyright noice for code from OpenSSH 2015-06-16 06:10:30 +00:00
Koichiro IWAO
481653e5f3 sesman: merge FreeBSD local patch for session.c
net/xrdp: effective login name is not set by xrdp-sesman
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=157282
2015-06-16 05:44:07 +00:00
jsorg71
92f10c5e9c Merge pull request #250 from metalefty/gitignore
add compile and xrdp-xcon to .gitignore
2015-06-13 11:08:06 -07:00
Koichiro IWAO
05a1251f26 add compile and xrdp-xcon to .gitignore 2015-06-12 11:30:13 +00:00
Idan Freiberg
2a8209ca8b Merge pull request #249 from metalefty/freebsd/tls
common: fix #248 TLS on FreeBSD
2015-06-12 10:55:16 +03:00
Koichiro IWAO
cd6ab20e94 common: shut up some messages in ssl_tls_print_error
SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE are not fatal error but just
indicate SSL_read, SSL_write, SSL_accept functions to repeat.
2015-06-12 13:03:07 +09:00
Koichiro IWAO
2a2b8bcd59 common: fix #248 TLS on FreeBSD
According to document[1][2][3], retry when SSL_get_error returns
SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE.

[1] https://www.openssl.org/docs/ssl/SSL_read.html
[2] https://www.openssl.org/docs/ssl/SSL_write.html
[3] https://www.openssl.org/docs/ssl/SSL_accept.html
2015-06-11 21:45:57 +09:00
speidy
9fb02e381d libxrdp: xrdp_iso: changed logs, some fixes in security layer
negotiation.
2015-06-04 16:48:41 +03:00
speidy
8904252a98 instfiles: Add line seperator to makefile 2015-05-02 11:51:38 +03:00
jsorg71
830a93d824 Merge pull request #235 from metalefty/init-scripts-on-systemd
instfiles: init.d/xrdp shouldn't be installed on systemd system
2015-05-01 17:45:06 -07:00
Koichiro IWAO
2ce05038fd instfiles: default/xrdp is not needed as well on systemd 2015-04-27 09:28:27 +09:00
Thomas Spalinger
04b729ccd1 finish for supporting swiss german keyboard 2015-04-19 16:33:26 -07:00
Koichiro IWAO
ea0aba4ae3 instfiles: init.d/xrdp shouldn't be installed on systemd system
On systemd system, at least CentOS 7, `service foo start` command
works as wrapper of `systemctl start foo`.  However, xrdp installs
init script into /etc/init.d/xrdp.  This script is not necessary
for systemd system, and, what is worse,  if init.d/xrdp exists,
`service xrdp start` works as wrapper to run init.d/xrdp. Maybe
this is inconvinient for many users.
2015-04-17 10:07:42 +09:00
jsorg71
b55231f18a Merge pull request #226 from metalefty/freebsd/openpam
xrdp: xrdp_mm.c detect and use OpenPAM
2015-04-01 22:15:17 -07:00
Jay Sorg
33167a7c74 add frame acks and h264 codec mode basics 2015-03-28 18:34:25 -07:00
jsorg71
7f8ec757de Merge pull request #231 from metalefty/g_sck_get_peer_cred
common: workaround for #146
2015-03-23 21:19:18 -07:00
Created by chef
db3817bf85 remove some checked in binaries 2015-03-20 03:52:34 +00:00
Koichiro IWAO
1f844b2d0e common: workaround for #146 2015-03-18 08:46:23 +00:00
jsorg71
5788133c4d Merge pull request #230 from metalefty/errno-eremoteio-eio
fuse: use EIO instead of EREMOTEIO for BSDs
2015-03-17 20:45:45 -07:00
jsorg71
f3fe2309ac Merge pull request #229 from metalefty/configure-fuse
configure: use PKG_CHECK_MODULES to check fuse
2015-03-17 20:44:35 -07:00
Koichiro IWAO
53ea01d51e fuse: use EIO instead of EREMOTEIO for BSDs
FreeBSD/OpenBSD/NetBSD and OS X don't have errno EREMOTEIO.
2015-03-18 03:18:39 +00:00
Koichiro IWAO
67cad0d374 configure: use PKG_CHECK_MODULES to check fuse
fuse has fuse.pc file for pkg-config. this is more reliable.
2015-03-18 02:40:15 +00:00
Jay Sorg
9c2951fa6c X11rdp: update versions, web site 2015-03-17 10:47:20 -07:00
Jay Sorg
4a95950f96 X11rdp: check for errors from shmem calls 2015-03-17 10:37:23 -07:00
Koichiro IWAO
283a16115a xrdp: xrdp_mm.c detect and use OpenPAM
OpenPAM is used in FreeBSD, NetBSD, DragonFly BSD and Mac OS X.
On the Linux system, Linux-PAM is used.  Detect PAM during configure
and use which the system has.
2015-03-16 15:01:25 +09:00
jsorg71
f9c848f3ca Merge pull request #225 from metalefty/chansrv-explicit-include
chansrv: explicit include in chansrv_fuse.c
2015-03-15 16:43:59 -07:00
Jay Sorg
9e310fbe06 clipboard file paste, don't add new line to last line 2015-03-13 12:58:31 -07:00
Koichiro IWAO
647c72b75b chansrv: explicit include in chansrv_fuse.c
chansrv_fuse.c includes chansrv_fuse.h even if XRDP_FUSE is not
defined. However, time_t is used in chansrv_fuse.h.  This causes
build failure on FreeBSD.
2015-03-13 09:15:28 +00:00
jsorg71
4a6567c5a2 Merge pull request #222 from metalefty/issue-33
xrdp: fix -h -v option if xrdp.ini is invalid
2015-03-12 22:21:32 -07:00
jsorg71
4f60b58b17 Merge pull request #212 from robertalks/devel
fix possible segfault in chansrv if DISPLAY is not set
2015-03-12 15:36:31 -07:00