Commit Graph

2674 Commits

Author SHA1 Message Date
Jay Sorg
50db3bb983 add pkgconfig xrdp.pc file 2016-11-17 11:57:10 -08:00
Koichiro IWAO
8dac31ca52 CI: remove xorgxrdp 2016-11-17 17:31:20 +09:00
Jay Sorg
bf8bc585b3 remove xorgxrdp submodule 2016-11-16 22:56:00 -08:00
Jay Sorg
2066ea2ff2 remove xorgxrdp submodule 2016-11-16 22:51:34 -08:00
jsorg71
9b778583b2 Merge pull request #492 from metalefty/certs
Do not create SHA-1 certificates anymore
2016-11-16 10:56:13 -08:00
Koichiro IWAO
7196094016 Do not create SHA-1 certificates anymore
as many systems in the world still default to create SHA-1 certs if
hash algorithm is not specified explicitly.
2016-11-16 17:24:26 +09:00
metalefty
9deaa078fc Merge pull request #477 from proski/vnc-strerror
Improve error messages about VNC password file
2016-11-16 17:10:38 +09:00
metalefty
8516e6f97b Merge pull request #476 from proski/auth
Fix compile warnings for non-default authentication methods
2016-11-16 17:08:15 +09:00
metalefty
b89956d06e Merge pull request #485 from proski/code-standards
Code standards
2016-11-16 17:05:21 +09:00
metalefty
d335c93a75 Merge pull request #480 from proski/strncat
Fix potential buffer overflow in strncat() invocation
2016-11-16 17:02:33 +09:00
metalefty
0712cf2747 Merge pull request #483 from proski/autorun
Fix regression in domain to session type mapping
2016-11-16 17:00:23 +09:00
Pavel Roskin
5d2ce60340 Fix regression in domain to session type mapping
If no domain is passed, self->session->client_info->domain is an empty
string that is incorrectly treated as if the domain were passed by the
client.

The regression was introduced in fc753a95, when an incorrect check for
non-empty domain was added. That check was removed in 67119ecc based on
coverity report, leaving no trace of the original intention.

Check domain both for '_' and '\0' as the initial character. In either
case, select the first session type section in xrdp.ini.
2016-11-15 22:42:04 -08:00
Pavel Roskin
35b336272b Fix compilation with C++ 2016-11-15 22:40:06 -08:00
Pavel Roskin
16c3bbdb8d Remove all tabs in sources 2016-11-15 22:40:06 -08:00
Pavel Roskin
e9d064e390 Don't try to create .vnc directory if it exists
Report system error if it cannot be created.
2016-11-15 22:39:22 -08:00
Pavel Roskin
60029514a6 Report system error if the VNC password file cannot be created 2016-11-15 22:39:22 -08:00
Pavel Roskin
e9a0324cb3 Fix compile warnings for non-default authentication methods
Include string.h for strcmp(). Don't define _XOPEN_SOURCE, it conflicts
with libc headers and hides putpwent(). Make input strings constant. Fix
functions to match their declarations.
2016-11-15 22:38:56 -08:00
Pavel Roskin
92423a466e Fix potential buffer overflow in strncat() invocation
strncat() will copy at most the specified number of characters and append
the null character on top of that. strlen() doesn't count the final null
character.
2016-11-15 22:38:21 -08:00
metalefty
fb3545eb65 Merge pull request #490 from proski/param
Omit numbers from the "param" keys, they are not needed
2016-11-16 14:14:32 +09:00
Pavel Roskin
0d72cced46 Omit numbers from the "param" keys, they are not needed
Users assume that they need to renumber the parameters. That makes
parameter editing more involved than it needs to be.
2016-11-15 20:55:03 -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