Commit Graph

2655 Commits

Author SHA1 Message Date
Pavel Roskin
16c3bbdb8d Remove all tabs in sources 2016-11-15 22:40:06 -08:00
Idan Freiberg
e8185caf31 Merge pull request #489 from metalefty/travis-ci
CI: add .travis.yml
2016-11-15 19:20:34 +02:00
Koichiro IWAO
7cb37d8941 CI: add .travis.yml
tests xrdp, librfxcodec, xorgxrdp, x11rdp in master, devel and other topic branches.
2016-11-15 18:02:53 +09:00
Itamar Reis Peixoto
ad62e52f28 Merge pull request #487 from proski/x11rdp
X11rdp build system fixes
2016-11-13 20:46:48 -02:00
Pavel Roskin
5bb54122ba Strip the installed X11rdp binary, not the original 2016-11-13 09:14:58 -08:00
Pavel Roskin
cd6e8faccc Reorder static libraries to avoid the need to link them twice 2016-11-13 09:09:32 -08:00
Pavel Roskin
d93bb4cf4b Check that X11RDPBASE is set, give it a better description
Use BINBASE for the binary install path.
2016-11-13 09:04:54 -08:00
Jay Sorg
4f33a9db1d change xrdp.ini security_layer=negotiate and auto generate tls keys on make install 2016-11-11 22:55:21 -08:00
Jay Sorg
da9439f24d libxrdp: warn when using 512 bit key 2016-11-11 22:29:54 -08:00
Jay Sorg
e39f567c35 on make install, don't create rsakeys.ini if it already exists 2016-11-11 21:47:19 -08:00
jsorg71
46e1173bd9 Merge pull request #479 from proski/strerror
Use g_get_strerror() instead of strerror(errno) for portability
2016-11-09 15:26:28 -08:00
Pavel Roskin
2dcc69b752 Use g_get_strerror() instead of strerror(errno) for portability 2016-11-08 14:08:51 -08:00
metalefty
d7fd153951 Merge pull request #418 from metalefty/keymap-fallback-lower-16bit
Use km-0000yyyy.ini if km-xxxxyyyy.ini doen't exist
2016-11-08 15:12:51 +09:00
metalefty
8da1829981 Merge pull request #478 from proski/install-headers
Install headers used by X11rdp and xorgxrdp
2016-11-07 15:46:20 +09:00
Pavel Roskin
1fe368c5b3 Install headers used by X11rdp and xorgxrdp
Installing the headers makes it possible to compile xorgxrdp as a
separate package, without xrdp sources.
2016-11-06 22:36:13 -08:00
metalefty
94901c9989 Merge pull request #454 from metalefty/change-chansrv-log-path
chansrv: change chansrv log path to ${XDG_DATA_HOME}/xrdp
2016-11-07 09:56:31 +09:00
Koichiro IWAO
5725200e82 Use km-0000yyyy.ini if km-xxxxyyyy.ini doen't exist
upper 16 bits of keylayout value indicates keyboard layout.
lower 16 bits of keylayout value indicates country/language.

If the keymap file doesn't match exactly to keylayout value,
the typical keyboard of the country/language should be used.

For example [1]:
  0x00000409: US English
  0x00010409: US Dvorak
  0x00020409: US International
  0x00030409: US Dvorak for left hand
  0x00040409: US Dvorak for right hang
  0x0000040e: Hungarian
  0x0001040e: Hungarian 101-key

[1] https://msdn.microsoft.com/windows/hardware/commercialize/manufacture/desktop/windows-language-pack-default-values
2016-11-04 17:25:02 +09:00
Itamar Reis Peixoto
7c516d7d07 Merge pull request #473 from metalefty/add-finnish-keyboard
add Finnish keyboard
2016-11-02 16:39:23 -02:00
Koichiro IWAO
cab8955ea4 add Finnish keyboard
Closes #70
2016-11-02 14:49:47 +09:00
Itamar Reis Peixoto
f94920171e Merge pull request #437 from metalefty/switch-to-8-hex-digit-keymap-file
Switch to 8 hex digit keymapfile
2016-11-02 01:14:19 -02:00
metalefty
c6df12b558 Merge pull request #470 from proski/xorg-ini
Simplify names of xrdp.ini sections, rename "Session Manager" to "Xorg"
2016-11-02 11:38:09 +09:00
Pavel Roskin
61811466e2 Simplify names of xrdp.ini sections, rename "Session Manager" to "Xorg"
Make section names equal to the names in the "name=" setting to avoid
confusion and the need to renumber sections. Avoid "sesman-" in the
names, it's not helpful to the user. Move "Xorg" just below "X11rdp",
that would give xorgxrdp more visibility.
2016-11-01 13:38:42 -07:00
Itamar Reis Peixoto
0d1cf12677 Merge pull request #472 from proski/ssl
Use static inline functions for OpenSSL 1.0 backport
2016-11-01 16:51:36 -02:00
Pavel Roskin
4324084d58 Use static inline functions for OpenSSL 1.0 backport
Conditional preprocessor directives spread throughout the code set a bad
example.

The new backport code is located in one place. The compiler checks
argument types. The backport code has no access to the caller variables.
The main code has all advantages of the new, more compact API.
2016-11-01 11:09:15 -07:00
metalefty
cde340350c Merge pull request #459 from Natureshadow/openssl110
Fix ssl_calls for OpenSSL 1.1.0
2016-11-01 16:09:48 +09:00
metalefty
0a8afd17ea Merge pull request #463 from Natureshadow/config-patches
Move -logfile /dev/null option for easier commenting in debug scenarios.
2016-10-29 14:43:11 +09:00
Dominik George
c90bc13d39
Move -logfile /dev/null option for easier commenting in debug scenarios. 2016-10-28 16:45:05 +02:00
Jay Sorg
8fad88a457 librfxcodec=2a90952 2016-10-27 13:57:25 -07:00
Dominik George
e5cf45d1ac
Add backwards compatibility to OpenSSL < 1.1.0. 2016-10-27 22:40:48 +02:00
Dominik George
1b5fb8f1c8
Fix ssl_calls for OpenSSL 1.1.0, closes #458. 2016-10-27 21:56:22 +02:00
metalefty
c524b062dd Merge pull request #451 from metalefty/buildx-keepalive-download
buildx.sh: download tarballs using keepalive
2016-10-27 17:08:04 +09:00
Koichiro IWAO
2016065a40 docs: update chansrv log path 2016-10-25 15:52:46 +09:00
Koichiro IWAO
7d017482f6 chansrv: change chansrv log path to ${XDG_DATA_HOME}/xrdp
like Xorg's logfile is written to ${XDG_DATA_HOME}/xorg/Xorg.n.log.

If XDG_DATA_HOME is not defined, the log path will be
${HOME}/.local/share/xrdp.
2016-10-25 14:52:43 +09:00
metalefty
34378ea386 Merge pull request #450 from proski/memleak
Fixing memory leaks
2016-10-24 23:10:45 +09:00
Koichiro IWAO
f62b55c547 switch newly added keymaps to 8 hex digit 2016-10-24 15:21:14 +09:00
Koichiro IWAO
042c33a11c Switch the remaining 4 hex digit keymapfile to 8 hex 2016-10-24 15:19:23 +09:00
Koichiro IWAO
c654c86206 Switch to 8 hex digit keymapfile
as the value keyboardLayout is actually 32-bit unsigned integer.
See [MS-RDPBCGR] - v20160714 p.45.
2016-10-24 15:19:23 +09:00
metalefty
b79ad54bd3 Merge pull request #453 from itamarjp/devel
Add es_ES layout support #88
2016-10-24 09:34:02 +09:00
Pavel Roskin
b28a986071 Fix memory leak in xrdp-sesman on config reload 2016-10-21 20:15:50 +00:00
Pavel Roskin
dc60a80b86 Memory leak fix: keep X server path in the parameter list
g_cfg->xorg_params, g_cfg->vnc_params and g_cfg->rdp_params don't have
auto_free enabled, so removing an item from one of those lists won't free
its contents.

It's better not to change those lists, as they represent the actual
config file and could be reused. Instead, omit the 0th parameter (the
executable path) from copying to xserver_params.

Found by Valgrind.
2016-10-21 20:15:50 +00:00
Pavel Roskin
e17a56efb6 Call auth_end() exactly once in scp_v0_process()
As discovered by Valgrind, it wasn't called at all in case of a
successful session creation, which leaked memory.
2016-10-21 20:15:50 +00:00
Pavel Roskin
65ac8e758b Fix memory leak: free session data
Call scp_session_destroy() in the functions that call
scp_session_create() and nowhere else.

As found by Valgrind, the session data is not freed if the session is
created successfully.
2016-10-21 20:15:50 +00:00
Itamar Reis Peixoto
8bf28e45c4 Merge pull request #445 from proski/noextra
Avoid using non-standard Automake variables starting with "EXTRA"
2016-10-21 16:55:55 -02:00
Itamar Reis Peixoto
d4f350758b add km-040a.ini keyboard 2016-10-21 16:33:57 -02:00
Itamar Reis Peixoto
b70f372a87 add keymap-names.txt 2016-10-21 16:30:06 -02:00
Koichiro IWAO
6b589569ee buildx.sh: download tarballs using keepalive
Executing wget like

  wget http://example.com/file1 http://example.com/file2 ...

can do HTTP keepalive.

Quit calling wget with single file. Downloading multiple files in one
http connection is a little bit faster than executing wget more than
100 times. And parallelly execute two instances of wget to increase
download speed.
2016-10-21 17:14:48 +09:00
Koichiro IWAO
cf1a99b4e2 buildx.sh: simplify counting lines 2016-10-21 17:11:10 +09:00
Pavel Roskin
a370306f75 Get rid of EXTRA_LIBS, use variables with more specific names 2016-10-20 10:43:02 -07:00
Pavel Roskin
5c69f3cd57 Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS 2016-10-20 10:43:02 -07:00
Pavel Roskin
0422734fc7 Merge EXTRA_DEFINES and EXTRA_INCLUDES into AM_CPPFLAGS
AM_CPPFLAGS is a documented Automake variable for C preprocessor flags
that should not be overridden when compiling the package.

There is no need to have two additional variables that are ultimately
merged into AM_CPPFLAGS.

Their names are also confusing. EXTDA_DIST is a documented Automake
variable. Everything else that starts with "EXTRA" is not.
2016-10-20 10:43:02 -07:00