summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| * Fix C++ errors and warnings in FUSE codePavel Roskin2016-11-261-29/+44
| |
| * Use fuse_ino_t for FUSE inodes, not tui32 or intPavel Roskin2016-11-261-27/+27
| |
| * Remove write-only FileId variablePavel Roskin2016-11-261-2/+0
| |
| * Cast pointer to uint64_t through tintptr to avoid warningsPavel Roskin2016-11-261-4/+4
| | | | | | Cast to long would damage a pointer on Win64.
| * Use constant strings to fix warningsPavel Roskin2016-11-263-13/+15
| |
| * Call devredir_cvt_slash() on the path copy, it changes the argumentPavel Roskin2016-11-261-5/+6
| |
| * Disable or remove dead code to prevent it from throwing warningsPavel Roskin2016-11-261-11/+12
| |
| * Include needed files in chansrv_fuse.c, remove duplicate declarationsPavel Roskin2016-11-262-18/+10
| |
| * Fix misuse of NULL for arithmetic typePavel Roskin2016-11-261-1/+1
| |
| * Use FUSE_CFLAGS and FUSE_LIBS from pkg-configPavel Roskin2016-11-262-4/+3
|/ | | | | | | Include <fuse_lowlevel.h>, not <fuse/fuse_lowlevel.h>, the include path should be set up for that. Don't define _FILE_OFFSET_BITS in one file, FUSE_CFLAGS would enable it for the whole xrdp-chansrv build if needed.
* Merge pull request #461 from metalefty/ipv6/fallback-to-ipv4metalefty2016-11-241-0/+16
|\ | | | | common: If IPv6 not supported, fall back to IPv4
| * common: If IPv6 not supported, fall back to IPv4Koichiro IWAO2016-11-221-0/+16
| | | | | | | | | | | | | | The system to run xrdp does not necessarily support IPv6 even though it is compiled with IPv6. Fixes #432.
* | Merge pull request #503 from proski/jpegmetalefty2016-11-241-9/+9
|\ \ | | | | | | Fix pointer sign warnings in jpeg and TurboJPEG code
| * | Fix pointer sign warnings in TurboJPEG compression codePavel Roskin2016-11-221-2/+2
| | |
| * | Fix pointer sign warnings in JPEG compression codePavel Roskin2016-11-221-7/+7
|/ /
* | Merge pull request #504 from proski/no-acItamar Reis Peixoto2016-11-221-3/+0
|\ \ | |/ |/| Remove "-ac" from X server parameters, it's insecure and unnecessary
| * Remove "-ac" from X server parameters, it's insecure and unnecessaryPavel Roskin2016-11-211-3/+0
|/ | | | | Fedora patches sesman.ini to remove "-ac", and that doesn't cause any ill effects.
* Merge pull request #491 from proski/fuse-formatmetalefty2016-11-221-74/+75
|\ | | | | Fix format warnings if FUSE is enabled
| * Fix format warnings if FUSE is enabledPavel Roskin2016-11-211-74/+75
|/
* Merge pull request #499 from proski/pkgconfigItamar Reis Peixoto2016-11-212-2/+276
|\ | | | | Use PKG_INSTALLDIR to determine pkg-config file install location
| * Use PKG_INSTALLDIR to determine pkg-config file install locationPavel Roskin2016-11-202-2/+276
|/ | | | | | | The PKG_INSTALLDIR macro also enables --with-pkgconfigdir for easy overrides. PKG_INSTALLDIR is relatively new, it appeared in pkg-config 0.27. To ensure we have a recent pkg.m4 copy, copy pkg.m4 to the m4 directory.
* Merge pull request #460 from metalefty/ipv6/logsItamar Reis Peixoto2016-11-201-29/+104
|\ | | | | common: Fix client IP address logging when IPv6 is enabled
| * common: Address family it not always AF_INET6Koichiro IWAO2016-11-041-36/+84
| | | | | | | | even if XRDP_ENABLE_IPV6 defined.
| * common: Fix client IP address logging when IPv6 is enabledKoichiro IWAO2016-11-041-25/+52
| | | | | | | | | | | | | | | | g_tcp_accept() and g_sck_accept() should use sockadd_in6 when IPv6 is enabled. The former code logs client IP address always "0.0.0.0" in such case. Fixes #412.
* | xrdp: do case insensitive compare for section namesJay Sorg2016-11-191-3/+3
| |
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-09 18:21:36 +0000