Commit Graph

652 Commits (e7433ec69c98d194fbd0e2723b692cf72e3a7a9f)

Author SHA1 Message Date
Pavel Roskin aaa89ad4e6 Use const unsigned for hex arrays
Some constants are too big for the signed type.
9 years ago
Pavel Roskin aeeb3d2c2e Fix warnings detected by -Wwrite-strings 9 years ago
Pavel Roskin 951e632757 Make program_name constant, don't duplicate or free it 9 years ago
Pavel Roskin b00ca6e03d Remove commented out config_read_logging(), the code is long dead 9 years ago
Pavel Roskin 1ded8ec437 Remove unused string support in scp_session_set_addr()
Using the same argument for binary and text data is not a good idea. If
string support is ever needed, it should be a separate function.

Remove SCP_ADDRESS_TYPE_IPV4_BIN and SCP_ADDRESS_TYPE_IPV6_BIN, use
SCP_ADDRESS_TYPE_IPV4 and SCP_ADDRESS_TYPE_IPV6, which simplifies the
code.
9 years ago
Pavel Roskin f908528a00 Downgrade "libscp initialized" to LOG_LEVEL_DEBUG, remove line number
It's a bad style to start the log with a cryptic warning.
9 years ago
Pavel Roskin f7ef9bb938 Fix scp_init() invocation, it takes no arguments 9 years ago
Pavel Roskin 77b380c0b5 Fix format warnings in log_message() calls 9 years ago
Pavel Roskin be1d034f91 Report pid and listening address/port for xrdp and xrdp-sesman
For xrdp-sesman, don't report that the daemon is listening to a port if
it fails to attach to that port. Don't use LOG_LEVEL_ALWAYS for startup
message, it's not a critical error.
9 years ago
Pavel Roskin a77ae440a7 Rename SESMAN_CFG_X11DISPLAYOFFSET to SESMAN_CFG_SESS_X11DISPLAYOFFSET
Move it to other session options in config.h. X11DisplayOffset is part of
the [Sessions] section.
9 years ago
Pavel Roskin ae5bb5bf9c Fix incorrect use of "it's" and "its", adjust wording 9 years ago
Koichiro IWAO c0ac8251f7 sesman: Add /sbin to PATH for FreeBSD
to enable to execute FUSE mount program.

The place of FUSE mount programs are:

FreeBSD   : /sbin/mount_fusefs
GNU/Linux : /bin/fusermount

See also #387.
9 years ago
Pavel Roskin 1403652c72 Remove unused variable in devredir_cvt_from_unicode_len() 9 years ago
Pavel Roskin f2d326cbed Remove unused variables from dev_redir_proc_query_dir_response() 9 years ago
Pavel Roskin 0dd0426e6f Check XGetWindowProperty() return code in clipboard_event_property_notify() 9 years ago
Pavel Roskin 72019d3611 Use better symbols to protect include files 9 years ago
Pavel Roskin ca9cbcafc8 Typo fixes 9 years ago
jsorg71 fdb146740f Merge pull request #360 from proski/format-warnings
Warning fixes
9 years ago
Pavel Roskin f93074a430 Add unnamed semaphore support on Mac OS
sem_init() is not functional on Mac OS. Use the Grand Central Dispatch
implementation.

Make libscp_lock.c use semaphores through the thread_calls wrapper.
9 years ago
Pavel Roskin 70f3d4c5e2 Fix warnings for unused variables read from byte streams 9 years ago
Pavel Roskin 95e1603f9d Fix recently introduced warnings in session.c
Use of tabs is fixed as well.
9 years ago
Pavel Roskin 0629b25d5f Fix warnings about unused variables and functions 9 years ago
Pavel Roskin e65bd6b7d7 Fix more format warnings 9 years ago
jsorg71 00a11f77ce Merge pull request #359 from metalefty/sesman/configurable-xserver-path
sesman: do not hardcode Xorg/X11rdp/Xvnc executables
9 years ago
Koichiro IWAO cfdce461c3 Do not attempt to trap SIGKILL part 2
it doesn't work on any OS.
9 years ago
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
9 years ago
Koichiro IWAO fb08623b66 sesman: brief xorg_params, no logic change 9 years ago
NerdKnight 99ebe1340f Fix compile error "format not a string literal and no format arguments [-Werror=format-security]" 9 years ago
Jay Sorg a6cba63a89 fix a warning 9 years ago
Jay Sorg 689ffe79d9 fix warnings, move some calls to os_calls 9 years ago
Jay Sorg 38241f2a0b Fix all format warnings and some unused variable warnings 9 years ago
Jay Sorg 7393579205 Don't attempt to intercept SIGKILL, it doesn't work on any OS 9 years ago
Itamar Reis Peixoto cfbb00c6cb Merge pull request #333 from proski/key-install
Key install (generate rsakeys.ini during make install)
9 years ago
jsorg71 f53b3bb737 Merge pull request #326 from metalefty/pulseaudio-6.0
pulse: fix build pulseaudio 6.0 or higher
9 years ago
Pavel Roskin 22e6f3e2f7 Use SCRIPTS for executable scripts, don't use "chmod 755" 9 years ago
Pavel Roskin 7642675ddf Use "dist_" prefix to minimize use of EXTRA_DIST
"dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
9 years ago
Pavel Roskin 59a5fb0ddb Move headers from EXTRA_DIST to sources, sort alphabetically
There should be no functional difference.
9 years ago
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.
9 years ago
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.
9 years ago
Pavel Roskin 92a6833e9b Fix typos 9 years ago
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.
9 years ago
Pavel Roskin 81779ddb01 Use lowercase program names for syslog
Other programs typically use the same case as their execulables.
9 years ago
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.
9 years ago
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.
9 years ago
Pavel Roskin 22e808a186 Add missing spaces in the strings that are split for line wrapping 9 years ago
Pavel Roskin 09709d3ced xcon: include unistd.h, it's needed for select() on MacOS 9 years ago
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.
9 years ago
Jay Sorg ac901fd283 sesman: add missing break 9 years ago
Itamar Reis Peixoto 09a69fbec2 remove duplicated call to scp_session_set_bpp 9 years ago
Pavel Roskin a61349c1d3 Allow sessions with 32 bpp 9 years ago
Pavel Roskin 5d23d007e9 Check return value of scp_session_set_bpp() 9 years ago
Itamar Reis Peixoto ee436aeec9 Merge pull request #309 from proski/devel
Fixes for autotools, compile warnings and MacOS compatibility
9 years ago
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
9 years ago
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.
9 years ago
Pavel Roskin f1ba2b2c9d xcon: include sys/types.h for select() and related macros 9 years ago
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.
9 years ago
Pavel Roskin 986fa94733 clipboard: undefine previously defined log level 9 years ago
Pavel Roskin 02c981e796 More spelling fixes found by codespell and aspell 9 years ago
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.
9 years ago
Pavel Roskin 334eeb970a clipboard_file: include sys/time.h for struct timeval, needed on Mac OS X 9 years ago
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.
9 years ago
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.
9 years ago
Pavel Roskin 964e860072 Run through codespell 9 years ago
Jay Sorg ded462ab8e chansrv: fix some warnings 9 years ago
Jay Sorg 8261459707 chansrv: fix a crash in fuse 9 years ago
Jay Sorg 4e0d0f3ba0 sesman: remove the thread 9 years ago
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>
9 years ago
Jay Sorg 6f90e27d80 tabs to spaces, no logic change 9 years ago
Jay Sorg dcdb617e63 for Xvnc sesman session, use hash of password for vnc auth 9 years ago
Jay Sorg 7889ee638e sesman: close sync and term sockets after fork 10 years ago
mirabilos 57a7f18cb3 add historic GPLv2+ to Simone’s files
this becomes GPLv3+ when combined with Apache v2 licenced files
10 years ago
Blindauer Emmanuel 12092e8098 Allow to reconnect with a different size while using the Xorg module 10 years ago
Jay Sorg d91de3c1cc sesman: remove rfbDes calls 10 years ago
Jay Sorg 870437ac42 sesman: don't use hard code path for Xorg 10 years ago
itamarjp c5cac75593 add more missing files into extra_dist 10 years ago
itamarjp 960cc62a0e add missing files into extra_dist,
this is required when using make dist to generate a tarball
10 years ago
Jay Sorg 6c23b85593 add timeout to trans_get_wait_objs_rw 10 years ago
Koichiro IWAO 67ff276d4d sesman: add copyright noice for code from OpenSSH 10 years ago
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
10 years ago
Koichiro IWAO 53ea01d51e fuse: use EIO instead of EREMOTEIO for BSDs
FreeBSD/OpenBSD/NetBSD and OS X don't have errno EREMOTEIO.
10 years ago
jsorg71 f9c848f3ca Merge pull request #225 from metalefty/chansrv-explicit-include
chansrv: explicit include in chansrv_fuse.c
10 years ago
Jay Sorg 9e310fbe06 clipboard file paste, don't add new line to last line 10 years ago
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.
10 years ago
jsorg71 4f60b58b17 Merge pull request #212 from robertalks/devel
fix possible segfault in chansrv if DISPLAY is not set
10 years ago
Koichiro IWAO ac9ff52c1b sesman: void function should not return a value 10 years ago
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.
10 years ago
Jay Sorg 4dd78c1b8e minor change in opus encoding 10 years ago
Robert Milasan f59c925f8b fix possible segfault in chansrv if DISPLAY is not set 10 years ago
Jay Sorg 9c5c0660b2 chansrv: reset opus support on init 10 years ago
Jay Sorg 2f5b84b712 chansrv: added opus audio compression for playback 10 years ago
Jay Sorg bff2009147 chansrv: change to 44100 recording, disconnect / reconnect fixes 10 years ago
Jay Sorg 47de7a67f6 sesman: verify_user_bsd.c license change and indent 10 years ago
Thomas Goddard 22f1ff2f25 Merge pull request #188 from renaudallard/devel
Enable bsdauth authentication.
10 years ago
Jay Sorg cb4f299899 sesman: fix for --enable-nopam 10 years ago
Renaud Allard 803af49a04 Some fixes to compile properly since this version has change a lot from 0.6.1 10 years ago
Renaud Allard 618ca587a5 Enable authenticate user using BSD password system 10 years ago
speidy c159505980 chansrv: fix for segfault issue in chansrv_common 10 years ago
Jay Sorg 942cdf300e sesman: avoid creation of .vnc directory if not vnc session 10 years ago
Jay Sorg 253f6ff555 sesman: only check vnc auth file if vnc session 10 years ago
Jay Sorg f41a11d2c4 chansrv: some recording fixes 10 years ago