Commit Graph

2414 Commits

Author SHA1 Message Date
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
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