mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,232 Commits 9 Branches 44 Tags 20 MiB
8a71322fe4
Commit Graph

998 Commits

Author SHA1 Message Date
Pavel Roskin
0a9b586332 Improve xrdp-sesman help text 
Don't document "-ns", as "-n" and "--nodaemon" should be enough. Always
refer to the program as xrdp-sesman, not sesman.
 2017-01-17 18:09:47 -08:00
Szabolcs Seláf
bf4c32c862 Fix calling XChangeProperty in clipboard provide 
XChangeProperty's last parameter is number of elements, not number of bytes as it's in https://tronche.com/gui/x/xlib/window-information/XChangeProperty.html
Because of this bug Paste did not work in any java applications.
 2017-01-17 15:18:23 +01:00
Pavel Roskin
8ee886a5cc Don't log device_data_len in the code where it may be uninitialized 
Log device_data_len only in the code that reads it.
 2017-01-11 23:25:42 -08:00
Pavel Roskin
f1a521204a Remove redundant function declarations 2017-01-11 23:25:42 -08:00
Pavel Roskin
9a2e728396 Remove send_channel_data() from devredir.h, it's declared in chansrv.h 
Include "chansrv.h" from devredir.c to have send_channel_data()
declaration.
 2017-01-11 23:25:42 -08:00
Idan Freiberg
e08c85aa42 Merge pull request #618 from metalefty/max_disc_time 
sesman: print max_disc_time as DisconnectedTimeLimit
 2017-01-12 06:58:12 +02:00
Koichiro IWAO
c3fbd71513 sesman: print max_disc_time as DisconnectedTimeLimit 
not max_idle_time.
 2017-01-10 15:35:16 +09:00
Pavel Roskin
c049c3dfd0 rail: remove unneeded call to XGetWindowAttributes() 
It is already called above "if" with the same arguments.
 2017-01-06 11:24:17 -08:00
Pavel Roskin
6664aac00f Use "void" for empty argument list in declarations 
In C, an empty argument list in a declaration means that the function
can accept any arguments. Use "void" instead, it means "no arguments".

C++ treats void and empty list as "no arguments".
 2017-01-05 17:27:20 -08:00
jsorg71
15a24ff1c4 Merge pull request #612 from proski/includes 
Use <> for system includes, move system includes above local ones
 2017-01-05 16:01:52 -08:00
Pavel Roskin
7ba3610787 Use <> for system includes, move system includes above local ones 2017-01-04 13:13:20 -08:00
volth
26a26ef906 fix build with --enable-xrdpdebug=yes 2017-01-04 19:20:44 +00:00
volth
37b4a14b54 fix build with --enable-xrdpdebug=yes 2017-01-04 13:00:01 +00:00
Pavel Roskin
a01aaa19b8 Fix help text to match the manual and the actual behavior 
The help text mentions "LIST" and "KILL" commands, but the manual says
"list" and "kill", and the command line parser expects the later.
 2016-12-19 23:58:13 -08:00
Idan Freiberg
a11af2bc95 Merge pull request #545 from moobyfr/fix-xauth 
Fix xauth
 2016-12-19 01:59:19 -05:00
Pavel Roskin
b1db87ea21 Use per-display VNC password files, remove old style password if found 
Every session uses its own VNC password, so keep then in separate files.

The old style password file uses the user's password encrypted with a
known key. Since we are not replacing it anymore, we should remove it.
 2016-12-18 09:24:11 -08:00
Pavel Roskin
c21b9a78f4 Distribute all files except git and github specific data 
It is better to distribute a few useless file than not to distribute
needed files.
 2016-12-18 00:00:11 -08:00
BLINDAUER Emmanuel
a2d7720887 Fix typo 2016-12-17 08:07:07 +01:00
BLINDAUER Emmanuel
1430c54c40 - Removed tailing space 
- Fixed the copyright and year
 2016-12-16 20:55:52 +01:00
BLINDAUER Emmanuel
2927eed74c - Update copyright 
- remove test on filename for xauth as we know what we send
- better names for variables in xauth
- if xauth fails, exit sesman
- g_bytes_to_hexstr returns a null-teminated string, don't set it twice.
 2016-12-15 22:45:12 +01:00
BLINDAUER Emmanuel
480d6d37b7 use correct include 2016-12-15 18:49:07 +01:00
BLINDAUER Emmanuel
51759d3d84 remove unused include 2016-12-15 18:38:37 +01:00
BLINDAUER Emmanuel
b2f4f68ab8 - move function related to xauth in own file 
- use of g_bytes_to_hexstr()
- correct typos and coding syntax
- don't create auth file, xauth can do that if needed
 2016-12-15 18:06:35 +01:00
BLINDAUER Emmanuel
e72957b7c9 xauth: use the authfile if not using default value 2016-12-14 10:55:45 +01:00
BLINDAUER Emmanuel
7d1fdd04b5 Cosmetic change: follow coding standard 2016-12-14 08:28:25 +01:00
BLINDAUER Emmanuel
16b6471d88 use the correct size for snprintf 2016-12-14 07:16:06 +01:00
BLINDAUER Emmanuel
0aa4b85f81 Xauth: use snprintf for setting the filename and adjust the value of computed cookie 2016-12-14 00:29:22 +01:00
BLINDAUER Emmanuel
6875dbe860 use functions from os_call.h 2016-12-13 18:53:07 +01:00
BLINDAUER Emmanuel
7bd1823ceb Add xauth support to get more security for all backends 2016-12-13 13:24:15 +01:00
Koichiro IWAO
35bc7c1d65 sesman: unbreak FreeBSD build after #523 2016-12-09 10:35:21 +09:00
metalefty
731d4be670 Merge pull request #521 from proski/xorg-log 
Change default Xorg logfile to .xorgxrdp.%s.log
 2016-12-09 09:45:47 +09:00
Pavel Roskin
9cbf3d1bb8 Change default Xorg logfile to .xorgxrdp.%s.log 
The log file is created in the home directory, %s is replaced with the
display number (e.g. 10).

If Xorg is run setuid root, it can refuse to run if the log path is
absolute.
 2016-12-06 15:10:01 -08:00
Pavel Roskin
04414e0fd4 Disable privilege elevation by setuid for the X server 2016-12-06 15:09:52 -08:00
Jay Sorg
f14e3dc8ac sesman: must save guid in session data 2016-12-04 17:20:01 -08:00
Jay Sorg
9a517b34f0 vnc: code cleanup 2016-12-04 15:39:10 -08:00
Jay Sorg
57905d71ad vnc: change password file to use guid hash 2016-12-03 23:12:48 -08:00
Pavel Roskin
e46d15ca84 Fix C++ errors and warnings in FUSE code 2016-11-26 09:17:51 -08:00
Pavel Roskin
2ab321a7c6 Use fuse_ino_t for FUSE inodes, not tui32 or int 2016-11-26 09:17:51 -08:00
Pavel Roskin
f622a17c75 Remove write-only FileId variable 2016-11-26 09:17:51 -08:00
Pavel Roskin
46f4025372 Cast pointer to uint64_t through tintptr to avoid warnings 
Cast to long would damage a pointer on Win64.
 2016-11-26 09:17:51 -08:00
Pavel Roskin
e92c4f3b40 Use constant strings to fix warnings 2016-11-26 09:17:51 -08:00
Pavel Roskin
662172012b Call devredir_cvt_slash() on the path copy, it changes the argument 2016-11-26 09:17:51 -08:00
Pavel Roskin
a4e3952d65 Disable or remove dead code to prevent it from throwing warnings 2016-11-26 09:17:51 -08:00
Pavel Roskin
a547cc3784 Include needed files in chansrv_fuse.c, remove duplicate declarations 2016-11-26 09:17:51 -08:00
Pavel Roskin
bf39fed6e4 Fix misuse of NULL for arithmetic type 2016-11-26 09:17:51 -08:00
Pavel Roskin
4234ed278e Use FUSE_CFLAGS and FUSE_LIBS from pkg-config 
Include <fuse_lowlevel.h>, not <fuse/fuse_lowlevel.h>, the include path
should be set up for that.

Don't define _FILE_OFFSET_BITS in one file, FUSE_CFLAGS would enable it
for the whole xrdp-chansrv build if needed.
 2016-11-26 09:17:51 -08:00
Pavel Roskin
15c4c47811 Remove "-ac" from X server parameters, it's insecure and unnecessary 
Fedora patches sesman.ini to remove "-ac", and that doesn't cause any ill
effects.
 2016-11-21 22:37:41 -08:00
Pavel Roskin
7fce469cbc Fix format warnings if FUSE is enabled 2016-11-21 17:51:20 +00:00
Jay Sorg
25fd585d55 chansrv: some fixes to log file path 2016-11-19 07:31:36 +00:00
Itamar Reis Peixoto
f7b0b0d89c Merge pull request #488 from metalefty/docs 
Update man pages and config files
 2016-11-17 23:12:49 -02:00
metalefty
9deaa078fc Merge pull request #477 from proski/vnc-strerror 
Improve error messages about VNC password file
 2016-11-16 17:10:38 +09:00
metalefty
8516e6f97b Merge pull request #476 from proski/auth 
Fix compile warnings for non-default authentication methods
 2016-11-16 17:08:15 +09:00
metalefty
b89956d06e Merge pull request #485 from proski/code-standards 
Code standards
 2016-11-16 17:05:21 +09:00
metalefty
d335c93a75 Merge pull request #480 from proski/strncat 
Fix potential buffer overflow in strncat() invocation
 2016-11-16 17:02:33 +09:00
Pavel Roskin
35b336272b Fix compilation with C++ 2016-11-15 22:40:06 -08:00
Pavel Roskin
16c3bbdb8d Remove all tabs in sources 2016-11-15 22:40:06 -08:00
Pavel Roskin
e9d064e390 Don't try to create .vnc directory if it exists 
Report system error if it cannot be created.
 2016-11-15 22:39:22 -08:00
Pavel Roskin
60029514a6 Report system error if the VNC password file cannot be created 2016-11-15 22:39:22 -08:00
Pavel Roskin
e9a0324cb3 Fix compile warnings for non-default authentication methods 
Include string.h for strcmp(). Don't define _XOPEN_SOURCE, it conflicts
with libc headers and hides putpwent(). Make input strings constant. Fix
functions to match their declarations.
 2016-11-15 22:38:56 -08:00
Pavel Roskin
92423a466e Fix potential buffer overflow in strncat() invocation 
strncat() will copy at most the specified number of characters and append
the null character on top of that. strlen() doesn't count the final null
character.
 2016-11-15 22:38:21 -08:00
Koichiro IWAO
cb1960e0fc config: use semicolon to comment out descriptions in config files 
and use number sign to comment out actual configurations.
For example:

    ; if set to true, enables foobar
    #foobar=true
 2016-11-16 14:15:44 +09:00
Koichiro IWAO
4f2d94505a config: unify all boolean values in config to true/false 2016-11-16 14:15:44 +09:00
Pavel Roskin
0d72cced46 Omit numbers from the "param" keys, they are not needed 
Users assume that they need to renumber the parameters. That makes
parameter editing more involved than it needs to be.
 2016-11-15 20:55:03 -08:00
metalefty
94901c9989 Merge pull request #454 from metalefty/change-chansrv-log-path 
chansrv: change chansrv log path to ${XDG_DATA_HOME}/xrdp
 2016-11-07 09:56:31 +09:00
Dominik George
c90bc13d39
Move -logfile /dev/null option for easier commenting in debug scenarios. 2016-10-28 16:45:05 +02:00
Koichiro IWAO
7d017482f6 chansrv: change chansrv log path to ${XDG_DATA_HOME}/xrdp 
like Xorg's logfile is written to ${XDG_DATA_HOME}/xorg/Xorg.n.log.

If XDG_DATA_HOME is not defined, the log path will be
${HOME}/.local/share/xrdp.
 2016-10-25 14:52:43 +09:00
Pavel Roskin
b28a986071 Fix memory leak in xrdp-sesman on config reload 2016-10-21 20:15:50 +00:00
Pavel Roskin
dc60a80b86 Memory leak fix: keep X server path in the parameter list 
g_cfg->xorg_params, g_cfg->vnc_params and g_cfg->rdp_params don't have
auto_free enabled, so removing an item from one of those lists won't free
its contents.

It's better not to change those lists, as they represent the actual
config file and could be reused. Instead, omit the 0th parameter (the
executable path) from copying to xserver_params.

Found by Valgrind.
 2016-10-21 20:15:50 +00:00
Pavel Roskin
e17a56efb6 Call auth_end() exactly once in scp_v0_process() 
As discovered by Valgrind, it wasn't called at all in case of a
successful session creation, which leaked memory.
 2016-10-21 20:15:50 +00:00
Pavel Roskin
65ac8e758b Fix memory leak: free session data 
Call scp_session_destroy() in the functions that call
scp_session_create() and nowhere else.

As found by Valgrind, the session data is not freed if the session is
created successfully.
 2016-10-21 20:15:50 +00:00
Pavel Roskin
a370306f75 Get rid of EXTRA_LIBS, use variables with more specific names 2016-10-20 10:43:02 -07:00
Pavel Roskin
5c69f3cd57 Eliminate EXTRA_FLAGS, it's a poor name, use AM_LDFLAGS 2016-10-20 10:43:02 -07:00
Pavel Roskin
0422734fc7 Merge EXTRA_DEFINES and EXTRA_INCLUDES into AM_CPPFLAGS 
AM_CPPFLAGS is a documented Automake variable for C preprocessor flags
that should not be overridden when compiling the package.

There is no need to have two additional variables that are ultimately
merged into AM_CPPFLAGS.

Their names are also confusing. EXTDA_DIST is a documented Automake
variable. Everything else that starts with "EXTRA" is not.
 2016-10-20 10:43:02 -07:00
Pavel Roskin
6fef1e4eb5 Use const pointers in function arguments when possible 2016-10-17 08:54:07 -07:00
Pavel Roskin
c3b99de739 Fix wrong comments in sesman config printing code 2016-10-17 08:54:07 -07:00
Pavel Roskin
bf08892622 Fix incorrect description of auth_userpass() return value 2016-10-17 08:54:07 -07:00
Pavel Roskin
a618d4f757 Don't use final newline in log calls, it's already appended 2016-10-17 08:54:07 -07:00
Pavel Roskin
424cef464b Log malloc errors with LOG_LEVEL_ERROR 2016-10-17 08:38:22 -07:00
Pavel Roskin
945833a94f Don't close socket in scp_process_start(), the caller closes it 2016-09-08 20:26:19 -07:00
Pavel Roskin
f7c27f05cf g_term_event is a wait object, not TCP socket, delete it correctly 2016-09-08 20:26:19 -07:00
Pavel Roskin
931fb90832 sesrun: remove unused g_sck and write-only g_pid 2016-09-08 20:26:19 -07:00
Pavel Roskin
d605310bdc sesman: don't close listening socket in signal handler 
It is closed when the main loop terminates.
 2016-09-08 20:26:19 -07:00
Koichiro IWAO
9f277e4445 chansrv: pathname also should be URL decoded 
because 1st argument to clipboard_get_file() is given as URL encoded.
Decoding only filename is incomplete.

Without this fix, clipboard file doesn't work in case pathname
contains non-ASCII characters or non-alphanumeric ASCII characters.
 2016-08-30 15:49:58 +09:00
jsorg71
8353baab3d Merge pull request #390 from proski/june21 
Cleanups and C++ compatibility
 2016-08-05 14:38:41 -07:00
jsorg71
81fe939dd3 Merge pull request #388 from metalefty/freebsd/fuse 
sesman: Add /sbin to PATH for FreeBSD
 2016-08-05 14:22:50 -07:00
speidy
f2addd346f Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel 2016-07-26 13:13:56 -04:00
speidy
c9b55e3691 sesman: env_set_user, fix potential bof issues 2016-07-22 04:48:37 -04:00
Kentaro Hayashi
8f3fb2f7c8 chansrv: avoid chansrv SEGV when xinode is NULL 
When xfuse_create_file_in_xrdp_fs is failed, it returns NULL.

Without this fix, xinode->size causes SEGV, so implementation is changed
to return -1 and check the return value in caller.
 2016-07-21 16:02:21 +09:00
Jay Sorg
9ccbfb6985 chansrv: added mp3 compression from Speidy 2016-07-13 17:44:07 -07:00
Pavel Roskin
2c13ef5c6d Use enum logLevels consistently for log levels 2016-07-08 04:29:57 +00:00
Pavel Roskin
cbe413bd8b Fix return type of devredir_fuse_data_peek and devredir_fuse_data_dequeue 2016-07-08 04:29:56 +00:00
Pavel Roskin
c5ca0332be Use cast when applying boolean OR to enum 2016-07-08 04:29:51 +00:00
Pavel Roskin
d1efb0d5ba Fix signed to unsigned comparisons reported by g++ 6.1.0 2016-07-08 04:29:51 +00:00
Pavel Roskin
5829323ad8 Use g_new or g_new0 when C++ compiler would complain about implicit cast 2016-07-08 04:29:49 +00:00
Pavel Roskin
bde4925f0e Cast appdata_ptr explicitly, needed for C++ compatibility 2016-07-08 04:29:47 +00:00
Pavel Roskin
4b05bb2ebd Mark g_drdynvc_chan_id as extern in g_drdynvc_chan_id, it's in chansrv.c 2016-07-08 04:29:44 +00:00
Pavel Roskin
aaa89ad4e6 Use const unsigned for hex arrays 
Some constants are too big for the signed type.
 2016-07-08 04:29:43 +00:00
Pavel Roskin
aeeb3d2c2e Fix warnings detected by -Wwrite-strings 2016-07-08 04:29:42 +00:00
Pavel Roskin
951e632757 Make program_name constant, don't duplicate or free it 2016-07-08 04:27:07 +00:00
Pavel Roskin
b00ca6e03d Remove commented out config_read_logging(), the code is long dead 2016-07-08 04:26:59 +00:00
Pavel Roskin
1ded8ec437 Remove unused string support in scp_session_set_addr() 
Using the same argument for binary and text data is not a good idea. If
string support is ever needed, it should be a separate function.

Remove SCP_ADDRESS_TYPE_IPV4_BIN and SCP_ADDRESS_TYPE_IPV6_BIN, use
SCP_ADDRESS_TYPE_IPV4 and SCP_ADDRESS_TYPE_IPV6, which simplifies the
code.
 2016-07-08 04:15:41 +00:00
Pavel Roskin
f908528a00 Downgrade "libscp initialized" to LOG_LEVEL_DEBUG, remove line number 
It's a bad style to start the log with a cryptic warning.
 2016-07-08 04:15:39 +00:00
Pavel Roskin
f7ef9bb938 Fix scp_init() invocation, it takes no arguments 2016-07-08 04:15:38 +00:00
Pavel Roskin
77b380c0b5 Fix format warnings in log_message() calls 2016-06-21 16:30:16 -07:00
Pavel Roskin
be1d034f91 Report pid and listening address/port for xrdp and xrdp-sesman 
For xrdp-sesman, don't report that the daemon is listening to a port if
it fails to attach to that port. Don't use LOG_LEVEL_ALWAYS for startup
message, it's not a critical error.
 2016-06-21 16:30:15 -07:00
Pavel Roskin
a77ae440a7 Rename SESMAN_CFG_X11DISPLAYOFFSET to SESMAN_CFG_SESS_X11DISPLAYOFFSET 
Move it to other session options in config.h. X11DisplayOffset is part of
the [Sessions] section.
 2016-06-21 16:30:15 -07:00
Pavel Roskin
ae5bb5bf9c Fix incorrect use of "it's" and "its", adjust wording 2016-06-21 16:30:15 -07:00
Koichiro IWAO
c0ac8251f7 sesman: Add /sbin to PATH for FreeBSD 
to enable to execute FUSE mount program.

The place of FUSE mount programs are:

FreeBSD   : /sbin/mount_fusefs
GNU/Linux : /bin/fusermount

See also #387.
 2016-06-20 09:47:37 +09:00
Pavel Roskin
1403652c72 Remove unused variable in devredir_cvt_from_unicode_len() 2016-05-06 18:58:16 -07:00
Pavel Roskin
f2d326cbed Remove unused variables from dev_redir_proc_query_dir_response() 2016-05-06 18:58:16 -07:00
Pavel Roskin
0dd0426e6f Check XGetWindowProperty() return code in clipboard_event_property_notify() 2016-05-06 18:31:03 -07:00
Pavel Roskin
72019d3611 Use better symbols to protect include files 2016-05-05 00:06:26 -07:00
Pavel Roskin
ca9cbcafc8 Typo fixes 2016-05-04 23:33:30 -07:00
jsorg71
fdb146740f Merge pull request #360 from proski/format-warnings 
Warning fixes
 2016-05-03 00:52:58 -07:00
Pavel Roskin
f93074a430 Add unnamed semaphore support on Mac OS 
sem_init() is not functional on Mac OS. Use the Grand Central Dispatch
implementation.

Make libscp_lock.c use semaphores through the thread_calls wrapper.
 2016-04-23 00:26:46 -07:00
Pavel Roskin
70f3d4c5e2 Fix warnings for unused variables read from byte streams 2016-04-23 00:18:38 -07:00
Pavel Roskin
95e1603f9d Fix recently introduced warnings in session.c 
Use of tabs is fixed as well.
 2016-04-21 23:03:40 -07:00
Pavel Roskin
0629b25d5f Fix warnings about unused variables and functions 2016-04-21 22:27:27 -07:00
Pavel Roskin
e65bd6b7d7 Fix more format warnings 2016-04-21 21:21:17 -07:00
jsorg71
00a11f77ce Merge pull request #359 from metalefty/sesman/configurable-xserver-path 
sesman: do not hardcode Xorg/X11rdp/Xvnc executables
 2016-04-18 13:29:15 -07:00
Koichiro IWAO
cfdce461c3 Do not attempt to trap SIGKILL part 2 
it doesn't work on any OS.
 2016-04-11 16:43:12 +09:00
Koichiro IWAO
cf2b629462 sesman: do not hardcode Xorg/X11rdp/Xvnc executables 
In RHEL and its clones, /usr/bin/Xorg is set suid-root. To execute
Xorg with user privileges, /etc/pam.d/xserver needs be edited [1],
or suid bit of Xorg binary needs to be dropped.

In order to keep Xorg and /etc/pam.d/xserver untouched, preparing
non-suid version of Xorg as /usr/bin/Xorg.non-suid for example is
the simplest solution. However, Xorg.non-suid cannot be executed
since it is hardcoded to execute Xorg in sesman.

This change makes more flexible to execute Xorg with non-standard
name or not in PATH environment variable.

[1] https://www.centos.org/forums/viewtopic.php?t=21185
 2016-04-07 18:34:43 +09:00
Koichiro IWAO
fb08623b66 sesman: brief xorg_params, no logic change 2016-04-07 16:27:23 +09:00
NerdKnight
99ebe1340f Fix compile error "format not a string literal and no format arguments [-Werror=format-security]" 2016-03-28 14:55:20 -03:00
Jay Sorg
a6cba63a89 fix a warning 2016-03-16 14:40:24 -07:00
Jay Sorg
689ffe79d9 fix warnings, move some calls to os_calls 2016-03-16 14:32:14 -07:00
Jay Sorg
38241f2a0b Fix all format warnings and some unused variable warnings 2016-03-14 17:04:08 -07:00
Jay Sorg
7393579205 Don't attempt to intercept SIGKILL, it doesn't work on any OS 2016-03-14 16:33:49 -07:00
Itamar Reis Peixoto
cfbb00c6cb Merge pull request #333 from proski/key-install 
Key install (generate rsakeys.ini during make install)
 2016-02-24 06:38:02 -05:00
jsorg71
f53b3bb737 Merge pull request #326 from metalefty/pulseaudio-6.0 
pulse: fix build pulseaudio 6.0 or higher
 2016-02-23 23:19:59 -08: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
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
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
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
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
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
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
Itamar Reis Peixoto
09a69fbec2 remove duplicated call to scp_session_set_bpp 2016-02-11 11:54:43 -02: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
ee436aeec9 Merge pull request #309 from proski/devel 
Fixes for autotools, compile warnings and MacOS compatibility
 2016-02-08 22:37:44 -02: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
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
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
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
964e860072 Run through codespell 2016-01-14 08:47:50 -08:00
Jay Sorg
ded462ab8e chansrv: fix some warnings 2015-12-29 13:28:15 -08:00
Jay Sorg
8261459707 chansrv: fix a crash in fuse 2015-12-26 17:22:27 -08:00
Jay Sorg
4e0d0f3ba0 sesman: remove the thread 2015-12-11 20:41:17 -08:00
Jan Losinski
844f01b937 Simplify session match logic. 
The session match logic had two versions - one for the
SESMAN_SESSION_TYPE_XRDP and SESMAN_SESSION_TYPE_XORG sessions and one
for every other type. The only difference was, that different display
sizes where ignored when searching for sessions to reconnect if the
policy does not have the SESMAN_CFG_SESS_POLICY_D flag set and the type
is SESMAN_SESSION_TYPE_XRDP or SESMAN_SESSION_TYPE_XORG.

The reason was that xvnc cannot resize and the others can do. This two
versions where not necessary because we set the
SESMAN_CFG_SESS_POLICY_D flag every time we have a xvnc session a few
lines above. So the two branches for the different types can be reduced
to one.

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
 2015-10-25 23:25:19 +01:00
Jay Sorg
6f90e27d80 tabs to spaces, no logic change 2015-10-10 22:16:16 -07:00
Jay Sorg
dcdb617e63 for Xvnc sesman session, use hash of password for vnc auth 2015-10-10 15:44:31 -07:00
Jay Sorg
7889ee638e sesman: close sync and term sockets after fork 2015-09-27 01:26:22 -07:00
mirabilos
57a7f18cb3 add historic GPLv2+ to Simone’s files 
this becomes GPLv3+ when combined with Apache v2 licenced files
 2015-08-26 23:33:00 +02:00
Blindauer Emmanuel
12092e8098 Allow to reconnect with a different size while using the Xorg module 2015-08-19 07:42:00 +02:00
Jay Sorg
d91de3c1cc sesman: remove rfbDes calls 2015-08-18 17:33:13 -07:00
Jay Sorg
870437ac42 sesman: don't use hard code path for Xorg 2015-08-03 19:08:15 -07:00
itamarjp
c5cac75593 add more missing files into extra_dist 2015-07-14 12:16:25 -03:00
itamarjp
960cc62a0e add missing files into extra_dist, 
this is required when using make dist to generate a tarball
 2015-07-14 11:35:33 -03:00
Jay Sorg
6c23b85593 add timeout to trans_get_wait_objs_rw 2015-07-13 01:10:48 -07:00
Koichiro IWAO
67ff276d4d sesman: add copyright noice for code from OpenSSH 2015-06-16 06:10:30 +00:00
Koichiro IWAO
481653e5f3 sesman: merge FreeBSD local patch for session.c 
net/xrdp: effective login name is not set by xrdp-sesman
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=157282
 2015-06-16 05:44:07 +00:00
Koichiro IWAO
53ea01d51e fuse: use EIO instead of EREMOTEIO for BSDs 
FreeBSD/OpenBSD/NetBSD and OS X don't have errno EREMOTEIO.
 2015-03-18 03:18:39 +00:00
jsorg71
f9c848f3ca Merge pull request #225 from metalefty/chansrv-explicit-include 
chansrv: explicit include in chansrv_fuse.c
 2015-03-15 16:43:59 -07:00
Jay Sorg
9e310fbe06 clipboard file paste, don't add new line to last line 2015-03-13 12:58:31 -07:00
Koichiro IWAO
647c72b75b chansrv: explicit include in chansrv_fuse.c 
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.
 2015-03-13 09:15:28 +00:00
jsorg71
4f60b58b17 Merge pull request #212 from robertalks/devel 
fix possible segfault in chansrv if DISPLAY is not set
 2015-03-12 15:36:31 -07:00
Koichiro IWAO
ac9ff52c1b sesman: void function should not return a value 2015-03-12 16:48:20 +00:00
mancha
d432609c2a
sesman: fix so shadow accounts aren't incorrectly classified "inactive" 
as might happen if sp_max/sp_inact fields are empty or sp_lstchg=0.
 2015-02-18 17:32:12 +00:00
Jay Sorg
4dd78c1b8e minor change in opus encoding 2015-01-27 16:32:38 -08:00
Robert Milasan
f59c925f8b fix possible segfault in chansrv if DISPLAY is not set 2015-01-20 13:33:37 +01:00
Jay Sorg
9c5c0660b2 chansrv: reset opus support on init 2015-01-10 00:50:46 -08:00
Jay Sorg
2f5b84b712 chansrv: added opus audio compression for playback 2015-01-09 23:31:28 -08:00
Jay Sorg
bff2009147 chansrv: change to 44100 recording, disconnect / reconnect fixes 2014-11-26 16:48: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
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
c159505980 chansrv: fix for segfault issue in chansrv_common 2014-11-21 03:13:14 +02: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
Jay Sorg
f41a11d2c4 chansrv: some recording fixes 2014-11-02 22:47:51 -08:00
Jay Sorg
290bafe173 pulse: fix for recording delay 2014-11-02 20:45:14 -08:00
Jay Sorg
851c762ee7 sesman: check for null from crypt() 2014-10-29 17:54:11 -07:00
Jay Sorg
29ebab2ce5 sesman: hand merge #176 from v0.6 branch, indent changes 2014-10-20 13:39:38 -07:00
Laxmikant Rashinkar
a3e017cd58 restart listener when corresponding sound source/sink connections are closed 2014-10-18 11:22:24 -07:00
Laxmikant Rashinkar
122d8bc057 sound redirection: handle fragmented packets 2014-10-12 17:47:35 -07:00
Laxmikant Rashinkar
c0839cd6a5 when closing audio source, don't flush audio data if audio buffer is empty 2014-10-06 19:43:52 -07:00
BLINDAUER Emmanuel
b6eb6d9696 If auth fails, call pam_end so PAM backends can call _cleanup 2014-09-20 09:08:41 +02:00
Jay Sorg
d17c4a78fb chansrv: check for nil 2014-08-13 10:10:04 -07:00
Jay Sorg
9597e90b31 chansrv: allow multiple xrdpapi connections 2014-08-12 23:14:49 -07:00
Jay Sorg
748b48d870 sesman: more checks when looking for a free display 2014-08-06 13:33:12 -07:00
Jay Sorg
8397055e8b move some hard code paths to defines in header 2014-08-06 13:21:01 -07:00
Jay Sorg
e4d054654f pulse sink: check for partial sends 2014-08-06 12:11:59 -07:00
Jay Sorg
2e17b70fcd chansrv: sound_send_wave_data changes 2014-08-06 12:10:27 -07:00
Laxmikant Rashinkar
2363bf8af3 coverity: fixed miscellaneous issues 2014-08-02 11:13:12 -07:00
Laxmikant Rashinkar
162becfe55 coverity: fixed unsigned compare against 0 2014-07-28 18:16:29 -07:00
Laxmikant Rashinkar
e4654b57ca coverity: Resource leak (2nd round) 2014-07-27 15:29:12 -07:00
Laxmikant Rashinkar
a9d7c13147 coverity: read from pointer after free 2014-07-27 14:11:02 -07:00
Laxmikant Rashinkar
5e537ebdfe coverity: explicit null dereferenced 2014-07-27 12:57:13 -07:00
Laxmikant Rashinkar
0311a82c0a coverity: copy into fixed sized buffer 2014-07-27 12:42:12 -07:00
Laxmikant Rashinkar
1c423dadf4 coverity: copy into fixed sized buffer 2014-07-26 16:33:36 -07:00
Laxmikant Rashinkar
0915d33d70 coverity: dead code 2014-07-26 15:06:35 -07:00
Laxmikant Rashinkar
27055d5762 coverity: improper use of negative value 2014-07-26 13:33:23 -07:00
Laxmikant Rashinkar
fde7be5151 coverity: fixed issue argument cannot be negative 2014-07-23 19:07:38 -07:00
Laxmikant Rashinkar
0c63a8feb3 coverity: Dereference after null check 2014-07-20 16:36:33 -07:00
Laxmikant Rashinkar
a990287c46 coverity: fixed unchecked return value from library 2014-07-20 13:14:09 -07:00
Laxmikant Rashinkar
023c0b5bc1 coverity: fixed out of bounds read-write 2014-07-20 11:11:20 -07:00
Laxmikant Rashinkar
73578bc612 coverity: fixed unchecked return value 2014-07-19 13:06:25 -07:00
Laxmikant Rashinkar
3bb31876e7 coverity: fixed resolution leak issues 2014-07-19 11:56:00 -07:00
Jay Sorg
6d3af904d3 sesman: sound.c: no logic change, remove tabs and warning 2014-06-28 09:54:36 -07:00
speidy
cbc8317c6d chansrv: sound: prevent an infinite loop when the connection with pulse audio is closed improperly 2014-06-26 23:02:44 +03:00
Jay Sorg
c8e61a8042 chansrv: more remove simple sound 2014-06-07 20:22:07 -07:00
Jay Sorg
17bbecabd3 chansrv: remove simple sound and load pulse modules 2014-06-07 20:15:14 -07:00
Jay Sorg
944be3afa3 chansrv: some rail fixes from A8 2014-06-03 11:44:25 -07:00
Jay Sorg
d1ca03c9fb pcsc, add hexdump for debugging 2014-05-29 20:59:08 -07:00
Jay Sorg
d5ea23ed48 pcsc smartcard fixes form 64 bit from Ken 2014-05-29 20:45:48 -07:00
Jay Sorg
380c1f6b7d sesman: change from using PULSE_CONFIG to PULSE_SCRIPT 2014-05-10 16:08:58 -07:00
Jay Sorg
49fcc23673 sesman: added SessionVariables to sesman.ini and some indent cleanup 2014-05-09 16:02:19 -07:00
Idan Freiberg
42de994741 Merge pull request #122 from speidy/devel 
Compilation fix for pulse source module + Merge some fixes from master branch
 2014-04-28 07:07:40 +03:00
speidy
eda3a2db65 chansrv: sound: zero out ack flags when sound_send_close called, to 
avoid deadloop when chunk is sent and not acked back by the client.
 2014-04-28 00:24:20 +03:00
speidy
d7b49762fa pulseaudio: let module-xrdp-source compile on CentOS6 (PA 0.9.21) 2014-04-22 05:16:15 +03:00
speidy
e17d2375ea Merge branch 'master' of https://github.com/neutrinolabs/xrdp into devel 2014-04-22 04:23:49 +03:00
Jay Sorg
e65c237503 pulse: fix for build with pulseaudio 4.0+ 2014-04-21 00:38:08 -07:00
Jay Sorg
1934c9ea00 sesman: more options for session lookup from Fredy Paquet 2014-04-20 00:42:19 -07:00
Jay Sorg
03a5914609 chansrv: make fuse mount directory configurable 
Conflicts:

	sesman/sesman.ini
 2014-04-19 17:14:34 -07:00
jsorg71
4f4a7a8c8c Merge pull request #102 from bartw72/lock-on-add 
Set lock when adding new displays to the chain
 2014-04-17 22:07:50 -07:00
speidy
5f7a4b46fb sesman: indentation fix 2014-03-22 16:07:06 +02:00
speidy
8566230442 sesman: do reconnect to an exisitng Xorg session 2014-03-22 13:36:33 +02:00
Jay Sorg
261d35eaac misc fixes for Xorg and compile 2014-03-14 12:23:12 -07:00
Jay Sorg
c34ba69ad8 sesman: add -nolisten tcp to the ini file for Xorg 2014-03-12 23:48:16 -07:00
Laxmikant Rashinkar
6e85223a8a xorg driver module: we now access xorg driver module from /usr/lib/xorg 2014-03-09 15:50:16 -07:00
Laxmikant Rashinkar
ac6717e32e fixed some connection issues when using xorg driver mode 2014-03-09 11:24:30 -07:00
Laxmikant Rashinkar
883650700f added support for using Xorg driver model 2014-03-08 16:41:37 -08:00
Laxmikant Rashinkar
47071be4d4 simplesound: fixed CHANSRV_PORT_STR undefined error 2014-03-01 15:03:59 -08:00
Laxmikant Rashinkar
e7445a2544 o default login limit is now 50 users (instead of 10) 
o we now wait for 30 seconds for session connection (instead of 1)
o if AUTO_LOGON flag is set but username is null, we force login dialog to show up
 2014-02-28 19:28:31 -08:00
Laxmikant Rashinkar
221b049ca5 clean up temp files in /tmp/.xrdp 2014-02-24 19:49:10 -08:00
Laxmikant Rashinkar
c8e36aa91e Merge branch 'devel' of github.com:/neutrinolabs/xrdp into devel 2014-01-31 19:58:03 -08:00
Laxmikant Rashinkar
b205654e78 bringup RAIL only when we receive a RAIL command 2014-01-31 19:57:52 -08:00
Jay Sorg
f14986ec59 chansrv: fix for audio falling behind and growing memory 2014-01-29 11:04:50 -08:00
Laxmikant Rashinkar
33e6c7a834 pulseaudio: fixed some build issues 2014-01-17 19:40:13 -08:00
Laxmikant Rashinkar
82b7ccae96 we now load module-xrdp-sink/source automatically so user's dont have to mess around with configuring /etc/pulse/default.pa config file 2014-01-12 12:09:15 -08:00
Laxmikant Rashinkar
43b7b84182 missed some files for microphone redirection using rdesktop 2014-01-07 19:50:20 -08:00
Laxmikant Rashinkar
f0560e1467 added support for microphone redirection using rdesktop 2014-01-07 19:47:57 -08:00
Jay Sorg
9f8d369747 chansrv: smartcard, fix for SCardControl, SCardTransmit 2013-12-30 13:41:38 -08:00
Jay Sorg
2aa92fd6a8 chansrv: minor change in child_signal_handler 2013-12-30 13:38:40 -08:00
Jay Sorg
3e521a5298 chansrv: pcsc, fix for g_rgSCard* structs and added some debug logging 2013-12-28 19:52:47 -08:00
Jay Sorg
052153274b chansrv: mstsc SCardConnect fixes 2013-12-24 11:16:57 -08:00
Jay Sorg
38eba8aac1 chansrv: work on smartcard, mstsc and 64 bit client 2013-12-23 00:07:24 -08:00
Jay Sorg
1483c75911 chansrv: work on smartcard stability, handle multi threaded calls, app crashes, etc 2013-12-21 19:16:08 -08:00
Jay Sorg
b34cbe8a3e chansrv: got \?PnP?\Notification working, handle pcsc exit without cleanup 2013-12-19 14:05:35 -08:00
Jay Sorg
aec48211d5 chansrv: disable rail for now 2013-12-16 20:16:15 -08:00
Bart Warmerdam
6318d8ef0f Set lock when adding new displays to the chain 2013-12-16 13:52:50 +01:00
Jay Sorg
cd2eca5573 chansrv: some minor smartcard changes 2013-12-11 13:29:15 -08:00
Jay Sorg
e118463ebc chansrv: winscard.dll wrapper, fix missing GetProcAddress and added some more logging 2013-12-11 03:47:52 -08:00
Jay Sorg
3069922500 chansrv: work on smartcard 2013-12-11 03:22:00 -08:00
Jay Sorg
e85e4634c7 chansrv: added winscard.dll wrapper 2013-12-09 22:22:32 -08:00
Jay Sorg
ef51e44119 chansrv: handle smartcard session reconnect and some logging changes 2013-12-07 17:57:35 -08:00
Jay Sorg
16deb72678 chansrv: support drdynvc v3 along with v2 2013-12-07 17:52:54 -08:00
Jay Sorg
8d00fed35c chansrv: added some dumps for reference only 2013-12-05 02:52:03 -08:00
Jay Sorg
de9fa3d5fa chansrv: smartcard, more work on support for MSTSC 2013-12-05 02:22:41 -08:00
Jay Sorg
f265c14499 chansrv: smartcard, work on getting MSTSC working 2013-12-04 15:40:55 -08:00
Jay Sorg
50962fadcd chansrv: fix some warning 2013-12-04 15:34:38 -08:00
Jay Sorg
97537587a8 chansrv: remove g_sent, not needed anymore 2013-12-04 15:33:06 -08:00
Jay Sorg
1955e59a02 chansrv: fix for getstatuschange 2013-11-30 14:32:14 -08:00
Jay Sorg
3d4fbb883a chansrv: work on getting MSTSC smartcard working 2013-11-29 21:28:13 -08:00
Jay Sorg
ad0532b1bf vrplayer: work on client timing 2013-11-11 01:52:14 -08:00
Jay Sorg
2570319869 chansrv: use trans_force_write for xrdapi uds 2013-11-08 11:34:10 -08:00
Jay Sorg
a1d7479345 chansrv: smart card minor change 2013-10-24 00:53:10 -07:00
Jay Sorg
6c03868492 chansrv: fix for firefox smart card 2013-10-23 22:12:49 -07:00
Jay Sorg
2943650685 chansrv: reduce smart card debug logging 2013-10-19 16:11:14 -07:00
Jay Sorg
62bdacda9b chansrv: work on smartcard 2013-10-19 15:36:57 -07:00
Jay Sorg
b69c144c7d chansrv: work on smartcard 2013-10-18 20:56:28 -07:00
Jay Sorg
df8e6eea13 Merge remote-tracking branch 'fxrdp/master' 2013-10-17 20:39:51 -07:00
Jay Sorg
a695886f81 chansrv: work on smartcard 2013-10-16 19:32:53 -07:00
Jay Sorg
538763e144 sesman: Fedora bug 821569 2013-10-01 10:42:00 -07:00
Jay Sorg
c1b7cbd657 merges from authentic8 2013-09-26 11:28:07 -07:00
Laxmikant Rashinkar
5e005bf26c Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-09-25 18:54:16 -07:00
Laxmikant Rashinkar
52fb1f9854 scard: added more messages 2013-09-25 18:54:05 -07:00
Laxmikant Rashinkar
06f01f6c37 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-09-24 17:19:43 -07:00
Laxmikant Rashinkar
379685bfca FUSE: we now process only one opendir command at a time 2013-09-24 17:19:10 -07:00
Jay Sorg
675e1b86c4 chansrv: work on smartcard 2013-09-24 11:17:50 -07:00
Jay Sorg
3b743f64eb chansrv: deadlock, add trans copy func 2013-09-23 18:08:22 -07:00
Jay Sorg
dfd78c722b chansrv: fix for deadlock 2013-09-23 12:16:52 -07:00
Laxmikant Rashinkar
db71bc5d8b smartcard: added more messages 2013-09-20 19:00:14 -07:00
Jay Sorg
9263b22cb2 chansrv: work on smartcard 2013-09-19 01:03:20 -07:00
Jay Sorg
d926a5becd chansrv: work on smartcard 2013-09-16 00:16:21 -07:00
Jay Sorg
b206de3314 pcsc: work on pcsclite lib 2013-09-16 00:10:04 -07:00
Laxmikant Rashinkar
0ef89c02ab scard: changed the way we store and pass context 2013-09-15 15:20:16 -07:00
Laxmikant Rashinkar
a1352b62e3 scard: added more messages 2013-09-15 13:52:07 -07:00
Jay Sorg
68371ed361 chansrv: work on smartcard 2013-09-14 12:59:42 -07:00
Jay Sorg
edf483ecb6 chansrv: work on smartcard 2013-09-14 12:57:34 -07:00
Laxmikant Rashinkar
215956353f scard: added support for connect call 2013-09-13 10:20:35 -07:00
Laxmikant Rashinkar
188ca68adb scard: added GetStatusChange() msg 2013-09-11 19:42:42 -07:00
Jay Sorg
2d112bac8f chansrv: work on smart card 2013-09-09 12:30:58 -07:00
Jay Sorg
a9f37229ac chansrv: work on smartcard 2013-09-08 14:22:53 -07:00
Jay Sorg
d22b8b5ed0 chansrv: added timeout callback 2013-09-07 23:54:36 -07:00
Jay Sorg
5ef6aa20a4 pulse notes 2013-09-05 10:42:18 -07:00
Laxmikant Rashinkar
ece8f1fb47 gracefully handle segfaults in chansrv code 2013-09-03 19:44:20 -07:00
Jay Sorg
1a616a1b46 move text2bool to os_calls 2013-08-24 22:41:44 -07:00
Jay Sorg
6700eb18d7 kill disconencted, make work like man page and update man page 2013-08-24 18:53:55 -07:00
Jay Sorg
069838f355 hook up the kill disconnect timeout to the sesman config file 2013-08-24 17:57:00 -07:00
Jim Grandy
b3ee3cbd4b Another merge error in sesman/chansrv/clipboar.c 2013-08-22 13:58:43 -07:00
Jim Grandy
72ec05d37e fix merge error in sesman/chansrv/clipboard.c 2013-08-22 13:50:04 -07:00
Jim Grandy
a308d2e25c Fix errors cause by previous merge (2361914) 2013-08-22 12:57:00 -07:00
Jim Grandy
b7b3d9ef28 Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce 2013-08-22 12:56:51 -07:00
Jim Grandy
81d206ba68 Hand-apply patch (rail: send ShowState when window order changes) from Authentic8: c36a2d7 2013-08-22 12:52:32 -07:00
Jim Grandy
142a93829b Hand-apply patches (chansrv/rail) from Authentic8: 516fd1d 6a4fb28 c038a99 2013-08-22 12:52:32 -07:00
Jim Grandy
9d4205ba7a Hand-apply patch (chansrv: handle ReparentNotify) from Authentic8: 68cdc07 2013-08-22 12:52:31 -07:00
Jim Grandy
bd8083d7e2 Fix merge errors introduced in 3ae1b415 and 20ec9ee3 2013-08-22 12:52:31 -07:00
Jim Grandy
a32669f3ef Hand-apply patches (rail) from Authentic8 branch: e94d059 c36dc61 2013-08-22 12:49:41 -07:00
Jim Grandy
173ed7056f Hand-apply patches (rail) from Authentic8: b01207f b9807e9 42f0128 0f0750c aef2dce 2013-08-22 12:49:41 -07:00
Jim Grandy
af4e42a08d Hand-apply patches (rail) from Authentic8: bc68076 2013-08-22 12:49:40 -07:00
Jim Grandy
2036010e0c Hand-apply patches (rail improvements) from Authentic8 branch: 6d97878 2013-08-22 12:49:40 -07:00
Jim Grandy
53311f2b25 Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a 2013-08-22 12:49:40 -07:00
Jim Grandy
dfe5911b55 Hand-apply patches (rail improvements) from Authentic8 branch: 507694d, 0e21d45, 44447d5, e452e4f, 3d05576, dd69d8f 2013-08-22 12:49:40 -07:00
Jay Sorg
e602a28d5c common: transport aware when app is terminating 2013-08-17 13:32:53 -07:00
Laxmikant Rashinkar
09dd58c5e1 clipboard: enabled module logging 2013-08-14 20:00:52 -07:00
Laxmikant Rashinkar
6381941c78 FUSE: changed architecture to use opendir/readdir instead of just readdir 2013-08-11 18:06:39 -07:00
Laxmikant Rashinkar
d2de1b703b Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-08-09 19:44:05 -07:00
Laxmikant Rashinkar
23433c9c7e fuse: added support for detecting files/directories deleted locally 2013-08-09 19:43:45 -07:00
Jay Sorg
8b48e2274e chansrv: work on smartcard 2013-08-05 20:16:18 -07:00
Jay Sorg
e427113fa8 chansrv: work on smartcard redir 2013-08-05 01:10:57 -07:00
Jay Sorg
2515caa66a sesman: added a env var to know when xrdp session 2013-07-30 15:03:34 -07:00
Jay Sorg
17bf2abe30 xorg driver, include cleanup 2013-07-23 20:57:38 -07:00
Jay Sorg
45492057c5 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-07-02 00:45:54 -07:00
Jay Sorg
29420b3134 chansrv: no logic change, work on warning 2013-07-02 00:45:40 -07:00
speidy
aab0176867 chansrv: fix for pulse simple method, to get it work again. 2013-06-25 00:00:32 +03:00
Jay Sorg
0aa3dbe738 chansrv: no logic change, EOL and coding style cleanup 2013-06-23 14:17:59 -07:00
Lukas Vacek
1341e64062 Revert "Fix path to config.c in sesman/tools/Makefile.am" 
This reverts commit a0f8afca50.
 2013-06-22 22:22:13 +01:00
Lukas Vacek
e7fe39a65b Fix sound and clipboard crashes 
- In case clipboard is not initialized, clipboard_data_in returns
    (fixes a segfault)
- If less than 4 bytes are sent to sound_send_wave_data_chunk, it
  returns
    (fixes a segfault)
- When sending sound initiliazation messages set g_chan in chansrv to 0,
  so the server waits for client to reply (this makes sound work afte
  reconnecting)
- In process_message_channel_setup, clear any leftover data in
  chan_items
 2013-06-22 21:57:16 +01:00
Lukas Vacek
a0f8afca50 Fix path to config.c in sesman/tools/Makefile.am 2013-06-22 21:26:29 +01:00
Jay Sorg
c20b447f21 sesman: pid string match xrdp length 2013-06-19 11:43:24 -07:00
Jay Sorg
a6592ed690 sesman: fix for reading pid file 2013-06-19 11:37:26 -07:00
Laxmikant Rashinkar
78498f6682 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-06-08 18:44:34 -07:00
Laxmikant Rashinkar
6ad1d7f78d folder redirection: fixed language issues 2013-06-08 18:44:21 -07:00