Skip to content

Commit

Permalink
chkpriv: respect $sysconfdir for config files directory
Browse files Browse the repository at this point in the history
While here, ignore build artifacts of chkpriv tools.

Follow-up to:   neutrinolabs#2974
  • Loading branch information
metalefty authored and nedix committed Oct 4, 2024
1 parent f0b58ca commit aef10ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ tests/libxrdp/test_libxrdp
tests/memtest/memtest
tests/xrdp/test_xrdp
tools/devel/tcp_proxy/tcp_proxy
tools/chkpriv/xrdp-chkpriv
tools/chkpriv/xrdp-droppriv
*.trs
waitforx/waitforx
xrdp/xrdp
Expand Down
3 changes: 2 additions & 1 deletion tools/chkpriv/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ xrdp_droppriv_LDADD = \
$(top_builddir)/common/libcommon.la

SUBST_VARS = sed \
-e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g'
-e 's|@pkglibexecdir[@]|$(pkglibexecdir)|g' \
-e 's|@sysconfdir[@]|$(sysconfdir)|g'

subst_verbose = $(subst_verbose_@AM_V@)
subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
Expand Down
2 changes: 1 addition & 1 deletion tools/chkpriv/xrdp-chkpriv.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# mode

# Change these if they do not match your installation
CONF_DIR=/etc/xrdp
CONF_DIR=@sysconfdir@/xrdp
XRDP_INI="$CONF_DIR"/xrdp.ini
SESMAN_INI="$CONF_DIR"/sesman.ini
RSAKEYS_INI="$CONF_DIR"/rsakeys.ini
Expand Down

0 comments on commit aef10ff

Please sign in to comment.