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

668 Commits

Author SHA1 Message Date
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
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
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
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
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
Pavel Roskin
81779ddb01 Use lowercase program names for syslog 
Other programs typically use the same case as their execulables.
 2016-02-13 18:14:42 -08:00
Pavel Roskin
dcab7552db Stop redefining libdir, use moduledir for ${libdir}/xrdp 
libdir is for shared and static libraries. Some xrdp libraries are loaded
dynamically from a non-standard directory, so they are used like modules.

Having separate libdir and moduledir would eventually allow to separate
dynamically loaded modules from shared libraries.
 2016-02-12 23:52:46 -08:00
Pavel Roskin
ffc4efb9ce Don't ignore files known to git 
That can cause unexpected behavior, especially with third party tools.
The ignored files will be lost if the source tree is re-imported to
another git repository, unless special care is taken.

Whitelist all non-generated makefiles.

To whitelist instfiles/pam.d/xrdp-sesman, add path to all generated
executables listed in the top-level .gitignore, sort .gitignore
alphabetically.

Add mkinstalldir, it's used by Automake on some systems.
 2016-02-12 23:52:46 -08:00
Pavel Roskin
22e808a186 Add missing spaces in the strings that are split for line wrapping 2016-02-12 23:52:45 -08:00
Pavel Roskin
09709d3ced xcon: include unistd.h, it's needed for select() on MacOS 2016-02-12 23:52:45 -08:00
Pavel Roskin
85840863da startwm.sh: make sure sourced scripts are readable 
Strictly speaking, both existence and readability should be checked.
However, chances of ~/.profile being a directory or a FIFO are very small
compared to its chances of being non-readable due to some
misconfiguration.

Put "if" and "then" on the same line for consistency with other checks.
Improve comment and pseudocode formatting.
 2016-02-12 23:52:45 -08:00
Jay Sorg
ac901fd283 sesman: add missing break 2016-02-11 17:52:44 -08:00
Itamar Reis Peixoto
09a69fbec2 remove duplicated call to scp_session_set_bpp 2016-02-11 11:54:43 -02:00
Pavel Roskin
a61349c1d3 Allow sessions with 32 bpp 2016-02-10 09:30:23 -08:00
Pavel Roskin
5d23d007e9 Check return value of scp_session_set_bpp() 2016-02-10 09:30:23 -08:00
Itamar Reis Peixoto
ee436aeec9 Merge pull request #309 from proski/devel 
Fixes for autotools, compile warnings and MacOS compatibility
 2016-02-08 22:37:44 -02:00
Pavel Roskin
5575197eaa sesman: don't set LANG, let initialization scripts take care of it 
Setting LANG to en_US.UTF-8 suppresses language settings from
/etc/locale.conf

See https://bugzilla.redhat.com/show_bug.cgi?id=1290820
 2016-02-07 22:50:14 -08:00
Pavel Roskin
5de1d31a75 Change an unconditional #warning to a comment 
Notes about software design should not be shown as warnings to everybody
who compiles the code. Warnings should be about unexpected conditions
detected at the compile time.
 2016-01-31 23:42:16 -08:00
Pavel Roskin
f1ba2b2c9d xcon: include sys/types.h for select() and related macros 2016-01-31 23:35:40 -08:00
Pavel Roskin
5b0dcfc8fe rail: fix declaration of rail_desktop_resize() 
Arguments without a type default to int. The caller passes a pointer to
XEvent, so use that type.
 2016-01-31 23:35:40 -08:00
Pavel Roskin
986fa94733 clipboard: undefine previously defined log level 2016-01-30 18:01:12 -08:00
Pavel Roskin
02c981e796 More spelling fixes found by codespell and aspell 2016-01-30 17:39:25 -08:00
Pavel Roskin
00e70a5c54 Use standard autotools means to detect X11 
Use AC_PATH_XTRA to search for X11 in configure.ac. In Makefiles, add
X_CFLAGS to AM_CFLAGS for the source compilation. Add X_LIBS to LDFLAGS.
Add X_PRE_LIBS and X_EXTRA_LIBS to LDADD.

With this patch, X Windows system is correctly detected on Mac OS X.
 2016-01-30 17:18:52 -08:00
Pavel Roskin
334eeb970a clipboard_file: include sys/time.h for struct timeval, needed on Mac OS X 2016-01-30 12:32:52 -08:00
Pavel Roskin
a452d8d36a Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGS 
AM_CPPFLAGS is for flags passed to the preprocessor, such as defines and
includes. AM_CFLAGS is for flags affecting the compiler, such as debug
and optimization settings.

INCLUDES is an obsolete name. Users can pass INCLUDES and break
compilation. AM_CPPFLAGS is more explicit that the flags come from
Automake and should not be overridden.
 2016-01-29 22:45:00 -08:00
Pavel Roskin
309fca35ac Don't use a symlink where #include would suffice 
Absolute symlinks break when the source is moved to another location. In
the best case, the symlink will be replaced with a copy, but that creates
code duplication. A user who got the packaged source may decide to change
one config.c without realizing that another config.c will get the same
changes.

Don't ignore config.c, it's a regular source file now, albeit very
short.

Testing done: compiled inside and outside build directory.
 2016-01-26 23:22:05 -08:00
Pavel Roskin
964e860072 Run through codespell 2016-01-14 08:47:50 -08:00
Jay Sorg
ded462ab8e chansrv: fix some warnings 2015-12-29 13:28:15 -08:00
Jay Sorg
8261459707 chansrv: fix a crash in fuse 2015-12-26 17:22:27 -08:00
Jay Sorg
4e0d0f3ba0 sesman: remove the thread 2015-12-11 20:41:17 -08:00
Jan Losinski
844f01b937 Simplify session match logic. 
The session match logic had two versions - one for the
SESMAN_SESSION_TYPE_XRDP and SESMAN_SESSION_TYPE_XORG sessions and one
for every other type. The only difference was, that different display
sizes where ignored when searching for sessions to reconnect if the
policy does not have the SESMAN_CFG_SESS_POLICY_D flag set and the type
is SESMAN_SESSION_TYPE_XRDP or SESMAN_SESSION_TYPE_XORG.

The reason was that xvnc cannot resize and the others can do. This two
versions where not necessary because we set the
SESMAN_CFG_SESS_POLICY_D flag every time we have a xvnc session a few
lines above. So the two branches for the different types can be reduced
to one.

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
 2015-10-25 23:25:19 +01:00
Jay Sorg
6f90e27d80 tabs to spaces, no logic change 2015-10-10 22:16:16 -07:00
Jay Sorg
dcdb617e63 for Xvnc sesman session, use hash of password for vnc auth 2015-10-10 15:44:31 -07:00
Jay Sorg
7889ee638e sesman: close sync and term sockets after fork 2015-09-27 01:26:22 -07:00
mirabilos
57a7f18cb3 add historic GPLv2+ to Simone’s files 
this becomes GPLv3+ when combined with Apache v2 licenced files
 2015-08-26 23:33:00 +02:00
Blindauer Emmanuel
12092e8098 Allow to reconnect with a different size while using the Xorg module 2015-08-19 07:42:00 +02:00
Jay Sorg
d91de3c1cc sesman: remove rfbDes calls 2015-08-18 17:33:13 -07:00
Jay Sorg
870437ac42 sesman: don't use hard code path for Xorg 2015-08-03 19:08:15 -07:00
itamarjp
c5cac75593 add more missing files into extra_dist 2015-07-14 12:16:25 -03:00
itamarjp
960cc62a0e add missing files into extra_dist, 
this is required when using make dist to generate a tarball
 2015-07-14 11:35:33 -03:00
Jay Sorg
6c23b85593 add timeout to trans_get_wait_objs_rw 2015-07-13 01:10:48 -07:00
Koichiro IWAO
67ff276d4d sesman: add copyright noice for code from OpenSSH 2015-06-16 06:10:30 +00:00
Koichiro IWAO
481653e5f3 sesman: merge FreeBSD local patch for session.c 
net/xrdp: effective login name is not set by xrdp-sesman
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=157282
 2015-06-16 05:44:07 +00:00
Koichiro IWAO
53ea01d51e fuse: use EIO instead of EREMOTEIO for BSDs 
FreeBSD/OpenBSD/NetBSD and OS X don't have errno EREMOTEIO.
 2015-03-18 03:18:39 +00:00
jsorg71
f9c848f3ca Merge pull request #225 from metalefty/chansrv-explicit-include 
chansrv: explicit include in chansrv_fuse.c
 2015-03-15 16:43:59 -07:00
Jay Sorg
9e310fbe06 clipboard file paste, don't add new line to last line 2015-03-13 12:58:31 -07:00
Koichiro IWAO
647c72b75b chansrv: explicit include in chansrv_fuse.c 
chansrv_fuse.c includes chansrv_fuse.h even if XRDP_FUSE is not
defined. However, time_t is used in chansrv_fuse.h.  This causes
build failure on FreeBSD.
 2015-03-13 09:15:28 +00:00
jsorg71
4f60b58b17 Merge pull request #212 from robertalks/devel 
fix possible segfault in chansrv if DISPLAY is not set
 2015-03-12 15:36:31 -07:00
Koichiro IWAO
ac9ff52c1b sesman: void function should not return a value 2015-03-12 16:48:20 +00:00
mancha
d432609c2a
sesman: fix so shadow accounts aren't incorrectly classified "inactive" 
as might happen if sp_max/sp_inact fields are empty or sp_lstchg=0.
 2015-02-18 17:32:12 +00:00
Jay Sorg
4dd78c1b8e minor change in opus encoding 2015-01-27 16:32:38 -08:00
Robert Milasan
f59c925f8b fix possible segfault in chansrv if DISPLAY is not set 2015-01-20 13:33:37 +01:00
Jay Sorg
9c5c0660b2 chansrv: reset opus support on init 2015-01-10 00:50:46 -08:00
Jay Sorg
2f5b84b712 chansrv: added opus audio compression for playback 2015-01-09 23:31:28 -08:00
Jay Sorg
bff2009147 chansrv: change to 44100 recording, disconnect / reconnect fixes 2014-11-26 16:48:37 -08:00
Jay Sorg
47de7a67f6 sesman: verify_user_bsd.c license change and indent 2014-11-24 09:23:48 -08:00
Thomas Goddard
22f1ff2f25 Merge pull request #188 from renaudallard/devel 
Enable bsdauth authentication.
 2014-11-23 08:14:56 -08:00
Jay Sorg
cb4f299899 sesman: fix for --enable-nopam 2014-11-22 23:17:00 -08:00
Renaud Allard
803af49a04 Some fixes to compile properly since this version has change a lot from 0.6.1 2014-11-21 15:00:01 +01:00
Renaud Allard
618ca587a5 Enable authenticate user using BSD password system 2014-11-21 14:22:15 +01:00
speidy
c159505980 chansrv: fix for segfault issue in chansrv_common 2014-11-21 03:13:14 +02:00
Jay Sorg
942cdf300e sesman: avoid creation of .vnc directory if not vnc session 2014-11-11 20:06:04 -08:00
Jay Sorg
253f6ff555 sesman: only check vnc auth file if vnc session 2014-11-11 02:12:56 -08:00
Jay Sorg
f41a11d2c4 chansrv: some recording fixes 2014-11-02 22:47:51 -08:00
Jay Sorg
290bafe173 pulse: fix for recording delay 2014-11-02 20:45:14 -08:00
Jay Sorg
851c762ee7 sesman: check for null from crypt() 2014-10-29 17:54:11 -07:00
Jay Sorg
29ebab2ce5 sesman: hand merge #176 from v0.6 branch, indent changes 2014-10-20 13:39:38 -07:00
Laxmikant Rashinkar
a3e017cd58 restart listener when corresponding sound source/sink connections are closed 2014-10-18 11:22:24 -07:00
Laxmikant Rashinkar
122d8bc057 sound redirection: handle fragmented packets 2014-10-12 17:47:35 -07:00
Laxmikant Rashinkar
c0839cd6a5 when closing audio source, don't flush audio data if audio buffer is empty 2014-10-06 19:43:52 -07:00
BLINDAUER Emmanuel
b6eb6d9696 If auth fails, call pam_end so PAM backends can call _cleanup 2014-09-20 09:08:41 +02:00
Jay Sorg
d17c4a78fb chansrv: check for nil 2014-08-13 10:10:04 -07:00
Jay Sorg
9597e90b31 chansrv: allow multiple xrdpapi connections 2014-08-12 23:14:49 -07:00
Jay Sorg
748b48d870 sesman: more checks when looking for a free display 2014-08-06 13:33:12 -07:00
Jay Sorg
8397055e8b move some hard code paths to defines in header 2014-08-06 13:21:01 -07:00
Jay Sorg
e4d054654f pulse sink: check for partial sends 2014-08-06 12:11:59 -07:00
Jay Sorg
2e17b70fcd chansrv: sound_send_wave_data changes 2014-08-06 12:10:27 -07:00
Laxmikant Rashinkar
2363bf8af3 coverity: fixed miscellaneous issues 2014-08-02 11:13:12 -07:00
Laxmikant Rashinkar
162becfe55 coverity: fixed unsigned compare against 0 2014-07-28 18:16:29 -07:00
Laxmikant Rashinkar
e4654b57ca coverity: Resource leak (2nd round) 2014-07-27 15:29:12 -07:00
Laxmikant Rashinkar
a9d7c13147 coverity: read from pointer after free 2014-07-27 14:11:02 -07:00
Laxmikant Rashinkar
5e537ebdfe coverity: explicit null dereferenced 2014-07-27 12:57:13 -07:00
Laxmikant Rashinkar
0311a82c0a coverity: copy into fixed sized buffer 2014-07-27 12:42:12 -07:00
Laxmikant Rashinkar
1c423dadf4 coverity: copy into fixed sized buffer 2014-07-26 16:33:36 -07:00
Laxmikant Rashinkar
0915d33d70 coverity: dead code 2014-07-26 15:06:35 -07:00
Laxmikant Rashinkar
27055d5762 coverity: improper use of negative value 2014-07-26 13:33:23 -07:00
Laxmikant Rashinkar
fde7be5151 coverity: fixed issue argument cannot be negative 2014-07-23 19:07:38 -07:00
Laxmikant Rashinkar
0c63a8feb3 coverity: Dereference after null check 2014-07-20 16:36:33 -07:00
Laxmikant Rashinkar
a990287c46 coverity: fixed unchecked return value from library 2014-07-20 13:14:09 -07:00
Laxmikant Rashinkar
023c0b5bc1 coverity: fixed out of bounds read-write 2014-07-20 11:11:20 -07:00
Laxmikant Rashinkar
73578bc612 coverity: fixed unchecked return value 2014-07-19 13:06:25 -07:00
Laxmikant Rashinkar
3bb31876e7 coverity: fixed resolution leak issues 2014-07-19 11:56:00 -07:00
Jay Sorg
6d3af904d3 sesman: sound.c: no logic change, remove tabs and warning 2014-06-28 09:54:36 -07:00
speidy
cbc8317c6d chansrv: sound: prevent an infinite loop when the connection with pulse audio is closed improperly 2014-06-26 23:02:44 +03:00
Jay Sorg
c8e61a8042 chansrv: more remove simple sound 2014-06-07 20:22:07 -07:00
Jay Sorg
17bbecabd3 chansrv: remove simple sound and load pulse modules 2014-06-07 20:15:14 -07:00
Jay Sorg
944be3afa3 chansrv: some rail fixes from A8 2014-06-03 11:44:25 -07:00
Jay Sorg
d1ca03c9fb pcsc, add hexdump for debugging 2014-05-29 20:59:08 -07:00
Jay Sorg
d5ea23ed48 pcsc smartcard fixes form 64 bit from Ken 2014-05-29 20:45:48 -07:00
Jay Sorg
380c1f6b7d sesman: change from using PULSE_CONFIG to PULSE_SCRIPT 2014-05-10 16:08:58 -07:00
Jay Sorg
49fcc23673 sesman: added SessionVariables to sesman.ini and some indent cleanup 2014-05-09 16:02:19 -07:00
Idan Freiberg
42de994741 Merge pull request #122 from speidy/devel 
Compilation fix for pulse source module + Merge some fixes from master branch
 2014-04-28 07:07:40 +03:00
speidy
eda3a2db65 chansrv: sound: zero out ack flags when sound_send_close called, to 
avoid deadloop when chunk is sent and not acked back by the client.
 2014-04-28 00:24:20 +03:00
speidy
d7b49762fa pulseaudio: let module-xrdp-source compile on CentOS6 (PA 0.9.21) 2014-04-22 05:16:15 +03:00
speidy
e17d2375ea Merge branch 'master' of https://github.com/neutrinolabs/xrdp into devel 2014-04-22 04:23:49 +03:00
Jay Sorg
e65c237503 pulse: fix for build with pulseaudio 4.0+ 2014-04-21 00:38:08 -07:00
Jay Sorg
1934c9ea00 sesman: more options for session lookup from Fredy Paquet 2014-04-20 00:42:19 -07:00
Jay Sorg
03a5914609 chansrv: make fuse mount directory configurable 
Conflicts:

	sesman/sesman.ini
 2014-04-19 17:14:34 -07:00
jsorg71
4f4a7a8c8c Merge pull request #102 from bartw72/lock-on-add 
Set lock when adding new displays to the chain
 2014-04-17 22:07:50 -07:00
speidy
5f7a4b46fb sesman: indentation fix 2014-03-22 16:07:06 +02:00
speidy
8566230442 sesman: do reconnect to an exisitng Xorg session 2014-03-22 13:36:33 +02:00
Jay Sorg
261d35eaac misc fixes for Xorg and compile 2014-03-14 12:23:12 -07:00
Jay Sorg
c34ba69ad8 sesman: add -nolisten tcp to the ini file for Xorg 2014-03-12 23:48:16 -07:00
Laxmikant Rashinkar
6e85223a8a xorg driver module: we now access xorg driver module from /usr/lib/xorg 2014-03-09 15:50:16 -07:00
Laxmikant Rashinkar
ac6717e32e fixed some connection issues when using xorg driver mode 2014-03-09 11:24:30 -07:00
Laxmikant Rashinkar
883650700f added support for using Xorg driver model 2014-03-08 16:41:37 -08:00
Laxmikant Rashinkar
47071be4d4 simplesound: fixed CHANSRV_PORT_STR undefined error 2014-03-01 15:03:59 -08:00
Laxmikant Rashinkar
e7445a2544 o default login limit is now 50 users (instead of 10) 
o we now wait for 30 seconds for session connection (instead of 1)
o if AUTO_LOGON flag is set but username is null, we force login dialog to show up
 2014-02-28 19:28:31 -08:00
Laxmikant Rashinkar
221b049ca5 clean up temp files in /tmp/.xrdp 2014-02-24 19:49:10 -08:00
Laxmikant Rashinkar
c8e36aa91e Merge branch 'devel' of github.com:/neutrinolabs/xrdp into devel 2014-01-31 19:58:03 -08:00
Laxmikant Rashinkar
b205654e78 bringup RAIL only when we receive a RAIL command 2014-01-31 19:57:52 -08:00
Jay Sorg
f14986ec59 chansrv: fix for audio falling behind and growing memory 2014-01-29 11:04:50 -08:00
Laxmikant Rashinkar
33e6c7a834 pulseaudio: fixed some build issues 2014-01-17 19:40:13 -08:00
Laxmikant Rashinkar
82b7ccae96 we now load module-xrdp-sink/source automatically so user's dont have to mess around with configuring /etc/pulse/default.pa config file 2014-01-12 12:09:15 -08:00
Laxmikant Rashinkar
43b7b84182 missed some files for microphone redirection using rdesktop 2014-01-07 19:50:20 -08:00
Laxmikant Rashinkar
f0560e1467 added support for microphone redirection using rdesktop 2014-01-07 19:47:57 -08:00
Jay Sorg
9f8d369747 chansrv: smartcard, fix for SCardControl, SCardTransmit 2013-12-30 13:41:38 -08:00
Jay Sorg
2aa92fd6a8 chansrv: minor change in child_signal_handler 2013-12-30 13:38:40 -08:00
Jay Sorg
3e521a5298 chansrv: pcsc, fix for g_rgSCard* structs and added some debug logging 2013-12-28 19:52:47 -08:00
Jay Sorg
052153274b chansrv: mstsc SCardConnect fixes 2013-12-24 11:16:57 -08:00
Jay Sorg
38eba8aac1 chansrv: work on smartcard, mstsc and 64 bit client 2013-12-23 00:07:24 -08:00
Jay Sorg
1483c75911 chansrv: work on smartcard stability, handle multi threaded calls, app crashes, etc 2013-12-21 19:16:08 -08:00
Jay Sorg
b34cbe8a3e chansrv: got \?PnP?\Notification working, handle pcsc exit without cleanup 2013-12-19 14:05:35 -08:00
Jay Sorg
aec48211d5 chansrv: disable rail for now 2013-12-16 20:16:15 -08:00
Bart Warmerdam
6318d8ef0f Set lock when adding new displays to the chain 2013-12-16 13:52:50 +01:00
Jay Sorg
cd2eca5573 chansrv: some minor smartcard changes 2013-12-11 13:29:15 -08:00
Jay Sorg
e118463ebc chansrv: winscard.dll wrapper, fix missing GetProcAddress and added some more logging 2013-12-11 03:47:52 -08:00
Jay Sorg
3069922500 chansrv: work on smartcard 2013-12-11 03:22:00 -08:00
Jay Sorg
e85e4634c7 chansrv: added winscard.dll wrapper 2013-12-09 22:22:32 -08:00
Jay Sorg
ef51e44119 chansrv: handle smartcard session reconnect and some logging changes 2013-12-07 17:57:35 -08:00
Jay Sorg
16deb72678 chansrv: support drdynvc v3 along with v2 2013-12-07 17:52:54 -08:00
Jay Sorg
8d00fed35c chansrv: added some dumps for reference only 2013-12-05 02:52:03 -08:00
Jay Sorg
de9fa3d5fa chansrv: smartcard, more work on support for MSTSC 2013-12-05 02:22:41 -08:00
Jay Sorg
f265c14499 chansrv: smartcard, work on getting MSTSC working 2013-12-04 15:40:55 -08:00
Jay Sorg
50962fadcd chansrv: fix some warning 2013-12-04 15:34:38 -08:00
Jay Sorg
97537587a8 chansrv: remove g_sent, not needed anymore 2013-12-04 15:33:06 -08:00
Jay Sorg
1955e59a02 chansrv: fix for getstatuschange 2013-11-30 14:32:14 -08:00
Jay Sorg
3d4fbb883a chansrv: work on getting MSTSC smartcard working 2013-11-29 21:28:13 -08:00