summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #265 from itamarjp/develItamar Reis Peixoto2015-07-152-1/+2
|\ \ | |/ | | improve systemd unit files
| * improve systemd unit filesItamar Reis Peixoto2015-07-152-1/+2
|/
* Merge pull request #261 from itamarjp/develItamar Reis Peixoto2015-07-145-5/+12
|\ | | | | add missing files into extra_dist, this is required when using make dist to generate a tarball
| * add more missing files into extra_distitamarjp2015-07-142-2/+4
| |
| * add missing files into extra_dist,itamarjp2015-07-144-4/+9
|/ | | | this is required when using make dist to generate a tarball
* Merge branch 'devel' of git:neutrinolabs/xrdp into develJay Sorg2015-07-134-15/+129
|\
| * Merge pull request #252 from metalefty/freebsd/instfilesjsorg712015-07-124-15/+129
| |\ | | | | | | instfiles: merge rc script from FreeBSD
| | * instfiles: merge rc script from FreeBSDKoichiro IWAO2015-06-184-15/+129
| | | | | | | | | | | | | | | - merge rc script from FreeBSD - modify Makefile.am to detect OS and install suitable files
* | | add timeout to trans_get_wait_objs_rwJay Sorg2015-07-136-6/+6
|/ /
* | fix problem caused by b56aa98 for tls connectionsJay Sorg2015-07-121-1/+1
| |
* | move libvnc to trans for ioJay Sorg2015-07-122-211/+177
| |
* | update the copyright yearJay Sorg2015-07-122-2/+2
| |
* | set the source for xup moduleJay Sorg2015-07-111-0/+5
| |
* | set the source for chansrvJay Sorg2015-07-111-2/+4
| |
* | fix for libxrdp_resetJay Sorg2015-07-111-8/+0
| |
* | update the module APIJay Sorg2015-07-105-45/+47
| |
* | xup: move to trans for ioJay Sorg2015-07-102-250/+161
| |
* | work on main loop changesJay Sorg2015-07-057-29/+142
|/
* Merge pull request #251 from metalefty/freebsd/sesmanjsorg712015-06-171-0/+41
|\ | | | | sesman: merge FreeBSD local patch for session.c
| * sesman: add copyright noice for code from OpenSSHKoichiro IWAO2015-06-161-0/+5
| |
| * sesman: merge FreeBSD local patch for session.cKoichiro IWAO2015-06-161-0/+36
|/ | | | | net/xrdp: effective login name is not set by xrdp-sesman https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=157282
* Merge pull request #250 from metalefty/gitignorejsorg712015-06-131-0/+2
|\ | | | | add compile and xrdp-xcon to .gitignore
| * add compile and xrdp-xcon to .gitignoreKoichiro IWAO2015-06-121-0/+2
|/
* Merge pull request #249 from metalefty/freebsd/tlsIdan Freiberg2015-06-121-35/+75
|\ | | | | common: fix #248 TLS on FreeBSD
| * common: shut up some messages in ssl_tls_print_errorKoichiro IWAO2015-06-121-4/+0
| | | | | | | | | | SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE are not fatal error but just indicate SSL_read, SSL_write, SSL_accept functions to repeat.
| * common: fix #248 TLS on FreeBSDKoichiro IWAO2015-06-111-31/+75
|/ | | | | | | | | According to document[1][2][3], retry when SSL_get_error returns SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE. [1] https://www.openssl.org/docs/ssl/SSL_read.html [2] https://www.openssl.org/docs/ssl/SSL_write.html [3] https://www.openssl.org/docs/ssl/SSL_accept.html
* libxrdp: xrdp_iso: changed logs, some fixes in security layerspeidy2015-06-042-28/+48
| | | negotiation.
* instfiles: Add line seperator to makefilespeidy2015-05-021-3/+3
|
* Merge pull request #235 from metalefty/init-scripts-on-systemdjsorg712015-05-012-5/+9
|\ | | | | instfiles: init.d/xrdp shouldn't be installed on systemd system
| * instfiles: default/xrdp is not needed as well on systemdKoichiro IWAO2015-04-271-1/+1
| |
| * instfiles: init.d/xrdp shouldn't be installed on systemd systemKoichiro IWAO2015-04-172-4/+8
| | | | | | | | | | | | | | | | | | On systemd system, at least CentOS 7, `service foo start` command works as wrapper of `systemctl start foo`. However, xrdp installs init script into /etc/init.d/xrdp. This script is not necessary for systemd system, and, what is worse, if init.d/xrdp exists, `service xrdp start` works as wrapper to run init.d/xrdp. Maybe this is inconvinient for many users.
* | finish for supporting swiss german keyboardThomas Spalinger2015-04-192-0/+4
|/
* Merge pull request #226 from metalefty/freebsd/openpamjsorg712015-04-012-1/+127
|\ | | | | xrdp: xrdp_mm.c detect and use OpenPAM
| * xrdp: xrdp_mm.c detect and use OpenPAMKoichiro IWAO2015-03-162-1/+127
| | | | | | | | | | | | OpenPAM is used in FreeBSD, NetBSD, DragonFly BSD and Mac OS X. On the Linux system, Linux-PAM is used. Detect PAM during configure and use which the system has.
* | add frame acks and h264 codec mode basicsJay Sorg2015-03-2813-211/+400
| |
* | Merge pull request #231 from metalefty/g_sck_get_peer_credjsorg712015-03-231-0/+28
|\ \ | | | | | | common: workaround for #146
| * | common: workaround for #146Koichiro IWAO2015-03-181-0/+28
| | |
* | | remove some checked in binariesCreated by chef2015-03-202-0/+0
|/ /
* | Merge pull request #230 from metalefty/errno-eremoteio-eiojsorg712015-03-171-0/+4
|\ \ | | | | | | fuse: use EIO instead of EREMOTEIO for BSDs
| * | fuse: use EIO instead of EREMOTEIO for BSDsKoichiro IWAO2015-03-181-0/+4
| | | | | | | | | | | | FreeBSD/OpenBSD/NetBSD and OS X don't have errno EREMOTEIO.
* | | Merge pull request #229 from metalefty/configure-fusejsorg712015-03-171-3/+2
|\ \ \ | |/ / |/| | configure: use PKG_CHECK_MODULES to check fuse
| * | configure: use PKG_CHECK_MODULES to check fuseKoichiro IWAO2015-03-181-3/+2
|/ / | | | | | | fuse has fuse.pc file for pkg-config. this is more reliable.
* | X11rdp: update versions, web siteJay Sorg2015-03-172-3/+3
| |
* | X11rdp: check for errors from shmem callsJay Sorg2015-03-171-10/+24
|/
* Merge pull request #225 from metalefty/chansrv-explicit-includejsorg712015-03-151-0/+1
|\ | | | | chansrv: explicit include in chansrv_fuse.c
| * chansrv: explicit include in chansrv_fuse.cKoichiro IWAO2015-03-131-0/+1
| | | | | | | | | | | | chansrv_fuse.c includes chansrv_fuse.h even if XRDP_FUSE is not defined. However, time_t is used in chansrv_fuse.h. This causes build failure on FreeBSD.
* | clipboard file paste, don't add new line to last lineJay Sorg2015-03-131-3/+9
|/
* Merge pull request #222 from metalefty/issue-33jsorg712015-03-121-47/+49
|\ | | | | xrdp: fix -h -v option if xrdp.ini is invalid
| * xrdp: fix -h -v option if xrdp.ini is invalidKoichiro IWAO2015-03-101-47/+49
| | | | | | | | | | - log_start should be called after help and version - Fixes neutrinolabs/xrdp#33.
* | Merge pull request #212 from robertalks/develjsorg712015-03-121-1/+3
|\ \ | | | | | | fix possible segfault in chansrv if DISPLAY is not set