Commit Graph

2952 Commits

Author SHA1 Message Date
Pavel Roskin
4234ed278e Use FUSE_CFLAGS and FUSE_LIBS from pkg-config
Include <fuse_lowlevel.h>, not <fuse/fuse_lowlevel.h>, the include path
should be set up for that.

Don't define _FILE_OFFSET_BITS in one file, FUSE_CFLAGS would enable it
for the whole xrdp-chansrv build if needed.
2016-11-26 09:17:51 -08:00
metalefty
589b29f92f Merge pull request #461 from metalefty/ipv6/fallback-to-ipv4
common: If IPv6 not supported, fall back to IPv4
2016-11-24 17:01:18 +09:00
metalefty
44149ef8a3 Merge pull request #503 from proski/jpeg
Fix pointer sign warnings in jpeg and TurboJPEG code
2016-11-24 16:13:55 +09:00
Pavel Roskin
077e3f5bfc Fix pointer sign warnings in TurboJPEG compression code 2016-11-22 08:34:45 -08:00
Pavel Roskin
e7433ec69c Fix pointer sign warnings in JPEG compression code 2016-11-22 08:34:45 -08:00
Itamar Reis Peixoto
fbf7168270 Merge pull request #504 from proski/no-ac
Remove "-ac" from X server parameters, it's insecure and unnecessary
2016-11-22 13:18:19 -02:00
Koichiro IWAO
849a8075c5 common: If IPv6 not supported, fall back to IPv4
The system to run xrdp does not necessarily support IPv6 even though
it is compiled with IPv6.

Fixes #432.
2016-11-22 16:40:54 +09:00
Pavel Roskin
15c4c47811 Remove "-ac" from X server parameters, it's insecure and unnecessary
Fedora patches sesman.ini to remove "-ac", and that doesn't cause any ill
effects.
2016-11-21 22:37:41 -08:00
Koichiro IWAO
2c9ff1a4d4 log non TLS session 2016-11-22 10:50:31 +09:00
Koichiro IWAO
40e8194122 TLS: log TLS version and cipher 2016-11-22 10:50:30 +09:00
metalefty
a59645d3c5 Merge pull request #491 from proski/fuse-format
Fix format warnings if FUSE is enabled
2016-11-22 09:10:02 +09:00
Pavel Roskin
7fce469cbc Fix format warnings if FUSE is enabled 2016-11-21 17:51:20 +00:00
Itamar Reis Peixoto
6138462d52 Merge pull request #499 from proski/pkgconfig
Use PKG_INSTALLDIR to determine pkg-config file install location
2016-11-21 09:39:10 -02:00
Pavel Roskin
3ffdcfe02d Use PKG_INSTALLDIR to determine pkg-config file install location
The PKG_INSTALLDIR macro also enables --with-pkgconfigdir for easy
overrides.

PKG_INSTALLDIR is relatively new, it appeared in pkg-config 0.27. To
ensure we have a recent pkg.m4 copy, copy pkg.m4 to the m4 directory.
2016-11-20 21:58:31 -08:00
Itamar Reis Peixoto
7cc1dd2ba8 Merge pull request #460 from metalefty/ipv6/logs
common: Fix client IP address logging when IPv6 is enabled
2016-11-20 16:00:26 -02:00
Jay Sorg
e8308d58b3 xrdp: do case insensitive compare for section names 2016-11-19 07:44:28 +00:00
Jay Sorg
25fd585d55 chansrv: some fixes to log file path 2016-11-19 07:31:36 +00:00
Itamar Reis Peixoto
ab69b8501d Merge pull request #496 from proski/pkgconfig
Fix for xrdp-uninstalled.pc and addition of pkgconfig/.gitignore
2016-11-18 21:46:43 -02:00
Pavel Roskin
5afc5bd8b3 Fix include path in xrdp-uninstalled.pc.in
${pcfiledir} refers to the directory of the package-config file. For an
xrdp build in the source tree, the correct include location would be
${pcfiledir}/../common, not ${pcfiledir}/common

For xrdp build outside the source tree, there is no way to find the
source tree without help from the configure script.

While the '${pc_top_builddir}/${pcfiledir}' pattern is still widespread,
many packages (e.g. gstreamer) are switching to @abs_top_srcdir@ and
@abs_top_builddir@, which are always absolute and have knowledge about
the source tree location from the configure script.

Use @abs_top_srcdir@ for the headers. @abs_top_builddir@ is not needed,
as xrdp produces no externally consumable libraries or generated
headers.
2016-11-18 23:42:26 +00:00
Pavel Roskin
42d639f30d Add pkgconfig/.gitignore 2016-11-18 23:41:30 +00:00
Itamar Reis Peixoto
c83c736073 Merge pull request #495 from proski/distcheck
Add "make distcheck" to travis checks
2016-11-18 18:55:50 -02:00
Pavel Roskin
d8a5b62125 Add "make distcheck" to travis checks 2016-11-18 20:34:04 +00:00
Itamar Reis Peixoto
824564f979 Merge pull request #494 from proski/openssl
Fix "unable to find 'distinguished_name' in config" with older openssl
2016-11-18 12:25:08 -02:00
Pavel Roskin
401612fd1d Fix "unable to find 'distinguished_name' in config" with older openssl
This also fixes "make distcheck", which expects "make uninstall" to
remove all installed files.
2016-11-18 03:59:37 +00:00
Itamar Reis Peixoto
f7b0b0d89c Merge pull request #488 from metalefty/docs
Update man pages and config files
2016-11-17 23:12:49 -02:00
Itamar Reis Peixoto
6d23df0ef0 Merge pull request #493 from proski/pkgconfig
Fixes for pkg-config
2016-11-17 23:12:34 -02:00
Pavel Roskin
0a300f5113 Simplify pkgconfig/Makefile.am 2016-11-18 00:43:07 +00:00
Pavel Roskin
0fdda4ee2e Add xrdp-uninstalled.pc to allow compilation against xrdp sources 2016-11-18 00:38:07 +00:00
Pavel Roskin
3ae4968af4 Pass all substitutions to AC_CONFIG_FILES, sort and reformat them
Passing arguments to AC_OUTPUT is obsolete.

Remove commented out configure code.
2016-11-18 00:35:33 +00:00
Pavel Roskin
5706bfadea Improve xrdp description, substitute package version 2016-11-18 00:31:09 +00:00
Jay Sorg
6810a58280 update description in .pc file 2016-11-17 12:15:50 -08:00
Jay Sorg
9e9ae2fa1f fix a typo in .pc file 2016-11-17 11:59:42 -08:00
Jay Sorg
50db3bb983 add pkgconfig xrdp.pc file 2016-11-17 11:57:10 -08:00
Koichiro IWAO
8dac31ca52 CI: remove xorgxrdp 2016-11-17 17:31:20 +09:00
Jay Sorg
bf8bc585b3 remove xorgxrdp submodule 2016-11-16 22:56:00 -08:00
Jay Sorg
2066ea2ff2 remove xorgxrdp submodule 2016-11-16 22:51:34 -08:00
jsorg71
9b778583b2 Merge pull request #492 from metalefty/certs
Do not create SHA-1 certificates anymore
2016-11-16 10:56:13 -08:00
Koichiro IWAO
7196094016 Do not create SHA-1 certificates anymore
as many systems in the world still default to create SHA-1 certs if
hash algorithm is not specified explicitly.
2016-11-16 17:24:26 +09:00
metalefty
9deaa078fc Merge pull request #477 from proski/vnc-strerror
Improve error messages about VNC password file
2016-11-16 17:10:38 +09:00
metalefty
8516e6f97b Merge pull request #476 from proski/auth
Fix compile warnings for non-default authentication methods
2016-11-16 17:08:15 +09:00
metalefty
b89956d06e Merge pull request #485 from proski/code-standards
Code standards
2016-11-16 17:05:21 +09:00
metalefty
d335c93a75 Merge pull request #480 from proski/strncat
Fix potential buffer overflow in strncat() invocation
2016-11-16 17:02:33 +09:00
metalefty
0712cf2747 Merge pull request #483 from proski/autorun
Fix regression in domain to session type mapping
2016-11-16 17:00:23 +09:00
Pavel Roskin
5d2ce60340 Fix regression in domain to session type mapping
If no domain is passed, self->session->client_info->domain is an empty
string that is incorrectly treated as if the domain were passed by the
client.

The regression was introduced in fc753a95, when an incorrect check for
non-empty domain was added. That check was removed in 67119ecc based on
coverity report, leaving no trace of the original intention.

Check domain both for '_' and '\0' as the initial character. In either
case, select the first session type section in xrdp.ini.
2016-11-15 22:42:04 -08:00
Pavel Roskin
35b336272b Fix compilation with C++ 2016-11-15 22:40:06 -08:00
Pavel Roskin
16c3bbdb8d Remove all tabs in sources 2016-11-15 22:40:06 -08:00
Pavel Roskin
e9d064e390 Don't try to create .vnc directory if it exists
Report system error if it cannot be created.
2016-11-15 22:39:22 -08:00
Pavel Roskin
60029514a6 Report system error if the VNC password file cannot be created 2016-11-15 22:39:22 -08:00
Pavel Roskin
e9a0324cb3 Fix compile warnings for non-default authentication methods
Include string.h for strcmp(). Don't define _XOPEN_SOURCE, it conflicts
with libc headers and hides putpwent(). Make input strings constant. Fix
functions to match their declarations.
2016-11-15 22:38:56 -08:00
Pavel Roskin
92423a466e Fix potential buffer overflow in strncat() invocation
strncat() will copy at most the specified number of characters and append
the null character on top of that. strlen() doesn't count the final null
character.
2016-11-15 22:38:21 -08:00