summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use https for librfxcodec referencePavel Roskin2016-12-141-1/+1
| | | | | | | The git protocol is so limited that GitHub doesn't show it when selecting "Clone of download". It may be blocked by strict firewalls, whereas https would work almost certainly. Pushing code is not allowed over git protocol, but it's possible over https with a tocken.
* Merge pull request #543 from westporch/develItamar Reis Peixoto2016-12-143-0/+1061
|\ | | | | Add Korean keymap
| * Sort alphabeticallyWestporch2016-12-141-3/+3
| |
| * Sort alphabeticallyWestporch2016-12-141-2/+2
| |
| * Add Korean keymapWestporch2016-12-141-1/+2
| |
| * Add 'rdp_layout_kr=kr'Westporch2016-12-141-0/+3
| |
| * Add Korean keymapWestporch2016-12-141-0/+1057
|/
* Merge pull request #536 from jsorg71/unicodejsorg712016-12-114-14/+113
|\ | | | | add unicode support
| * change some magics to definesJay Sorg2016-12-103-20/+29
| |
| * use defines for flagsJay Sorg2016-12-101-9/+2
| |
| * add unicode supportJay Sorg2016-12-104-7/+104
| |
* | Merge pull request #535 from speidy/rfx_detectionmetalefty2016-12-112-18/+9
|\ \ | | | | | | Fix for RemoteFX detection, avoid blank screen when RFX is not supported on server
| * | o caps: advertise remotefx codec capsets only when supported (RFX mode,speidy2016-12-102-18/+9
| |/ | | | | | | | | | | proxy mode) o xrdp_encoder: do not initialze encoder context for RFX when rfxcodec is not supported
* | Merge pull request #529 from proski/vnc32Itamar Reis Peixoto2016-12-111-1/+1
|\ \ | | | | | | Fix support for 32-bpp clients connecting to 16-bpp VNC
| * | Fix support for 32-bpp clients connecting to 16-bpp VNCPavel Roskin2016-12-091-1/+1
| |/
* | Merge pull request #533 from proski/ipv6Itamar Reis Peixoto2016-12-111-1/+1
|\ \ | |/ |/| Don't use colon to separate IPv6 address from the port
| * Don't use colon to separate IPv6 address from the portPavel Roskin2016-12-091-1/+1
|/ | | | | IPv6 addresses can have colons in their names, so the final colon can be confusing.
* Merge pull request #532 from metalefty/freebsd/sessionmetalefty2016-12-091-2/+2
|\ | | | | sesman: unbreak FreeBSD build after #523
| * sesman: unbreak FreeBSD build after #523Koichiro IWAO2016-12-091-2/+2
|/
* Merge pull request #521 from proski/xorg-logmetalefty2016-12-091-1/+1
|\ | | | | Change default Xorg logfile to .xorgxrdp.%s.log
| * Change default Xorg logfile to .xorgxrdp.%s.logPavel Roskin2016-12-061-1/+1
| | | | | | | | | | | | | | | | 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.
* | Merge pull request #513 from proski/no-setuidmetalefty2016-12-092-0/+30
|\ \ | |/ |/| Disable privilege elevation by setuid for the X server
| * Disable privilege elevation by setuid for the X serverPavel Roskin2016-12-062-0/+30
|/
* Merge pull request #528 from proski/xserverbppItamar Reis Peixoto2016-12-062-1/+7
|\ | | | | Document xserverbpp, add it to Xvnc section, remove from Xorg section
| * Document xserverbpp, add it to Xvnc section, remove from Xorg sectionPavel Roskin2016-12-062-1/+7
|/ | | | | | 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.
* Merge pull request #523 from jsorg71/vpfjsorg712016-12-0614-85/+167
|\ | | | | vnc: change password file to use guid hash
| * sesman: must save guid in session dataJay Sorg2016-12-043-1/+3
| |
| * vnc: code cleanupJay Sorg2016-12-045-24/+35
| |
| * vnc: change password file to use guid hashJay Sorg2016-12-0312-84/+153
| |
* | Merge pull request #526 from proski/pixmanmetalefty2016-12-052-3/+3
|\ \ | |/ |/| Make configure show it's looking for "pixman", not "xrdp_pixman"
| * Make configure show it's looking for "pixman", not "xrdp_pixman"Pavel Roskin2016-12-042-3/+3
|/ | | | | | | | 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.
* Merge pull request #518 from proski/randrmetalefty2016-12-031-0/+4
|\ | | | | Provide reasonable hTotal, vTotal and dotClock for the display mode
| * Provide reasonable hTotal, vTotal and dotClock for the display modePavel Roskin2016-12-021-0/+4
|/ | | | | gtk3 programs crash when they divide dotClock by hTotal and vTotal to calculate the refresh rate.
* Merge pull request #516 from metalefty/keymapsItamar Reis Peixoto2016-12-026-3182/+2
|\ | | | | Adjust Japanese keymaps
| * unify Japanese keymap in xrdp_keyboard.iniKoichiro IWAO2016-12-021-9/+0
| |
| * genkeymap: change Japanese keyboard model to pc105Koichiro IWAO2016-11-301-1/+1
| | | | | | | | changed in #394.
| * instfiles: unify km-*0411.ini into km-00000411.iniKoichiro IWAO2016-11-305-3172/+1
| | | | | | | | | | as they're identical and no longer need to duplicate them after commit 5725200.
* | Merge pull request #512 from speidy/develmetalefty2016-12-024-35/+50
|\ \ | | | | | | xrdp_encoder: do not initialize for non-UNIX rdp clients
| * | xrdp_encoder: do not initialize for non-UNIX rdp clientsspeidy2016-11-294-35/+50
| |/ | | | | | | xrdp_encoder: comment about temporary workaround
* | Merge pull request #517 from proski/cplusplusItamar Reis Peixoto2016-12-021-0/+1
|\ \ | | | | | | Add g++ to the list of compilers for Travis CI
| * | Add g++ to the list of compilers for Travis CIPavel Roskin2016-11-301-0/+1
|/ /
* | Merge pull request #514 from proski/dlopenItamar Reis Peixoto2016-11-302-6/+13
|\ \ | |/ |/| Find openssl by pkg-config, add -ldl if needed
| * Use pkg-config to discover OpenSSLPavel Roskin2016-11-292-5/+5
| | | | | | All supported versions of OpenSSL have pkg-config files.
| * Add -ldl to libcommon link flags if it's needed for dlopen()Pavel Roskin2016-11-292-1/+8
|/
* librfxcodec=fb80d7dKoichiro IWAO2016-11-291-0/+0
|
* Merge pull request #509 from proski/sec_levelmetalefty2016-11-292-5/+13
|\ | | | | Security level fixes
| * Don't select SSL protocol if no keys, fall back to RDP for "hybrid"Pavel Roskin2016-11-281-1/+3
| | | | | | | | | | 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.
| * Log the result of the security level negotiationPavel Roskin2016-11-281-2/+3
| |
| * Recognize security_layer=negotiate in xrdp.ini, improve loggingPavel Roskin2016-11-271-2/+7
|/ | | | | | | 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.
* Merge pull request #502 from proski/fuse1metalefty2016-11-284-113/+121
|\ | | | | Fix all FUSE warnings and C++ compatibility, add Mac compilation support