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

2614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Sorg
5e398e0c91 multimon fix 2016-04-20 18:11:47 -07:00
Jay Sorg
473f3dcd0c X11rdp: merge multimon from Xorg driver 2016-04-19 15:34:45 -07:00
jsorg71
00a11f77ce Merge pull request #359 from metalefty/sesman/configurable-xserver-path 
sesman: do not hardcode Xorg/X11rdp/Xvnc executables
 2016-04-18 13:29:15 -07:00
jsorg71
6c21aca50b Merge pull request #361 from metalefty/do-not-attempt-to-trap-sigkill 
Do not attempt to trap SIGKILL part 2
 2016-04-17 17:40:43 -07:00
laigor
59be4134c3 Allows use the xkb options that for example allows you to specify a key combination to change the layouts. 
Example of xrdp_keyboard.ini for russian keyboard

[default_rdp_layouts]
rdp_layout_us=0x00000409
rdp_layout_de=0x00000407
rdp_layout_fr=0x0000040C
rdp_layout_it=0x00000410
rdp_layout_jp=0x00000411
rdp_layout_jp2=0xe0010411
rdp_layout_jp3=0xe0200411
rdp_layout_jp4=0xe0210411
rdp_layout_ru=0x00000419
rdp_layout_se=0x0000041D
rdp_layout_pt=0x00000816
rdp_layout_br=0x00000416
rdp_layout_pl=0x00000415

[rdp_keyboard_ru]
keyboard_type=4
keyboard_subtype=1
model=pc105
options=grp:alt_shift_toggle
rdp_layouts=default_rdp_layouts
layouts_map=layouts_map_ru

[layouts_map_ru]
rdp_layout_us=us,ru
rdp_layout_ru=us,ru
 2016-04-14 22:35:56 +03:00
Koichiro IWAO
f7858e964d Remove trailing whitespace, no logic change 2016-04-11 16:46:49 +09:00
Koichiro IWAO
cfdce461c3 Do not attempt to trap SIGKILL part 2 
it doesn't work on any OS.
 2016-04-11 16:43:12 +09:00
Jay Sorg
87208db090 fix warnings 2016-04-09 22:10:12 -07:00
Jay Sorg
dbf6bcc8be remove some warnings 2016-04-09 19:26:27 -07:00
Jay Sorg
6a692c96cf remove some warnings 2016-04-09 19:17:05 -07:00
Koichiro IWAO
cf2b629462 sesman: do not hardcode Xorg/X11rdp/Xvnc executables 
In RHEL and its clones, /usr/bin/Xorg is set suid-root. To execute
Xorg with user privileges, /etc/pam.d/xserver needs be edited [1],
or suid bit of Xorg binary needs to be dropped.

In order to keep Xorg and /etc/pam.d/xserver untouched, preparing
non-suid version of Xorg as /usr/bin/Xorg.non-suid for example is
the simplest solution. However, Xorg.non-suid cannot be executed
since it is hardcoded to execute Xorg in sesman.

This change makes more flexible to execute Xorg with non-standard
name or not in PATH environment variable.

[1] https://www.centos.org/forums/viewtopic.php?t=21185
 2016-04-07 18:34:43 +09:00
Koichiro IWAO
fb08623b66 sesman: brief xorg_params, no logic change 2016-04-07 16:27:23 +09:00
Jay Sorg
0655272b9c common: call recv/send before can_recv/can_send 2016-04-06 16:37:34 -07:00
Jay Sorg
bd6c38af4d common: fix warnings 2016-04-02 16:49:23 -07:00
jsorg71
75d79e0e3c Merge pull request #353 from nerdknight/devel 
Fix compile error "format not a string literal and no format arguments [-Werror=format-security]"
 2016-04-02 16:11:59 -07:00
NerdKnight
99ebe1340f Fix compile error "format not a string literal and no format arguments [-Werror=format-security]" 2016-03-28 14:55:20 -03:00
jsorg71
034ee36f9c Merge pull request #341 from proski/sanity-checks 
Sanity checks
 2016-03-16 20:51:58 -07:00
Itamar Reis Peixoto
6b3fc5a373 Merge pull request #347 from metalefty/typo 
fix typo xrdp-sessman -> xrdp-sessvc
 2016-03-16 23:40:44 -04:00
Jay Sorg
a6cba63a89 fix a warning 2016-03-16 14:40:24 -07:00
Jay Sorg
689ffe79d9 fix warnings, move some calls to os_calls 2016-03-16 14:32:14 -07:00
Koichiro IWAO
ff4ec98412 fix typo xrdp-sessman -> xrdp-sessvc 2016-03-15 18:25:52 +09:00
Jay Sorg
38241f2a0b Fix all format warnings and some unused variable warnings 2016-03-14 17:04:08 -07:00
Jay Sorg
7393579205 Don't attempt to intercept SIGKILL, it doesn't work on any OS 2016-03-14 16:33:49 -07:00
Pavel Roskin
9091c3eef2 Annotate printf-like functions if supported by the compiler 
Both GCC and Clang support it. Add a macro from Autoconf archive to check
for format attribute support.
 2016-03-03 22:56:09 -08:00
Pavel Roskin
4da6f8a538 Enable -Wall flag for compilers that support it 
Add Autoconf archive macros to check for -Wall and its dependencies.
Adjust m4/.gitignore to only ignore libtool macros.

Require Autoconf 2.65 for compatibility with Autoconf archive macros.
 2016-03-03 22:56:09 -08:00
Pavel Roskin
e0a9c769e0 Be more specific in error messages about PID file location 2016-03-03 22:56:09 -08:00
Pavel Roskin
3eb495f425 Check if rsakeys.ini exists on startup, exit if it's missing 2016-03-03 22:56:08 -08:00
Pavel Roskin
86ec50789c Move all sanity checks to a separate function xrdp_sanity_check() 2016-03-03 22:56:08 -08:00
Jay Sorg
cdb967c0f3 xorgxrdp=a0add6c 2016-03-02 01:21:39 -08:00
Jay Sorg
5af0d06d1e keygen: default 2048 bit RSA key 2016-02-24 14:10:46 -08:00
Itamar Reis Peixoto
cfbb00c6cb Merge pull request #333 from proski/key-install 
Key install (generate rsakeys.ini during make install)
 2016-02-24 06:38:02 -05:00
jsorg71
f53b3bb737 Merge pull request #326 from metalefty/pulseaudio-6.0 
pulse: fix build pulseaudio 6.0 or higher
 2016-02-23 23:19:59 -08:00
Pavel Roskin
b63575cebc Create and install rsakeys.ini 
Use install-data-hook to ensure restrictive permissions on rsakeys.ini.

Don't create rsakeys.ini in init scripts. This makes xrdp functional upon
"make install" without relying on the init scripts.

Packagers should not package rsakeys.ini, it should be created when the
package is installed.
 2016-02-23 22:33:28 -08:00
Koichiro IWAO
9460bdb643 common: no logic change, indent 2 -> 4 2016-02-23 18:26:42 +09:00
Koichiro IWAO
d01854a341 common: no logic change, fix alignment, whitespaces 2016-02-23 18:26:41 +09:00
Koichiro IWAO
1ed7dbec53 common: add log for g_tcp_connect 
in case getaddrinfo(3) might fail.

In FreeBSD, AI_V4MAPPED support for getaddrinfo(3) was very recently
implemented[1].  Most of FreeBSD systems in the world do not have
this implementation yet.  This will be a problem when AI_V4MAPPED
isn't supported and xrdp is built with IPv6 option.  In such a case,
g_tcp_connect always fails.

Of course getaddrinfo(3) might fail in other cases.  The log helps
us to know what's happening.

[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198092
 2016-02-23 18:18:28 +09:00
Pavel Roskin
22e6f3e2f7 Use SCRIPTS for executable scripts, don't use "chmod 755" 2016-02-22 23:13:16 -08:00
Pavel Roskin
7642675ddf Use "dist_" prefix to minimize use of EXTRA_DIST 
"dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
 2016-02-22 22:11:57 -08:00
Jay Sorg
f100036cd9 common: minor fix for older openssl keygen 2016-02-22 11:48:54 -08:00
Jay Sorg
3bc9f1e275 Merge branch 'devel' of git:neutrinolabs/xrdp into devel 2016-02-22 11:40:28 -08:00
Jay Sorg
0d192aee62 common: fix for key generated smaller than asked for 2016-02-22 11:38:03 -08:00
Itamar Reis Peixoto
f1dd912218 Merge pull request #330 from proski/automake 
More makefile cleanup
 2016-02-22 07:45:12 -05:00
Pavel Roskin
59a5fb0ddb Move headers from EXTRA_DIST to sources, sort alphabetically 
There should be no functional difference.
 2016-02-21 23:06:48 -08:00
Pavel Roskin
3ad28e1130 Add m4 directory to EXTRA_DIST, not all Automake versions package it 2016-02-21 21:31:02 -08:00
Koichiro IWAO
93f7bcb71b pulse: fix build pulseaudio 6.0 or higher 
Discovered in #321.  The number of argument for pa_rtpoll_run have
been changed since 6.0.

>=6.0 : int pa_rtpoll_run(pa_rtpoll *f);
<6.0  : int pa_rtpoll_run(pa_rtpoll *f, bool wait);

Check pulseaudio version by PA_CHECK_VERSION macro introduced since
pulseaudio 0.9.16.  In case PA_CHECK_VERSION is not defined,
pa_rtpoll_run takes 2 arguments.
 2016-02-18 00:45:33 +09:00
Itamar Reis Peixoto
3934be9320 Merge pull request #320 from proski/sesadmin 
Make sesadmin useful, another round of typo hunting
 2016-02-15 06:59:39 -02:00
Pavel Roskin
50cbf01044 xrdp-sesadmin: show help and exit if mandatory arguments are not given 
Don't mark password as mandatory, it's asked if not provided on the
command line.
 2016-02-14 10:27:17 -08:00
Pavel Roskin
92a6833e9b Fix typos 2016-02-13 20:41:07 -08:00
Pavel Roskin
afa6ec97cc Install the most appropriate PAM settings file 
Installing a file referring to common-auth is of no use if that file
doesn't exit.

Don't use "password" entry, xrdp doesn't ever change user password.
 2016-02-13 18:44:28 -08:00
Pavel Roskin
fe055e989a Fix connection month display in xrdp-sesadmin 
tm_mon in `struct tm` uses 0 for January.

`struct session_data` and `struct SCP_DISCONNECTED_SESSION` don't specify
how dates are stored. But considering the code in sestest and sesadmin,
all date components are stored as displayed.
 2016-02-13 18:31:47 -08:00