summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile applewmproto before xorg-serverPavel Roskin2017-01-171-1/+1
| | | | xorg-server can use applewmproto if it's available.
* Use fonts installed as part of X11rdpPavel Roskin2017-01-171-1/+1
|
* Fix Mesa compatibility with clangPavel Roskin2017-01-171-0/+11
|
* Make sure X11rdp is not copied to a file called "bin"Pavel Roskin2017-01-171-1/+1
| | | | | It can happen if buildx.sh is run with one argument and them with another without removing build_dir in between.
* Use OPENSSL_CFLAGS even if -lcrypto is used directlyPavel Roskin2017-01-171-0/+10
| | | | | OpenSSL headers are used even when the full set of OpenSSL libraries is not used.
* Don't define RDP_IS_XORG and RDP_IS_XFREE86, they are unusedPavel Roskin2017-01-171-14/+0
|
* Remove missing directories from the include path for X11rdpPavel Roskin2017-01-171-8/+0
|
* Fix pixmap compilation with clangPavel Roskin2017-01-171-0/+11
| | | | | | | | 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.
* Fix libpciaccess compilation on non-Linux systemsPavel Roskin2017-01-171-0/+24
| | | Both gcc and clang have __builtin_bswap16 and __builtin_bswap32.
* Fix download caching, only download missing or currently empty filesPavel Roskin2017-01-171-3/+11
|
* Merge pull request #628 from metalefty/kill_disconnectedmetalefty2017-01-181-1/+0
|\ | | | | x11rdp: respect disconnect timeout set by XRDP_SESMAN_MAX_DISC_TIME
| * x11rdp: respect disconnect timeout set by XRDP_SESMAN_MAX_DISC_TIMEKoichiro IWAO2017-01-161-1/+0
| | | | | | | | | | The old code overwrites disconnect timeout to 60 sec when XRDP_SESMAN_KILL_DISCONNECT is set to truthy value.
* | Merge pull request #426 from metalefty/log-tls-version-and-cipherIdan Freiberg2017-01-165-4/+49
|\ \ | |/ |/| TLS: log TLS version and cipher
| * TLS: log client port in addition to ssl protocol and cipherKoichiro IWAO2017-01-131-3/+5
| |
| * obey coding standard, no logic changeKoichiro IWAO2017-01-121-2/+2
| |
| * log non TLS sessionKoichiro IWAO2016-11-221-0/+8
| |
| * TLS: log TLS version and cipherKoichiro IWAO2016-11-225-4/+39
| |
* | Merge pull request #605 from proski/pamconfigIdan Freiberg2017-01-159-24/+82
|\ \ | | | | | | Allow PAM file selection in configure, improve autodetection, add SUSE
| * | Allow PAM file selection in configure, improve autodetection, add SUSEPavel Roskin2017-01-159-24/+82
|/ / | | | | | | Use easy to understand names for config files (debian, redhat, suse, unix). Move all autodetection to a separate script.
* | Merge pull request #619 from neutrinolabs/masterIdan Freiberg2017-01-151-3/+4
|\ \ | | | | | | Merge master into devel
| * \ Merge branch 'devel' of https://github.com/neutrinolabs/xrdpspeidy2016-12-22296-9803/+16121
| |\ \ | | | | | | | | | | | | | | | | Conflicts: xorgxrdp
| * | | xorgxrdp=68412e5Jay Sorg2016-03-021-0/+0
| | | |
| * | | add keyboard options to xrdp_client_infoJay Sorg2016-03-021-0/+1
| | | |
| * | | update xorgxrdpJay Sorg2016-01-041-0/+0
| | | |
| * | | Merge branch 'devel'Jay Sorg2015-01-07120-14596/+4476
| |\ \ \
| * \ \ \ Merge branch 'devel'Jay Sorg2014-11-2615-348/+495
| |\ \ \ \
| * \ \ \ \ Merge branch 'devel'Jay Sorg2014-11-13128-966/+3648
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #144 from seabres/pambranchjsorg712014-11-081-3/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Change to allow authentication against all authentication methods.
| | * | | | | | Change to allow authentication against all authentication methods.seabres2014-06-041-3/+4
| | | | | | | |
| * | | | | | | Merge branch 'devel'Laxmikant Rashinkar2014-10-11153-3807/+11770
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #161 from anthonyagresta/patch-1Idan Freiberg2014-08-051-1/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | man page, add details for crypt_level=fips
| | * | | | | | | Add details for crypt_level=fips to man pageanthonyagresta2014-08-041-1/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #140 from ajaissle/patch-1jsorg712014-05-291-14/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update faq-compile.txt
| | * | | | | | | Update faq-compile.txtAeneas Jaißle2014-05-291-14/+24
| |/ / / / / / /
| * | | | | | | neutrinordp: minor changes, coding style, log levelJay Sorg2014-05-192-14/+16
| | | | | | | |
| * | | | | | | Merge pull request #127 from ArvidNorr/numlockjsorg712014-05-192-4/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Numlock out of sync fix
| | * | | | | | | Numlock out of sync fixArvidNorr2014-05-162-4/+23
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:neutrinolabs/xrdpJay Sorg2014-05-173-3/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge branch 'master' of github.com:neutrinolabs/xrdpJay Sorg2014-03-09178-3286/+14128
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:neutrinolabs/xrdpJay Sorg2014-01-273-3/+3
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge pull request #615 from speidy/channels_fixesIdan Freiberg2017-01-155-9/+18
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Channels improvements
| * | | | | | | | | | | libxrdp: use log_messagespeidy2017-01-151-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | libxrdp: libxrdp_send_to_channel, improve error messagespeidy2017-01-061-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | libxrdp: channels, respect xrdp.ini channel blocking also for dataspeidy2017-01-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coming in from chansrv
| * | | | | | | | | | | libxrdp: ignore incoming channels with empty namesspeidy2017-01-061-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | libxrdp: change channel_code into a meaningful namespeidy2017-01-063-6/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #578 from proski/warningsmetalefty2017-01-135-18/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Warning fixes
| * | | | | | | | | | | | Don't log device_data_len in the code where it may be uninitializedPavel Roskin2017-01-111-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log device_data_len only in the code that reads it.
| * | | | | | | | | | | | Remove redundant function declarationsPavel Roskin2017-01-113-13/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove send_channel_data() from devredir.h, it's declared in chansrv.hPavel Roskin2017-01-112-2/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include "chansrv.h" from devredir.c to have send_channel_data() declaration.