Speidy
a0cf6030df
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into surface_cmds
2016-12-12 15:51:39 -08:00
jsorg71
5966de4ee2
Merge pull request #536 from jsorg71/unicode
...
add unicode support
2016-12-11 17:15:34 -08:00
metalefty
eeb4b19fbd
Merge pull request #535 from speidy/rfx_detection
...
Fix for RemoteFX detection, avoid blank screen when RFX is not supported on server
2016-12-11 23:34:59 +09:00
Itamar Reis Peixoto
091e6d6f57
Merge pull request #529 from proski/vnc32
...
Fix support for 32-bpp clients connecting to 16-bpp VNC
2016-12-11 11:31:03 -02:00
Itamar Reis Peixoto
5171fa79cf
Merge pull request #533 from proski/ipv6
...
Don't use colon to separate IPv6 address from the port
2016-12-11 11:00:13 -02:00
Jay Sorg
c264862afe
change some magics to defines
2016-12-10 01:06:45 -08:00
Jay Sorg
7a1a481ff9
use defines for flags
2016-12-10 00:43:33 -08:00
Jay Sorg
2f8d3ba9da
add unicode support
2016-12-10 00:11:28 -08:00
speidy
1ef5c2412c
xrdp_caps: fix jpeg codec properties
2016-12-10 02:14:50 -05:00
speidy
4f04801b11
o caps: advertise remotefx codec capsets only when supported (RFX mode,
...
proxy mode)
o xrdp_encoder: do not initialze encoder context for RFX when rfxcodec
is not supported
2016-12-10 02:03:20 -05:00
Pavel Roskin
a8fcbf8c2d
Fix support for 32-bpp clients connecting to 16-bpp VNC
2016-12-09 08:43:07 -08:00
Pavel Roskin
d97155e2f6
Don't use colon to separate IPv6 address from the port
...
IPv6 addresses can have colons in their names, so the final colon can be
confusing.
2016-12-09 08:42:56 -08:00
metalefty
42272c0f18
Merge pull request #532 from metalefty/freebsd/session
...
sesman: unbreak FreeBSD build after #523
2016-12-09 12:32:55 +09:00
Koichiro IWAO
35bc7c1d65
sesman: unbreak FreeBSD build after #523
2016-12-09 10:35:21 +09:00
speidy
bb8b85759d
xrdp_encoder: remove temporary workaround for RFX to avoid mstsc
2016-12-08 20:12:00 -05:00
speidy
bf07c20571
no logic change, indent only
2016-12-08 20:12:00 -05:00
speidy
8a0fec5e66
o send RFX tiles as stream (Stream Surface Bits Command)
...
o silent frame ack logging
o support surface commands in capsets
o fix some wrong constants
2016-12-08 20:12:00 -05:00
metalefty
731d4be670
Merge pull request #521 from proski/xorg-log
...
Change default Xorg logfile to .xorgxrdp.%s.log
2016-12-09 09:45:47 +09:00
metalefty
eec7e39715
Merge pull request #513 from proski/no-setuid
...
Disable privilege elevation by setuid for the X server
2016-12-09 09:44:58 +09:00
Pavel Roskin
9cbf3d1bb8
Change default Xorg logfile to .xorgxrdp.%s.log
...
The log file is created in the home directory, %s is replaced with the
display number (e.g. 10).
If Xorg is run setuid root, it can refuse to run if the log path is
absolute.
2016-12-06 15:10:01 -08:00
Pavel Roskin
04414e0fd4
Disable privilege elevation by setuid for the X server
2016-12-06 15:09:52 -08:00
Itamar Reis Peixoto
8516d6d66b
Merge pull request #528 from proski/xserverbpp
...
Document xserverbpp, add it to Xvnc section, remove from Xorg section
2016-12-06 20:49:35 -02:00
Pavel Roskin
9cfe477f60
Document xserverbpp, add it to Xvnc section, remove from Xorg section
...
xserverbpp affects X11rdp and Xvnc, but not Xorg. No need to have
xserverbpp in the Xorg section where it has no effect. Add commented out
xserverbpp to Xvnc, some users may want to experiment with that setting.
2016-12-06 14:40:38 -08:00
jsorg71
bbae1a98c6
Merge pull request #523 from jsorg71/vpf
...
vnc: change password file to use guid hash
2016-12-06 12:05:23 -08:00
metalefty
191c093190
Merge pull request #526 from proski/pixman
...
Make configure show it's looking for "pixman", not "xrdp_pixman"
2016-12-05 16:25:20 +09:00
Pavel Roskin
c759a1a645
Make configure show it's looking for "pixman", not "xrdp_pixman"
...
The pixman library in not part of xrdp. If users see that "xrdp_pixman"
is not found, they might assume it is some xrdp specific library.
The Automake conditional is still XRDP_PIXMAN, but the pkg-config
variables become PIXMAN_LIBS and PIXMAN_CFLAGS.
2016-12-04 19:38:45 -08:00
Jay Sorg
f14e3dc8ac
sesman: must save guid in session data
2016-12-04 17:20:01 -08:00
Jay Sorg
9a517b34f0
vnc: code cleanup
2016-12-04 15:39:10 -08:00
Jay Sorg
57905d71ad
vnc: change password file to use guid hash
2016-12-03 23:12:48 -08:00
metalefty
42d370fcdd
Merge pull request #518 from proski/randr
...
Provide reasonable hTotal, vTotal and dotClock for the display mode
2016-12-03 20:24:10 +09:00
Pavel Roskin
a40be19c7b
Provide reasonable hTotal, vTotal and dotClock for the display mode
...
gtk3 programs crash when they divide dotClock by hTotal and vTotal to
calculate the refresh rate.
2016-12-02 23:47:37 +00:00
Itamar Reis Peixoto
fb892c7d80
Merge pull request #516 from metalefty/keymaps
...
Adjust Japanese keymaps
2016-12-02 15:22:04 -02:00
Koichiro IWAO
9c31bd5cc4
unify Japanese keymap in xrdp_keyboard.ini
2016-12-02 16:48:23 +09:00
metalefty
943dec86ca
Merge pull request #512 from speidy/devel
...
xrdp_encoder: do not initialize for non-UNIX rdp clients
2016-12-02 15:25:48 +09:00
Itamar Reis Peixoto
857355bfae
Merge pull request #517 from proski/cplusplus
...
Add g++ to the list of compilers for Travis CI
2016-12-02 00:44:23 -02:00
Pavel Roskin
0c8b3911a7
Add g++ to the list of compilers for Travis CI
2016-11-30 22:10:38 -08:00
Itamar Reis Peixoto
24541396a5
Merge pull request #514 from proski/dlopen
...
Find openssl by pkg-config, add -ldl if needed
2016-11-30 07:43:05 -02:00
Koichiro IWAO
b0e20ae188
genkeymap: change Japanese keyboard model to pc105
...
changed in #394 .
2016-11-30 18:39:24 +09:00
Koichiro IWAO
d1dc5b7814
instfiles: unify km-*0411.ini into km-00000411.ini
...
as they're identical and no longer need to duplicate them after
commit 5725200
.
2016-11-30 18:38:41 +09:00
Pavel Roskin
c6307aa2b0
Use pkg-config to discover OpenSSL
...
All supported versions of OpenSSL have pkg-config files.
2016-11-29 17:00:09 -08:00
Pavel Roskin
06f4f72e28
Add -ldl to libcommon link flags if it's needed for dlopen()
2016-11-29 16:25:37 -08:00
speidy
1fe048b63d
xrdp_encoder: do not initialize for non-UNIX rdp clients
...
xrdp_encoder: comment about temporary workaround
2016-11-29 15:25:14 -05:00
Koichiro IWAO
5fbcaf1655
librfxcodec=fb80d7d
2016-11-29 10:26:23 +09:00
metalefty
8b40023801
Merge pull request #509 from proski/sec_level
...
Security level fixes
2016-11-29 09:51:29 +09:00
Pavel Roskin
d3c36b0376
Don't select SSL protocol if no keys, fall back to RDP for "hybrid"
...
If both the client and the server are configured to allow both RDP and
SSL connections, the server is free to choose RDP in absense of the SSL
keys.
2016-11-28 00:18:33 -08:00
Pavel Roskin
d73f20499e
Log the result of the security level negotiation
2016-11-28 00:18:16 -08:00
Pavel Roskin
8069b29429
Recognize security_layer=negotiate in xrdp.ini, improve logging
...
security_layer=negotiate is documented, but the code is complaining
loudly about it. Fix it, make sure not to change the actual behavior
apart from the logging.
Improve the log message for unrecognized security_layer setting.
2016-11-27 23:49:32 -08:00
metalefty
679c4b3558
Merge pull request #502 from proski/fuse1
...
Fix all FUSE warnings and C++ compatibility, add Mac compilation support
2016-11-28 10:14:09 +09:00
Pavel Roskin
e46d15ca84
Fix C++ errors and warnings in FUSE code
2016-11-26 09:17:51 -08:00
Pavel Roskin
2ab321a7c6
Use fuse_ino_t for FUSE inodes, not tui32 or int
2016-11-26 09:17:51 -08:00