jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,976 Commits 9 Branches 23 Tags 16 MiB
4a23b7939c
Commit Graph

2976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Idan Freiberg
4a23b7939c Merge pull request #630 from selu/devel 
Fix calling XChangeProperty in clipboard provide
 2017-01-23 08:16:18 +02:00
Idan Freiberg
6a5f90ca6e Merge pull request #636 from proski/painter 
Fix incorrect argument to painter_line()
 2017-01-23 08:15:39 +02:00
Idan Freiberg
482671fd18 Merge pull request #625 from speidy/proxy_session_info 
Pass session info in proxy mode
 2017-01-23 08:15:18 +02:00
Pavel Roskin
6807b616ed Fix incorrect argument to painter_line() 2017-01-21 18:20:27 -08:00
Itamar Reis Peixoto
e217e68acb Merge pull request #635 from proski/bindsto 
Change BindTo to BindsTo, it was renamed in systemd long time ago
 2017-01-21 19:34:55 -02:00
Pavel Roskin
409623a65f Change BindTo to BindsTo, it was renamed in systemd long time ago 
BindTo was left for compatibility.

https://lists.freedesktop.org/archives/systemd-commits/2012-July/002272.html
 2017-01-20 09:05:00 -08:00
Pavel Roskin
2b614ed4ab Remove librdp.so sources, it's obsoleted by neutrinordp 
Remove "rdp-any" section from xrdp.ini.
 2017-01-19 20:13:49 -08:00
metalefty
c5e6eec12f Merge pull request #603 from proski/x11rdp 
Some good things extracted from the X11rdp MacOS port
 2017-01-19 13:13:58 +09:00
metalefty
27b58884fd Merge pull request #629 from proski/cmdline 
Improve command line documentation for xrdp and xrdp-sesman
 2017-01-19 13:12:38 +09:00
Pavel Roskin
ec1655d3ca Compile applewmproto before xorg-server 
xorg-server can use applewmproto if it's available.
 2017-01-17 18:10:13 -08:00
Pavel Roskin
3b52a36afd Use fonts installed as part of X11rdp 2017-01-17 18:10:13 -08:00
Pavel Roskin
1e83db964b Fix Mesa compatibility with clang 2017-01-17 18:10:13 -08:00
Pavel Roskin
9c83414a9c Make sure X11rdp is not copied to a file called "bin" 
It can happen if buildx.sh is run with one argument and them with another
without removing build_dir in between.
 2017-01-17 18:10:13 -08:00
Pavel Roskin
983a7073bf Use OPENSSL_CFLAGS even if -lcrypto is used directly 
OpenSSL headers are used even when the full set of OpenSSL libraries is
not used.
 2017-01-17 18:10:13 -08:00
Pavel Roskin
bbe718bd3a Don't define RDP_IS_XORG and RDP_IS_XFREE86, they are unused 2017-01-17 18:10:13 -08:00
Pavel Roskin
8db3de08eb Remove missing directories from the include path for X11rdp 2017-01-17 18:10:13 -08:00
Pavel Roskin
5d3197618e Fix pixmap compilation with clang 
Clang does not allow a variable to be used for the "K" register, even if
all uses of the inlined function use a constant value.

The current version of pixmap doesn't use the inline function. It uses a
macro regardless of the optimization level. There should be no
performance overhead from using the macro.
 2017-01-17 18:10:13 -08:00
Pavel Roskin
5c32e79605 Fix libpciaccess compilation on non-Linux systems 
Both gcc and clang have __builtin_bswap16 and __builtin_bswap32.
 2017-01-17 18:10:13 -08:00
Pavel Roskin
265ce37077 Fix download caching, only download missing or currently empty files 2017-01-17 18:10:13 -08:00
Pavel Roskin
0a9b586332 Improve xrdp-sesman help text 
Don't document "-ns", as "-n" and "--nodaemon" should be enough. Always
refer to the program as xrdp-sesman, not sesman.
 2017-01-17 18:09:47 -08:00
Pavel Roskin
b1c0a7be04 Document --port and --fork options for xrdp 2017-01-17 18:09:47 -08:00
Pavel Roskin
0799523c13 List shorthand versions of command line switches in the help text 2017-01-17 18:09:47 -08:00
Pavel Roskin
9d162d7301 Implement "-n" alias for "--nodaemon" as documented in the manpage 2017-01-17 18:09:47 -08:00
metalefty
0afbd57638 Merge pull request #628 from metalefty/kill_disconnected 
x11rdp: respect disconnect timeout set by XRDP_SESMAN_MAX_DISC_TIME
 2017-01-18 08:59:15 +09:00
Szabolcs Seláf
bf4c32c862 Fix calling XChangeProperty in clipboard provide 
XChangeProperty's last parameter is number of elements, not number of bytes as it's in https://tronche.com/gui/x/xlib/window-information/XChangeProperty.html
Because of this bug Paste did not work in any java applications.
 2017-01-17 15:18:23 +01:00
Idan Freiberg
19375dda7a Merge pull request #426 from metalefty/log-tls-version-and-cipher 
TLS: log TLS version and cipher
 2017-01-16 07:26:51 +02:00
Koichiro IWAO
97cd454cd6 x11rdp: respect disconnect timeout set by XRDP_SESMAN_MAX_DISC_TIME 
The old code overwrites disconnect timeout to 60 sec when
XRDP_SESMAN_KILL_DISCONNECT is set to truthy value.
 2017-01-16 12:05:23 +09:00
Idan Freiberg
5fa636be89 Merge pull request #605 from proski/pamconfig 
Allow PAM file selection in configure, improve autodetection, add SUSE
 2017-01-15 20:37:17 +02:00
Pavel Roskin
8799bbac42 Allow PAM file selection in configure, improve autodetection, add SUSE 
Use easy to understand names for config files (debian, redhat, suse,
unix). Move all autodetection to a separate script.
 2017-01-15 00:57:59 -08:00
Idan Freiberg
63472bb181 Merge pull request #619 from neutrinolabs/master 
Merge master into devel
 2017-01-15 08:56:47 +02:00
Idan Freiberg
a64e1789c5 Merge pull request #615 from speidy/channels_fixes 
Channels improvements
 2017-01-15 08:55:00 +02:00
speidy
b7da395b5e libxrdp: use constant RDP_DATA_PDU_LOGON 2017-01-15 08:51:43 +02:00
speidy
0a5bc44a0b libxrdp: use log_message 2017-01-15 08:46:04 +02:00
speidy
264aad7603 neutrinordp: add session_info 2017-01-15 08:24:59 +02:00
Jay Sorg
6f74efa70a add session_info 
Conflicts:
	libxrdp/libxrdp.h
 2017-01-15 08:20:50 +02:00
metalefty
9f5656933b Merge pull request #578 from proski/warnings 
Warning fixes
 2017-01-13 07:03:05 -02:00
Koichiro IWAO
f29a98b243 TLS: log client port in addition to ssl protocol and cipher 2017-01-13 17:59:29 +09:00
Pavel Roskin
8ee886a5cc Don't log device_data_len in the code where it may be uninitialized 
Log device_data_len only in the code that reads it.
 2017-01-11 23:25:42 -08:00
Pavel Roskin
f1a521204a Remove redundant function declarations 2017-01-11 23:25:42 -08:00
Pavel Roskin
9a2e728396 Remove send_channel_data() from devredir.h, it's declared in chansrv.h 
Include "chansrv.h" from devredir.c to have send_channel_data()
declaration.
 2017-01-11 23:25:42 -08:00
Idan Freiberg
e08c85aa42 Merge pull request #618 from metalefty/max_disc_time 
sesman: print max_disc_time as DisconnectedTimeLimit
 2017-01-12 06:58:12 +02:00
Koichiro IWAO
c89c1318f8 obey coding standard, no logic change 2017-01-12 09:28:22 +09:00
Pavel Roskin
d46a26c1c3 Don't call file_read_section() on unitialized section name 
This can only happen if xrdp.ini is corrupted and has no sections for
backends.
 2017-01-11 12:24:59 -08:00
Pavel Roskin
b8ed23daab Constify the value argument to mod_set_param 2017-01-11 11:59:11 -08:00
Ricardo Duarte
a959a9f851 Move mouse before click 2017-01-10 12:22:06 -08:00
metalefty
f68d2b8a59 Merge pull request #576 from proski/nopam 
Remove obsolete --enable-nopam option
 2017-01-10 17:30:14 +09:00
metalefty
f9a5b637c7 Merge pull request #585 from proski/travis 
.travis.yml: use -Werror, test two configurations - minimal and maximal
 2017-01-10 17:30:00 +09:00
metalefty
7a9b8bce89 Merge pull request #580 from proski/winattr 
rail: remove unneeded call to XGetWindowAttributes()
 2017-01-10 17:26:14 +09:00
Koichiro IWAO
c3fbd71513 sesman: print max_disc_time as DisconnectedTimeLimit 
not max_idle_time.
 2017-01-10 15:35:16 +09:00
Pavel Roskin
c049c3dfd0 rail: remove unneeded call to XGetWindowAttributes() 
It is already called above "if" with the same arguments.
 2017-01-06 11:24:17 -08:00