mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,912 Commits 9 Branches 44 Tags 20 MiB
8ee886a5cc
Commit Graph

2912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pavel Roskin
f622a17c75 Remove write-only FileId variable 2016-11-26 09:17:51 -08:00
Pavel Roskin
46f4025372 Cast pointer to uint64_t through tintptr to avoid warnings 
Cast to long would damage a pointer on Win64.
 2016-11-26 09:17:51 -08:00
Pavel Roskin
e92c4f3b40 Use constant strings to fix warnings 2016-11-26 09:17:51 -08:00
Pavel Roskin
662172012b Call devredir_cvt_slash() on the path copy, it changes the argument 2016-11-26 09:17:51 -08:00
Pavel Roskin
a4e3952d65 Disable or remove dead code to prevent it from throwing warnings 2016-11-26 09:17:51 -08:00
Pavel Roskin
a547cc3784 Include needed files in chansrv_fuse.c, remove duplicate declarations 2016-11-26 09:17:51 -08:00
Pavel Roskin
bf39fed6e4 Fix misuse of NULL for arithmetic type 2016-11-26 09:17:51 -08:00
Pavel Roskin
4234ed278e Use FUSE_CFLAGS and FUSE_LIBS from pkg-config 
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.
 2016-11-26 09:17:51 -08:00
metalefty
589b29f92f Merge pull request #461 from metalefty/ipv6/fallback-to-ipv4 
common: If IPv6 not supported, fall back to IPv4
 2016-11-24 17:01:18 +09:00
metalefty
44149ef8a3 Merge pull request #503 from proski/jpeg 
Fix pointer sign warnings in jpeg and TurboJPEG code
 2016-11-24 16:13:55 +09:00
Pavel Roskin
077e3f5bfc Fix pointer sign warnings in TurboJPEG compression code 2016-11-22 08:34:45 -08:00
Pavel Roskin
e7433ec69c Fix pointer sign warnings in JPEG compression code 2016-11-22 08:34:45 -08:00
Itamar Reis Peixoto
fbf7168270 Merge pull request #504 from proski/no-ac 
Remove "-ac" from X server parameters, it's insecure and unnecessary
 2016-11-22 13:18:19 -02:00
Koichiro IWAO
849a8075c5 common: If IPv6 not supported, fall back to IPv4 
The system to run xrdp does not necessarily support IPv6 even though
it is compiled with IPv6.

Fixes #432.
 2016-11-22 16:40:54 +09:00
Pavel Roskin
15c4c47811 Remove "-ac" from X server parameters, it's insecure and unnecessary 
Fedora patches sesman.ini to remove "-ac", and that doesn't cause any ill
effects.
 2016-11-21 22:37:41 -08:00
metalefty
a59645d3c5 Merge pull request #491 from proski/fuse-format 
Fix format warnings if FUSE is enabled
 2016-11-22 09:10:02 +09:00
Pavel Roskin
7fce469cbc Fix format warnings if FUSE is enabled 2016-11-21 17:51:20 +00:00
Itamar Reis Peixoto
6138462d52 Merge pull request #499 from proski/pkgconfig 
Use PKG_INSTALLDIR to determine pkg-config file install location
 2016-11-21 09:39:10 -02:00
Pavel Roskin
3ffdcfe02d Use PKG_INSTALLDIR to determine pkg-config file install location 
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.
 2016-11-20 21:58:31 -08:00
Itamar Reis Peixoto
7cc1dd2ba8 Merge pull request #460 from metalefty/ipv6/logs 
common: Fix client IP address logging when IPv6 is enabled
 2016-11-20 16:00:26 -02:00
Jay Sorg
e8308d58b3 xrdp: do case insensitive compare for section names 2016-11-19 07:44:28 +00:00
Jay Sorg
25fd585d55 chansrv: some fixes to log file path 2016-11-19 07:31:36 +00:00
Itamar Reis Peixoto
ab69b8501d Merge pull request #496 from proski/pkgconfig 
Fix for xrdp-uninstalled.pc and addition of pkgconfig/.gitignore
 2016-11-18 21:46:43 -02:00
Pavel Roskin
5afc5bd8b3 Fix include path in xrdp-uninstalled.pc.in 
${pcfiledir} refers to the directory of the package-config file. For an
xrdp build in the source tree, the correct include location would be
${pcfiledir}/../common, not ${pcfiledir}/common

For xrdp build outside the source tree, there is no way to find the
source tree without help from the configure script.

While the '${pc_top_builddir}/${pcfiledir}' pattern is still widespread,
many packages (e.g. gstreamer) are switching to @abs_top_srcdir@ and
@abs_top_builddir@, which are always absolute and have knowledge about
the source tree location from the configure script.

Use @abs_top_srcdir@ for the headers. @abs_top_builddir@ is not needed,
as xrdp produces no externally consumable libraries or generated
headers.
 2016-11-18 23:42:26 +00:00
Pavel Roskin
42d639f30d Add pkgconfig/.gitignore 2016-11-18 23:41:30 +00:00
Itamar Reis Peixoto
c83c736073 Merge pull request #495 from proski/distcheck 
Add "make distcheck" to travis checks
 2016-11-18 18:55:50 -02:00