summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix all format warnings and some unused variable warningsJay Sorg2016-03-149-22/+22
|
* Don't attempt to intercept SIGKILL, it doesn't work on any OSJay Sorg2016-03-147-17/+0
|
* xorgxrdp=a0add6cJay Sorg2016-03-021-0/+0
|
* keygen: default 2048 bit RSA keyJay Sorg2016-02-241-3/+2
|
* Merge pull request #333 from proski/key-installItamar Reis Peixoto2016-02-2411-54/+29
|\ | | | | Key install (generate rsakeys.ini during make install)
| * Create and install rsakeys.iniPavel Roskin2016-02-233-17/+9
| | | | | | | | | | | | | | | | | | Use install-data-hook to ensure restrictive permissions on rsakeys.ini. Don't create rsakeys.ini in init scripts. This makes xrdp functional upon "make install" without relying on the init scripts. Packagers should not package rsakeys.ini, it should be created when the package is installed.
| * Use SCRIPTS for executable scripts, don't use "chmod 755"Pavel Roskin2016-02-224-11/+6
| |
| * Use "dist_" prefix to minimize use of EXTRA_DISTPavel Roskin2016-02-228-29/+17
| | | | | | "dist" is ignored in presense of "noinst", so keep noinst_man_MANS.
* | Merge pull request #326 from metalefty/pulseaudio-6.0jsorg712016-02-232-1/+10
|\ \ | |/ |/| pulse: fix build pulseaudio 6.0 or higher
| * pulse: fix build pulseaudio 6.0 or higherKoichiro IWAO2016-02-182-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | common: minor fix for older openssl keygenJay Sorg2016-02-221-1/+1
| |
* | Merge branch 'devel' of git:neutrinolabs/xrdp into develJay Sorg2016-02-2296-292/+545
|\ \
| * \ Merge pull request #330 from proski/automakeItamar Reis Peixoto2016-02-2215-95/+116
| |\ \ | | |/ | |/| More makefile cleanup
| | * Move headers from EXTRA_DIST to sources, sort alphabeticallyPavel Roskin2016-02-2114-94/+115
| | | | | | | | | | | | There should be no functional difference.
| | * Add m4 directory to EXTRA_DIST, not all Automake versions package itPavel Roskin2016-02-211-1/+1
| |/
| * Merge pull request #320 from proski/sesadminItamar Reis Peixoto2016-02-1563-119/+147
| |\ | | | | | | Make sesadmin useful, another round of typo hunting
| | * xrdp-sesadmin: show help and exit if mandatory arguments are not givenPavel Roskin2016-02-141-2/+9
| | | | | | | | | | | | Don't mark password as mandatory, it's asked if not provided on the command line.
| | * Fix typosPavel Roskin2016-02-1358-109/+109
| | |
| | * Install the most appropriate PAM settings filePavel Roskin2016-02-134-3/+24
| | | | | | | | | | | | | | | | | | 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.
| | * Fix connection month display in xrdp-sesadminPavel Roskin2016-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | 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.
| | * Use lowercase program names for syslogPavel Roskin2016-02-134-4/+4
| |/ | | | | Other programs typically use the same case as their execulables.
| * Merge pull request #317 from proski/coding_styleItamar Reis Peixoto2016-02-133-1/+197
| |\ | | | | | | Convert coding style from Open Document to Markdown
| | * Convert coding style from Open Document to MarkdownPavel Roskin2016-02-113-1/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge pull request #319 from proski/miscItamar Reis Peixoto2016-02-1328-78/+86
| |\ \ | | | | | | | | Miscellaneous minor patches, mostly for the build system
| | * | Stop redefining libdir, use moduledir for ${libdir}/xrdpPavel Roskin2016-02-1214-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Don't ignore files known to gitPavel Roskin2016-02-126-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Fix sloppy formatting in instfiles/Makefile.amPavel Roskin2016-02-121-14/+14
| | | | | | | | | | | | Use spaces around = and +=, indent by 2 spaces.
| | * | Automake 1.7.2 is the oldest version working with xrdpPavel Roskin2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | Use silent rules by default if supported by AutomakePavel Roskin2016-02-121-0/+3
| | | | | | | | | | | | Silent rules make warnings stand out, so they are fixed early.
| | * | Add missing spaces in the strings that are split for line wrappingPavel Roskin2016-02-126-8/+8
| | | |
| | * | xcon: include unistd.h, it's needed for select() on MacOSPavel Roskin2016-02-121-0/+1
| | | |
| | * | startwm.sh: make sure sourced scripts are readablePavel Roskin2016-02-121-29/+26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | common: fix for key generated smaller than asked forJay Sorg2016-02-221-12/+20
|/ /
* | sesman: add missing breakJay Sorg2016-02-111-1/+1
|/
* remove duplicated call to scp_session_set_bppItamar Reis Peixoto2016-02-111-1/+0
|
* Merge pull request #316 from proski/32bppItamar Reis Peixoto2016-02-114-7/+29
|\ | | | | Make it possible to use Xvnc with 32 bpp
| * vnc: enable 32 bpp support for Xvnc, it actually worksPavel Roskin2016-02-101-6/+12
| |
| * Allow sessions with 32 bppPavel Roskin2016-02-101-0/+1
| |
| * Check return value of scp_session_set_bpp()Pavel Roskin2016-02-102-1/+16
|/
* Merge pull request #315 from proski/autotoolsItamar Reis Peixoto2016-02-101-1/+1
|\ | | | | Hot fix for recent autotools changes
| * Use AC_CONFIG_MACRO_DIR, not AC_CONFIG_MACRO_DIRSPavel Roskin2016-02-101-1/+1
|/ | | | | | 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.
* common: updates for file.cJay Sorg2016-02-091-23/+32
|
* Merge pull request #273 from gschwind/develjsorg712016-02-081-75/+48
|\ | | | | fix wrong handle of commented section in configuration file.
| * fix wrong handle of commented section in configuration file.Benoit Gschwind2015-08-191-75/+48
| | | | | | | | | | | | | | | | | | - fix parssing of commented section like the line: #[section_name] or ![section_name] - add few comments - improve redability
* | Merge pull request #310 from noldor/develItamar Reis Peixoto2016-02-084-64/+64
|\ \ | | | | | | update japanese keyboard "Henkan_Mode" key and "Muhenkan" key
| * | update japanese keyboard "Henkan_Mode" key and "Muhenkan" keynoldor2016-01-304-64/+64
| | |
* | | Merge pull request #254 from metalefty/freebsd/ipv6Itamar Reis Peixoto2016-02-082-8/+16
|\ \ \ | | | | | | | | Unbreak IPv6 on FreeBSD and add IPv6-only option
| * | | common: add --enable-ipv6only optionKoichiro IWAO2015-07-022-0/+13
| | | |
| * | | common: drop ipv6 autodetection only valid for linuxKoichiro IWAO2015-07-022-8/+3
| | | |
* | | | Merge pull request #309 from proski/develItamar Reis Peixoto2016-02-0852-138/+137
|\ \ \ \ | | | | | | | | | | Fixes for autotools, compile warnings and MacOS compatibility