Commit Graph

139 Commits

Author SHA1 Message Date
jsorg71
8353baab3d Merge pull request #390 from proski/june21
Cleanups and C++ compatibility
2016-08-05 14:38:41 -07:00
speidy
c9b55e3691 sesman: env_set_user, fix potential bof issues 2016-07-22 04:48:37 -04:00
Pavel Roskin
c5ca0332be Use cast when applying boolean OR to enum 2016-07-08 04:29:51 +00:00
Pavel Roskin
5829323ad8 Use g_new or g_new0 when C++ compiler would complain about implicit cast 2016-07-08 04:29:49 +00:00
Pavel Roskin
77b380c0b5 Fix format warnings in log_message() calls 2016-06-21 16:30:16 -07:00
Pavel Roskin
95e1603f9d Fix recently introduced warnings in session.c
Use of tabs is fixed as well.
2016-04-21 23:03:40 -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
Jay Sorg
689ffe79d9 fix warnings, move some calls to os_calls 2016-03-16 14:32:14 -07: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
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
7889ee638e sesman: close sync and term sockets after fork 2015-09-27 01:26:22 -07: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
870437ac42 sesman: don't use hard code path for Xorg 2015-08-03 19:08:15 -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
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
748b48d870 sesman: more checks when looking for a free display 2014-08-06 13:33:12 -07:00
Laxmikant Rashinkar
27055d5762 coverity: improper use of negative value 2014-07-26 13:33:23 -07:00
Laxmikant Rashinkar
3bb31876e7 coverity: fixed resolution leak issues 2014-07-19 11:56:00 -07:00
Jay Sorg
49fcc23673 sesman: added SessionVariables to sesman.ini and some indent cleanup 2014-05-09 16:02:19 -07:00
speidy
e17d2375ea Merge branch 'master' of https://github.com/neutrinolabs/xrdp into devel 2014-04-22 04:23:49 +03:00
Jay Sorg
1934c9ea00 sesman: more options for session lookup from Fredy Paquet 2014-04-20 00:42:19 -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
Laxmikant Rashinkar
883650700f added support for using Xorg driver model 2014-03-08 16:41:37 -08:00
Laxmikant Rashinkar
221b049ca5 clean up temp files in /tmp/.xrdp 2014-02-24 19:49:10 -08:00
Bart Warmerdam
6318d8ef0f Set lock when adding new displays to the chain 2013-12-16 13:52:50 +01:00
Jay Sorg
538763e144 sesman: Fedora bug 821569 2013-10-01 10:42:00 -07:00
Jay Sorg
069838f355 hook up the kill disconnect timeout to the sesman config file 2013-08-24 17:57:00 -07:00
Jay Sorg
c6fa03102f copyright year update 2013-06-08 10:51:53 -07:00
Jay Sorg
62a4403dd4 sesman: cleanup, close xrdp to sesman socket listener when starting a session / forking 2013-05-28 11:54:44 -07:00
Jay Sorg
75f4c3ca58 sesman: cleanup, close xrdp to sesman socket when starting a session / forking 2013-05-28 10:44:04 -07:00
Laxmikant Rashinkar
1123323fda o moved from GNU General Public License to Apache License, Version 2.0
o applied new coding standards to all .c files
o moved some files around
2012-09-19 20:51:34 -07:00
Jay Sorg
10e283ed16 sesman: run sessvc and chansrv as user, not root 2012-07-22 22:48:38 -07:00
Jay Sorg
d8b8ca93b0 sesman: exit after fork if reconnectwm.sh does not exist 2012-07-16 13:25:34 -07:00
Jay Sorg
a246fd582d sesman: added option to run reconnectwm.sh on session reconnect 2012-07-16 13:20:26 -07:00
Jay Sorg
856783ba95 no logic changes, remove warnings and coding style changes 2012-06-10 23:47:08 -07:00
norrarvid
4d4ebbf363 Initial syslog support in XRDP 2012-05-27 17:17:39 +02:00
Jay Sorg
3ada04b8ca X11rdp needs bpp to match to reconnect / resize 2011-08-24 21:34:24 -07:00
Jay Sorg
4c603d9855 X11rdp can resize sessions now 2011-08-23 19:27:12 -07:00
Jay Sorg
4f88bf83c1 fixes for bell function 2010-11-18 21:05:32 -08:00
Nicola Ruggero
3ba752e7b7 Removed dead code re-introduced erroneously in commit 4cf06dbbcb 2010-11-04 16:22:33 +01:00
Nicola Ruggero
d797b2cf49 Implemented client IP logging 2010-11-04 12:14:03 +01:00
Nicola Ruggero
4cf06dbbcb Major code cleanup:
- Initialized and zeroed out local variables
- Check for some null pointers
- Fixed some typos
- Other minor changes (beautify, etc.)
2010-11-03 16:59:26 +01:00
Nicola Ruggero
36ef046e3c Improved logging. Patch by aaron 2010-10-26 12:24:57 +02:00
jsorg71
e83b4c43f5 added X11DisplayOffset sesman option 2010-04-24 06:41:55 +00:00
jsorg71
abba73f9bc fix for session persistence 2010-03-15 20:27:41 +00:00
jsorg71
00ec87700b remove some dead code 2009-12-26 23:05:17 +00:00
jsorg71
328649af9b g_thread_sck set outside of lock fix and g_cfg should always be a pointer to a struct 2009-09-28 01:16:07 +00:00
jsorg71
52af655800 use type when looking for a session 2009-09-06 01:57:05 +00:00
jsorg71
32292b5353 wait for xserver to start 2009-08-27 02:16:34 +00:00
jsorg71
df8527b251 pass domain, program, and directory to sesman and use directory and program 2009-08-19 07:27:35 +00:00
jsorg71
9922d2aef6 added x_server_running_check_ports 2009-08-06 19:01:09 +00:00
jsorg71
c85e32446c login changes when looking for available display 2009-08-06 06:13:52 +00:00
jsorg71
c6b9952fa2 work on chansrv 2009-04-20 04:31:24 +00:00
jsorg71
a71ca6bc1f only the main thread forks 2009-01-12 06:43:58 +00:00
jsorg71
6f169002ed improve the wait for the x server to start 2008-12-29 04:24:51 +00:00
jsorg71
b768e8fb5d remove unset_signals 2008-11-10 01:50:04 +00:00
ilsimo
7c79298612 added first management code
added a rough management tool
fixes in session.c
2008-09-11 20:23:15 +00:00
ilsimo
d14b076a70 still more work on logging
libscp makefile fix
2008-07-30 10:58:30 +00:00
jsorg71
ef69b94717 align and use XRDP_SBIN_PATH 2008-05-06 10:41:22 +00:00
ilsimo
4c9d3862e5 updating logging subsystem 2008-02-20 22:02:24 +00:00
jsorg71
cd57d1b689 update copyright year 2008-01-30 07:53:57 +00:00
ilsimo
a3202aea6a fix for sesman not checking username when returning disconnected session list 2007-11-12 12:40:41 +00:00
ilsimo
f06f9591bc fixing sessvc starting code and removing SESMAN_SESSVC_FILE definition 2007-09-17 15:28:51 +00:00
ilsimo
f22b5b42a7 making libscp a real library
some fixes in configuration options
2007-05-06 21:02:25 +00:00
ilsimo
4175d2d8be adding more logging after various exec() 2007-04-15 20:40:12 +00:00
ilsimo
9c4b9f8390 added sessvc as session supervisor
first code for password changing
2007-04-07 16:20:08 +00:00
jsorg71
96fd0b8a00 indent 2007-02-01 06:43:06 +00:00
jsorg71
6886ba4556 copyright year update 2007-01-12 05:07:07 +00:00
ilsimo
dd76b40a35 some fixes for libscp 2006-11-05 13:11:20 +00:00
jsorg71
7cdd7191a4 added ability to put extra Xserver parameters in sesman.ini 2006-09-18 04:40:43 +00:00
jsorg71
68e30a5e19 change Xrdp to X11rdp to avoid confusion 2006-08-25 05:25:57 +00:00
jsorg71
2b054f9757 added -ac to Xserver start params 2006-08-14 05:09:58 +00:00
ilsimo
fda836169e making sesman multithread 2006-07-13 20:15:21 +00:00
ilsimo
013ab3c61f updated code documentation 2006-05-25 20:34:32 +00:00
jsorg71
b1b3ff9e7d year update and moved some stuff to os_calls.c 2006-04-23 21:54:12 +00:00
jsorg71
37c764bdbb opps, its 60xx, not 61xx for Xserver tcp ports 2006-02-12 00:34:19 +00:00
jsorg71
cdba972be2 more checking to see if the Xserver display is available 2006-02-12 00:17:56 +00:00
ilsimo
ec7498b5f9 added nicer support for Xrdp
fixed some errors in Makefiles when installing
2006-02-09 18:01:41 +00:00
jsorg71
285a1139c1 check for lock file too when checking for X server running 2006-02-05 19:09:44 +00:00
jsorg71
59fc01e215 temp hack for starting Xrdp 2006-02-05 05:46:48 +00:00
ilsimo
153b59ad84 new session list code
added support for new [sessions] configuration options
2006-01-13 15:51:23 +00:00
ilsimo
e7dbdea767 Adding logging functions and adding log options in config files 2005-10-23 21:47:17 +00:00
ilsimo
c2fda67a1c Adding auth.h env.c env.h session.c session.h tcp.c tcp.h 2005-10-06 19:27:38 +00:00