Commit Graph

2585 Commits

Author SHA1 Message Date
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
eacfb00050 Declare xrdp_mm_frame_ack() in xrdp.h, it's used in xrdp_wm.c 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
f8cb1588ef Replace "charactor" with "character" everywhere 2016-01-30 17:33:04 -08:00
Pavel Roskin
5d9dae24c5 xrdpapi: fix MacOS compilation - use SO_NOSIGPIPE instead of MSG_NOSIGNAL 2016-01-30 17:19:09 -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
noldor
1fb706c0fc update japanese keyboard "Henkan_Mode" key and "Muhenkan" key 2016-01-30 21:35:20 +09:00
Pavel Roskin
4d4289d93c Disable systemd support for "make distcheck"
"make distcheck" sets prefix to a user-owned directory, compiles code and
runs "make install". That fails if systemd files need to be installed, as
their location if not relative to the prefix.
2016-01-29 23:43:49 -08:00
Pavel Roskin
12cd2f6a1d Don't touch any files in bootstrap
configure.ac already exists. Its timestamp doesn't need to be updated.
autoreconf takes care of the timestamps.

Since "foreign" is used in Makefile.am, no standard GNU files are
required. Distributing empty files like README could be disappointing for
the users.
2016-01-29 23:43:49 -08:00
Pavel Roskin
2694fa9dac Create the m4 directory for Autoconf macro files
Keeping separate files is more maintainable than merging them into a
single aclocal.m4 file. It is easier for users to understand where those
files come from.

Automake knows how to distribute files in the m4 directory.
2016-01-29 23:41:40 -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
ee1a237685 Remove GOT_PREFIX, it's a broken hack of limited utility
To add flags to the compiler, CFLAGS, CPPFLAGS or LDFLAGS can be used on
the configure command line.

The need to add flags depends on the location of the headers and
libraries of the dependencies, which is orthogonal to the directory where
xrdp will be installed.

The implementation in configure.ac has a stray closing bracket, making
GOT_PREFIX true even if --prefix is not passed.

The implementation is inconsistent - the only affected makefiles are for
xrdp and libxrdp.

Changing rpath manually is wrong in most cases. Libtool should be able to
set rpath correctly on its own.

Using $(prefix)/lib ignores the libdir setting. For many 64-bit systems,
/usr/lib is used for 32-bit libraries. Adding 32-bit libraries to the
rpath slows down 64-bit executables, as the dynamic loader searches for
libraries in a wrong directory.

There is no way to disable GOT_PREFIX if --prefix has to be passed.
Fedora RPM patches configure.ac and needs to rerun autoconf and automake
after that.
2016-01-26 22:36:59 -08:00
jsorg71
a25e5e99dd Merge pull request #306 from metalefty/fontconfig-disable-docs
X11rdp: disable fontconfig docs
2016-01-24 22:35:09 -08:00
jsorg71
c6f27eb96c Merge pull request #304 from proski/devel
Minor fixes
2016-01-24 22:34:41 -08:00
Itamar Reis Peixoto
327f1ea9fc Merge pull request #307 from metalefty/adjust-permission
Drop exec permission of non executable files
2016-01-21 23:59:48 -02:00
Koichiro IWAO
16a284d1dc Drop exec permission of non executable files 2016-01-22 10:50:51 +09:00
Koichiro IWAO
fbe6c10fc5 X11rdp: disable fontconfig docs
as it rarely fails to build. Nobody actually needs fontconfig docs
to build and run x11rdp even if it builds successfully. Thus we can
just disable it.
2016-01-19 11:26:19 +09:00
Pavel Roskin
964e860072 Run through codespell 2016-01-14 08:47:50 -08:00
Pavel Roskin
380c0cd2e7 Fix building outside the source tree
$(top_srcdir)/common is in INCLUDES, but $(top_srcdir) is not.
2016-01-14 08:47:50 -08:00
Pavel Roskin
dac8bf728a PIDDIR should be /var/run, not /var/run/xrdp
There are no references to /var/run/xrdp anywhere else in the code.
2016-01-14 16:32:09 +00:00
Jay Sorg
2893fefc91 common: check for term in force send and recv 2016-01-11 18:06:29 -08:00
Jay Sorg
ded462ab8e chansrv: fix some warnings 2015-12-29 13:28:15 -08:00
jsorg71
89c0ee09ea Merge pull request #301 from metalefty/update-mailing-list-address
Update mailing list address
2015-12-29 13:16:22 -08:00
Jay Sorg
8261459707 chansrv: fix a crash in fuse 2015-12-26 17:22:27 -08:00
Jay Sorg
040c3a3327 don't use g_free in xrdpapi 2015-12-26 16:07:51 -08:00
Koichiro IWAO
2a317d3db8 Update mailing list address 2015-12-22 18:26:56 +09:00
Jay Sorg
4e0d0f3ba0 sesman: remove the thread 2015-12-11 20:41:17 -08:00
Jay Sorg
4f128c530c no logic change, remove trailing space 2015-12-11 20:37:43 -08:00
Jay Sorg
96a237c8ef libxrdp: rail fix for when no flags are set 2015-12-11 20:05:40 -08:00
Jay Sorg
83cff9809c xorgxrdp=3379d2c 2015-12-10 23:19:32 -08:00
Jay Sorg
f49e2058df xrdp: change when using xrdp.ini hidelogwindow 2015-12-01 23:10:09 -08:00
Itamar Reis Peixoto
9f710ce94a Merge pull request #276 from metalefty/show-license-freebsd-rc
instfiles: show license at the script taken from FreeBSD ports
2015-11-18 11:39:50 -02:00
jsorg71
93aa8ab352 Merge pull request #295 from metalefty/swissfrench-keyboard
add swiss french keyboard map
2015-11-11 23:54:45 -08:00
Koichiro IWAO
7136fe608f instfiles: add km-100c.ini to Makefile.am
Closes neutrinolabs/xrdp#280.
2015-11-11 11:01:00 +09:00
Dartheo
7cd97bd2af add swiss french keyboard map 2015-11-11 10:56:06 +09:00
jsorg71
657f144ed5 Merge pull request #294 from janLo/simplify-session-match
Simplify session match logic.
2015-11-08 23:57:01 -08:00
Jay Sorg
e1c7aa377f common: fix possible deadlock in trans 2015-11-02 17:57:11 -08:00
Jay Sorg
d59d672f55 xup: no logic change, add logging 2015-11-02 17:54:16 -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
Itamar Reis Peixoto
5f16481feb Merge pull request #267 from moobyfr/fix-systemd-debian
some fixes for systemd on debian
2015-10-14 08:40:53 -04: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
418637f72d xrdp: fix --kill 2015-10-10 15:42:29 -07:00
Jay Sorg
fd793bd213 rename g_tcp_can_recv to g_sck_can_recv 2015-10-07 22:17:12 -07:00
Jay Sorg
0bb92e0a61 xorgxrdp=884b347 2015-10-06 21:15:44 -07:00