Commit Graph

2262 Commits

Author SHA1 Message Date
Jay Sorg
6390cee2d8 Merge branch 'master' into v0.8 2015-01-07 20:46:38 -08:00
Jay Sorg
ee8998483b Merge branch 'devel' 2015-01-07 20:44:16 -08:00
jsorg71
46215e36d1 Merge pull request #206 from AkiraPenguin/devel_rdp_keyboard_jp_model
xrdp_keyboard.ini: Fix jp keyboard model
2014-12-28 20:45:26 -08:00
jsorg71
7ef0e88017 Merge pull request #205 from AkiraPenguin/devel_rdpkeyboard_jp_20141222
Fix "\ _" on jp keyboard
2014-12-28 13:03:36 -08:00
Akira Taniguchi
2fc1f3b811 xrdp_keyboard.ini: Fix jp keyboard model 2014-12-29 05:18:53 +09:00
Akira Taniguchi
59db9707ad Fix "\ _" on jp keyboard 2014-12-26 00:50:45 +09:00
Jay Sorg
253028431c libxrdp: opps, fix typeo 2014-12-23 22:51:10 -06:00
Jay Sorg
25809f4f1c libxrdp: no logic change, tabs to spaces 2014-12-23 20:04:20 -08:00
Jay Sorg
eddf0eefdc libxrdp: no logic change, statis functions, indent 2014-12-18 19:40:26 -08:00
Jay Sorg
a2183bc243 xorgxrdp=6edf9e5 2014-12-18 11:57:12 -08:00
Jay Sorg
ce1a4e660b libxrdp: fastpath RDP_INPUT_SYNCHRONIZE fix 2014-12-16 17:36:18 -08:00
Jay Sorg
69a551cdf7 libxrdp: indent, no logic change 2014-12-16 12:20:57 -08:00
Jay Sorg
d1bc5b0bf7 libxrdp: no logic change, tabs to spaces 2014-12-15 16:26:32 -08:00
speidy
5e89424129 libxrdp: fix for 'low' RDP security level (issue #202) 2014-12-15 22:12:16 +02:00
speidy
bf622c46a6 libxrdp: security layer, error handling 2014-12-13 16:36:23 +02:00
speidy
83eb128d7c Merge branch 'devel' of https://github.com/neutrinolabs/xrdp.git into devel 2014-12-13 16:24:35 +02:00
speidy
fb306e624e libxrdp: changes for security layer negotiation,
security_layer=negotiate is working now
2014-12-13 16:24:07 +02:00
Jay Sorg
e7c144ef33 Merge branch 'metalefty-add-japanese-keymap' into devel 2014-12-12 23:46:11 -08:00
Jay Sorg
1052841cc6 Merge branch 'add-japanese-keymap' of git://github.com/metalefty/xrdp into metalefty-add-japanese-keymap
Conflicts:
	xrdp/xrdp_keyboard.ini
2014-12-12 23:45:41 -08:00
Jay Sorg
762209e0dd xorg: server removed and put in submodule 2014-12-11 21:55:21 -08:00
Jay Sorg
3989dfcecc pulseaudio: if source and sink are not installed, use null sink so pulseaudio will always start 2014-12-11 14:56:52 -08:00
Jay Sorg
de32ca87b9 xrdp: jp changes for xrdp_keyboard.ini 2014-12-10 11:34:41 -08:00
Koichiro IWAO
2212991bd7 Add Japanese keymap codes in xrdp_keyboard.ini 2014-12-11 02:18:33 +09:00
speidy
86005c5bcc ssl_calls: fix to read certificate chains 2014-12-10 00:04:38 +02:00
Jay Sorg
d9d746ce5c common: avoid possible SSL_shutdown crash 2014-12-02 10:52:03 -08:00
Koichiro IWAO
67570b45de Add Japanese keymap 2014-12-01 16:32:18 +09:00
Jay Sorg
290aee8cd9 X11rdp: switch back to 'base' rules for xkb 2014-11-28 14:11:38 -08:00
Jay Sorg
2010567ecc X11rdp: set options and default 105 keyboard 2014-11-26 19:06:28 -08:00
Jay Sorg
bff2009147 chansrv: change to 44100 recording, disconnect / reconnect fixes 2014-11-26 16:48:37 -08:00
Jay Sorg
10cd6df739 Merge branch 'master' into v0.8 2014-11-26 13:04:57 -08:00
Jay Sorg
1d3329b49b Merge branch 'devel' 2014-11-26 13:04:31 -08:00
Jay Sorg
2d514e666a Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel 2014-11-25 18:55:47 -08:00
Jay Sorg
cc0406dddf common: move tls calls to ssl_calls 2014-11-25 18:55:37 -08:00
Jay Sorg
47de7a67f6 sesman: verify_user_bsd.c license change and indent 2014-11-24 09:23:48 -08:00
Thomas Goddard
22f1ff2f25 Merge pull request #188 from renaudallard/devel
Enable bsdauth authentication.
2014-11-23 08:14:56 -08:00
Jay Sorg
cb4f299899 sesman: fix for --enable-nopam 2014-11-22 23:17:00 -08:00
Jay Sorg
5a8bf87c7f common: tls, fix for pending reads 2014-11-21 20:49:01 -08:00
Renaud Allard
803af49a04 Some fixes to compile properly since this version has change a lot from 0.6.1 2014-11-21 15:00:01 +01:00
Renaud Allard
618ca587a5 Enable authenticate user using BSD password system 2014-11-21 14:22:15 +01:00
speidy
160d950bd5 Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel 2014-11-21 03:18:59 +02:00
speidy
52cac06092 libxrdp: delete NLA header detection for now, TLS is working now with
mstsc
2014-11-21 03:17:45 +02:00
speidy
c159505980 chansrv: fix for segfault issue in chansrv_common 2014-11-21 03:13:14 +02:00
jsorg71
39e9834c53 Merge pull request #187 from SaaldjorMike/fix-typo
Fix spelling error and typo
2014-11-21 00:33:55 +00:00
Mike Rostermund
b3cc8f75d9 Fix spelling error and typo 2014-11-20 23:49:35 +01:00
Jay Sorg
8625ba1aa2 set package version 2014-11-13 22:27:09 -08:00
Jay Sorg
08e69cda85 Merge branch 'master' into v0.8
Conflicts:
	sesman/chansrv/Makefile.am
	sesman/chansrv/sound.c
	sesman/chansrv/sound.h
	sesman/sesman.ini
	xrdp/xrdp.ini
	xrdp/xrdp_mm.c
2014-11-13 22:16:00 -08:00
Jay Sorg
32f172853f Merge branch 'devel' 2014-11-13 22:08:14 -08:00
Jay Sorg
942cdf300e sesman: avoid creation of .vnc directory if not vnc session 2014-11-11 20:06:04 -08:00
Jay Sorg
253f6ff555 sesman: only check vnc auth file if vnc session 2014-11-11 02:12:56 -08:00
jsorg71
ddfd6b8b59 Merge pull request #144 from seabres/pambranch
Change to allow authentication against all authentication methods.
2014-11-08 21:26:21 -08:00