Commit Graph

2580 Commits

Author SHA1 Message Date
Koichiro IWAO
d01854a341 common: no logic change, fix alignment, whitespaces 2016-02-23 18:26:41 +09:00
Koichiro IWAO
1ed7dbec53 common: add log for g_tcp_connect
in case getaddrinfo(3) might fail.

In FreeBSD, AI_V4MAPPED support for getaddrinfo(3) was very recently
implemented[1].  Most of FreeBSD systems in the world do not have
this implementation yet.  This will be a problem when AI_V4MAPPED
isn't supported and xrdp is built with IPv6 option.  In such a case,
g_tcp_connect always fails.

Of course getaddrinfo(3) might fail in other cases.  The log helps
us to know what's happening.

[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198092
2016-02-23 18:18:28 +09:00
Pavel Roskin
22e6f3e2f7 Use SCRIPTS for executable scripts, don't use "chmod 755" 2016-02-22 23:13:16 -08:00
Pavel Roskin
7642675ddf Use "dist_" prefix to minimize use of EXTRA_DIST
"dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
2016-02-22 22:11:57 -08:00
Jay Sorg
f100036cd9 common: minor fix for older openssl keygen 2016-02-22 11:48:54 -08:00
Jay Sorg
3bc9f1e275 Merge branch 'devel' of git:neutrinolabs/xrdp into devel 2016-02-22 11:40:28 -08:00
Jay Sorg
0d192aee62 common: fix for key generated smaller than asked for 2016-02-22 11:38:03 -08:00
Itamar Reis Peixoto
f1dd912218 Merge pull request #330 from proski/automake
More makefile cleanup
2016-02-22 07:45:12 -05:00
Pavel Roskin
59a5fb0ddb Move headers from EXTRA_DIST to sources, sort alphabetically
There should be no functional difference.
2016-02-21 23:06:48 -08:00
Pavel Roskin
3ad28e1130 Add m4 directory to EXTRA_DIST, not all Automake versions package it 2016-02-21 21:31:02 -08:00
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.
2016-02-18 00:45:33 +09:00
Itamar Reis Peixoto
3934be9320 Merge pull request #320 from proski/sesadmin
Make sesadmin useful, another round of typo hunting
2016-02-15 06:59:39 -02:00
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.
2016-02-14 10:27:17 -08:00
Pavel Roskin
92a6833e9b Fix typos 2016-02-13 20:41:07 -08:00
Pavel Roskin
afa6ec97cc Install the most appropriate PAM settings file
Installing a file referring to common-auth is of no use if that file
doesn't exit.

Don't use "password" entry, xrdp doesn't ever change user password.
2016-02-13 18:44:28 -08:00
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.
2016-02-13 18:31:47 -08:00
Pavel Roskin
81779ddb01 Use lowercase program names for syslog
Other programs typically use the same case as their execulables.
2016-02-13 18:14:42 -08:00
Itamar Reis Peixoto
4ebc97ef39 Merge pull request #317 from proski/coding_style
Convert coding style from Open Document to Markdown
2016-02-13 17:52:19 -02:00
Itamar Reis Peixoto
371ad8d90d Merge pull request #319 from proski/misc
Miscellaneous minor patches, mostly for the build system
2016-02-13 17:40:33 -02:00
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.
2016-02-12 23:52:46 -08:00
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.
2016-02-12 23:52:46 -08:00
Pavel Roskin
9a1dea8e50 Fix sloppy formatting in instfiles/Makefile.am
Use spaces around = and +=, indent by 2 spaces.
2016-02-12 23:52:45 -08:00
Pavel Roskin
0e75e13b42 Automake 1.7.2 is the oldest version working with xrdp
Automake 1.6.x cannot deal with conditional EXTRA_LIBS. Automake 1.7 and
1.7.1 cannot deal with line continuation in SUBDIRS.

It is important to have correct requirements to know what Automake
features can be used.
2016-02-12 23:52:45 -08:00
Pavel Roskin
04fc814efd Use silent rules by default if supported by Automake
Silent rules make warnings stand out, so they are fixed early.
2016-02-12 23:52:45 -08:00
Pavel Roskin
22e808a186 Add missing spaces in the strings that are split for line wrapping 2016-02-12 23:52:45 -08:00
Pavel Roskin
09709d3ced xcon: include unistd.h, it's needed for select() on MacOS 2016-02-12 23:52:45 -08:00
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.
2016-02-12 23:52:45 -08:00
Jay Sorg
ac901fd283 sesman: add missing break 2016-02-11 17:52:44 -08:00
Pavel Roskin
c4127aa43f Convert coding style from Open Document to Markdown
Markdown is easily readable in text editors. Unlike ODT, markdown can be
patched. GitHub shows markdown with pretty formatting.

Remove bad examples. Improve explanations for good examples.

Use Unicode finger sign to work around the issue of code block after a
list.

Make coding_style.md distributable.
2016-02-11 15:39:45 -08:00
Itamar Reis Peixoto
09a69fbec2 remove duplicated call to scp_session_set_bpp 2016-02-11 11:54:43 -02:00
Itamar Reis Peixoto
70920b836e Merge pull request #316 from proski/32bpp
Make it possible to use Xvnc with 32 bpp
2016-02-11 11:50:47 -02:00
Pavel Roskin
a91a285734 vnc: enable 32 bpp support for Xvnc, it actually works 2016-02-10 09:30:23 -08:00
Pavel Roskin
a61349c1d3 Allow sessions with 32 bpp 2016-02-10 09:30:23 -08:00
Pavel Roskin
5d23d007e9 Check return value of scp_session_set_bpp() 2016-02-10 09:30:23 -08:00
Itamar Reis Peixoto
7e20d421cc Merge pull request #315 from proski/autotools
Hot fix for recent autotools changes
2016-02-10 12:33:10 -02:00
Pavel Roskin
3d8045d3aa Use AC_CONFIG_MACRO_DIR, not AC_CONFIG_MACRO_DIRS
AC_CONFIG_MACRO_DIRS requires a very recent Automake, much newer than the
declared version 1.6 (even 1.11 doesn't work). AC_CONFIG_MACRO_DIR is
defined by Autoconf starting with version 2.58, so it's within the
currently declared constraints.
2016-02-10 00:49:20 -08:00
Jay Sorg
425bd945a5 common: updates for file.c 2016-02-09 18:29:52 -08:00
jsorg71
f7742eddec Merge pull request #273 from gschwind/devel
fix wrong handle of commented section in configuration file.
2016-02-08 16:49:39 -08:00
Itamar Reis Peixoto
94ca3516b1 Merge pull request #310 from noldor/devel
update japanese keyboard "Henkan_Mode" key and "Muhenkan" key
2016-02-08 22:45:22 -02:00
Itamar Reis Peixoto
08121e0840 Merge pull request #254 from metalefty/freebsd/ipv6
Unbreak IPv6 on FreeBSD and add IPv6-only option
2016-02-08 22:40:05 -02:00
Itamar Reis Peixoto
ee436aeec9 Merge pull request #309 from proski/devel
Fixes for autotools, compile warnings and MacOS compatibility
2016-02-08 22:37:44 -02:00
Itamar Reis Peixoto
40a197e7a8 Merge pull request #314 from proski/locale
sesman: don't set LANG, let initialization scripts take care of it
2016-02-08 09:36:52 -02:00
Pavel Roskin
2a5d204baa Don't capitalize "Error" and print the error value 2016-02-07 23:15:54 -08:00
Pavel Roskin
9717e7392a Spell "return value", not "returnvalue" 2016-02-07 23:14:27 -08:00
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
2016-02-07 22:50:14 -08:00
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