diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2017-03-14 21:45:50 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2017-03-17 22:25:05 -0700 |
| commit | 58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5 (patch) | |
| tree | 4440da8a15401e221175c4b6d3df6c44253e3f2e /docs | |
| parent | fc2572f60b574cf5bc45f1c7b58698681f39ac50 (diff) | |
| download | xrdp-proprietary-58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5.tar.gz xrdp-proprietary-58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5.zip | |
Make socket directory configurable, don't hardcode /tmp/.xrdp
Use XRDP_SOCKET_PATH in file_loc.h
Don't define any non-socket paths in file_loc.h, they should come from
the makefiles.
Define all paths unconditionally, they should not be defined elsewhere.
Pass XRDP_SOCKET_PATH as environment variable to the backends.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/man/Makefile.am | 3 | ||||
| -rw-r--r-- | docs/man/xrdp-chansrv.8.in | 4 | ||||
| -rw-r--r-- | docs/man/xrdp-dis.1.in | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 705def0c..f6e0bd5a 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -17,7 +17,8 @@ SUBST_VARS = sed \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|@bindir[@]|$(bindir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@sysconfdir[@]|$(sysconfdir)|g' + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@socketdir[@]|$(socketdir)|g' subst_verbose = $(subst_verbose_@AM_V@) subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@) diff --git a/docs/man/xrdp-chansrv.8.in b/docs/man/xrdp-chansrv.8.in index 332a1907..62edd3b2 100644 --- a/docs/man/xrdp-chansrv.8.in +++ b/docs/man/xrdp-chansrv.8.in @@ -30,10 +30,10 @@ Dynamic Virtual Channel .SH FILES .TP -.I /tmp/.xrdp/xrdp_chansrv_socket_* +.I @socketdir@/xrdp_chansrv_socket_* UNIX socket used by external programs to implement channels. .TP -.I /tmp/.xrdp/xrdp_api_* +.I @socketdir@/xrdp_api_* UNIX socket used by \fBxrdp\-chansrv\fP to communicate with \fBxrdp\-sesman\fP. .TP .I $XDG_DATA_HOME/xrdp/xrdp-chansrv.log diff --git a/docs/man/xrdp-dis.1.in b/docs/man/xrdp-dis.1.in index 54ba5db2..2015389f 100644 --- a/docs/man/xrdp-dis.1.in +++ b/docs/man/xrdp-dis.1.in @@ -16,7 +16,7 @@ to get the default host and display number. .SH FILES .TP -.I /tmp/.xrdp/xrdp_disconnect_display_* +.I @socketdir@/xrdp_disconnect_display_* UNIX socket used to communicate with the \fBxrdp\fP(8) session manager. .SH KNOWN ISSUES |