Commit Graph

2369 Commits

Author SHA1 Message Date
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
Jay Sorg
ab3b8edf4a common: change wait objs to use 'pipe' and remove per process temp directories in /tmp/.xrdp/ 2015-10-06 20:55:47 -07:00
Jay Sorg
7889ee638e sesman: close sync and term sockets after fork 2015-09-27 01:26:22 -07:00
Jay Sorg
89f449aa01 common: set log file fd to close on exec 2015-09-27 01:25:07 -07:00
Jay Sorg
7695f3d87b common: fix logic for internal_log_end 2015-09-27 01:24:14 -07:00
jsorg71
c0ef543291 Merge pull request #274 from teckids/submit-upstream
remove remaining proven DFSG-unfree files
2015-09-01 16:50:39 -07:00
Itamar Reis Peixoto
99d322e64f Merge pull request #278 from itamarjp/devel
add missing .ini files into extra_dist, so they will appear in xrdp tarball after a make dist
2015-08-30 19:08:09 -03:00
Itamar Reis Peixoto
04f8982f5e add missing .ini files into extra_dist, so they will appear in xrdp tarball after a make dist 2015-08-30 19:03:12 -03: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
Jay Sorg
444673b1fa xorgxrdp=4a2b11f 2015-08-26 14:26:33 -07:00
mirabilos
c3f9f82daf replace image with one I shot myself just now: “Blick auf’s Meßdorfer Feld”
(view towards Meßdorfer Feld, from ↳ tarent) published under any
OSI certified Open Source licence
2015-08-26 20:19:36 +02:00
Koichiro IWAO
8f4b59ac73 instfiles: show license at the script taken from FreeBSD ports 2015-08-21 14:16:20 +09:00
Jay Sorg
e51175f6d8 vnc: fix a issue with passwords longer that 8 2015-08-20 12:47:10 -07:00
jsorg71
bd248ac2be Merge pull request #270 from teckids/submit-upstream
merge copyright and licence for this file from where it was taken from
2015-08-19 14:55:33 -07:00