summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge AM_CFLAGS and INCLUDES info AM_CPPFLAGSPavel Roskin2016-01-2916-61/+31
| | | | | | | | | 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.
* Don't use a symlink where #include would sufficePavel Roskin2016-01-263-2/+1
| | | | | | | | | | | | | 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.
* Remove GOT_PREFIX, it's a broken hack of limited utilityPavel Roskin2016-01-263-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #306 from metalefty/fontconfig-disable-docsjsorg712016-01-241-1/+1
|\ | | | | X11rdp: disable fontconfig docs
| * X11rdp: disable fontconfig docsKoichiro IWAO2016-01-191-1/+1
| | | | | | | | | | | | 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.
* | Merge pull request #304 from proski/develjsorg712016-01-2430-45/+45
|\ \ | | | | | | Minor fixes
| * | Run through codespellPavel Roskin2016-01-1428-43/+43
| | |
| * | Fix building outside the source treePavel Roskin2016-01-141-1/+1
| | | | | | | | | $(top_srcdir)/common is in INCLUDES, but $(top_srcdir) is not.
| * | PIDDIR should be /var/run, not /var/run/xrdpPavel Roskin2016-01-141-1/+1
| |/ | | | | There are no references to /var/run/xrdp anywhere else in the code.
* | Merge pull request #307 from metalefty/adjust-permissionItamar Reis Peixoto2016-01-215-0/+0
|\ \ | |/ |/| Drop exec permission of non executable files
| * Drop exec permission of non executable filesKoichiro IWAO2016-01-225-0/+0
|/
* common: check for term in force send and recvJay Sorg2016-01-111-54/+66
|
* chansrv: fix some warningsJay Sorg2015-12-291-7/+7
|
* Merge pull request #301 from metalefty/update-mailing-list-addressjsorg712015-12-291-1/+1
|\ | | | | Update mailing list address
| * Update mailing list addressKoichiro IWAO2015-12-221-1/+1
| |
* | chansrv: fix a crash in fuseJay Sorg2015-12-261-0/+5
| |
* | don't use g_free in xrdpapiJay Sorg2015-12-261-1/+1
|/
* sesman: remove the threadJay Sorg2015-12-1113-679/+63
|
* no logic change, remove trailing spaceJay Sorg2015-12-111-1/+1
|
* libxrdp: rail fix for when no flags are setJay Sorg2015-12-111-0/+6
|
* xorgxrdp=3379d2cJay Sorg2015-12-101-0/+0
|
* xrdp: change when using xrdp.ini hidelogwindowJay Sorg2015-12-012-2/+16
|
* Merge pull request #276 from metalefty/show-license-freebsd-rcItamar Reis Peixoto2015-11-181-0/+23
|\ | | | | instfiles: show license at the script taken from FreeBSD ports
| * instfiles: show license at the script taken from FreeBSD portsKoichiro IWAO2015-08-211-0/+23
| |
* | Merge pull request #295 from metalefty/swissfrench-keyboardjsorg712015-11-112-0/+660
|\ \ | | | | | | add swiss french keyboard map
| * | instfiles: add km-100c.ini to Makefile.amKoichiro IWAO2015-11-111-0/+1
| | | | | | | | | | | | Closes neutrinolabs/xrdp#280.
| * | add swiss french keyboard mapDartheo2015-11-111-0/+659
|/ /
* | Merge pull request #294 from janLo/simplify-session-matchjsorg712015-11-081-20/+2
|\ \ | | | | | | Simplify session match logic.
| * | Simplify session match logic.Jan Losinski2015-10-251-20/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | common: fix possible deadlock in transJay Sorg2015-11-021-1/+2
| | |
* | | xup: no logic change, add loggingJay Sorg2015-11-021-0/+6
|/ /
* | Merge pull request #267 from moobyfr/fix-systemd-debianItamar Reis Peixoto2015-10-142-3/+5
|\ \ | | | | | | some fixes for systemd on debian
| * | Add default directory for debian, and set them optionalBlindauer Emmanuel2015-07-242-3/+5
| | | | | | | | | | | | Remove the --nodaemon which makes the service fail at start
* | | tabs to spaces, no logic changeJay Sorg2015-10-101-5/+5
| | |
* | | for Xvnc sesman session, use hash of password for vnc authJay Sorg2015-10-102-5/+42
| | |
* | | xrdp: fix --killJay Sorg2015-10-101-33/+33
| | |
* | | rename g_tcp_can_recv to g_sck_can_recvJay Sorg2015-10-074-6/+6
| | |
* | | xorgxrdp=884b347Jay Sorg2015-10-061-0/+0
| | |
* | | common: change wait objs to use 'pipe' and remove per process temp ↵Jay Sorg2015-10-062-250/+191
| | | | | | | | | | | | directories in /tmp/.xrdp/
* | | sesman: close sync and term sockets after forkJay Sorg2015-09-271-0/+5
| | |
* | | common: set log file fd to close on execJay Sorg2015-09-271-0/+7
| | |
* | | common: fix logic for internal_log_endJay Sorg2015-09-271-1/+1
| | |
* | | Merge pull request #274 from teckids/submit-upstreamjsorg712015-09-013-0/+26
|\ \ \ | | | | | | | | remove remaining proven DFSG-unfree files
| * | | add historic GPLv2+ to Simone’s filesmirabilos2015-08-262-0/+26
| | | | | | | | | | | | | | | | this becomes GPLv3+ when combined with Apache v2 licenced files
| * | | replace image with one I shot myself just now: “Blick auf’s Meßdorfer ↵mirabilos2015-08-261-0/+0
| | |/ | |/| | | | | | | | | | | | | | | | Feld” (view towards Meßdorfer Feld, from ↳ tarent) published under any OSI certified Open Source licence
* | | Merge pull request #278 from itamarjp/develItamar Reis Peixoto2015-08-301-4/+9
|\ \ \ | | | | | | | | add missing .ini files into extra_dist, so they will appear in xrdp tarball after a make dist
| * | | add missing .ini files into extra_dist, so they will appear in xrdp tarball ↵Itamar Reis Peixoto2015-08-301-4/+9
| | | | | | | | | | | | | | | | after a make dist
* | | | xorgxrdp=4a2b11fJay Sorg2015-08-261-0/+0
| |/ / |/| |
* | | vnc: fix a issue with passwords longer that 8Jay Sorg2015-08-201-1/+3
| | |
* | | Merge pull request #270 from teckids/submit-upstreamjsorg712015-08-191-0/+4
|\ \ \ | | | | | | | | merge copyright and licence for this file from where it was taken from