jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add ipv6only to configure echo and add configure parameter to xrdp -h output

Browse Source
This commit is contained in:
Jay Sorg 2018-05-23 22:09:45 -07:00 committed by jsorg71
parent a1576ccbf7
commit 349616a35d
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -43,3 +43,4 @@ sesman/sesman.ini
stamp-h1 stamp-h1
xrdp/xrdp xrdp/xrdp
xrdp/xrdp.ini xrdp/xrdp.ini
configure_params.h

4
configure.ac
View File

@ -58,7 +58,7 @@ AC_ARG_WITH([socketdir],
AC_SUBST([socketdir], [$with_socketdir]) AC_SUBST([socketdir], [$with_socketdir])
AC_ARG_WITH([systemdsystemunitdir], AC_ARG_WITH([systemdsystemunitdir],
AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files, no to disable]),
[], [ [], [
if test "x$linux" = xyes; then if test "x$linux" = xyes; then
with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
@ -385,6 +385,7 @@ echo " painter $enable_painter"
echo " pixman $enable_pixman" echo " pixman $enable_pixman"
echo " fuse $enable_fuse" echo " fuse $enable_fuse"
echo " ipv6 $enable_ipv6" echo " ipv6 $enable_ipv6"
echo " ipv6only $enable_ipv6only"
echo " vsock $enable_vsock" echo " vsock $enable_vsock"
echo " pam $enable_pam" echo " pam $enable_pam"
echo " kerberos $enable_kerberos" echo " kerberos $enable_kerberos"
@ -396,3 +397,4 @@ echo " exec_prefix $exec_prefix"
echo " libdir $libdir" echo " libdir $libdir"
echo " bindir $bindir" echo " bindir $bindir"
echo " sysconfdir $sysconfdir" echo " sysconfdir $sysconfdir"
echo "#define CONFIGURE_STRING \"$@\"" > configure_params.h

5
xrdp/xrdp.c
View File

@ -24,6 +24,7 @@
#include "xrdp.h" #include "xrdp.h"
#include "log.h" #include "log.h"
#include "configure_params.h"
#if !defined(PACKAGE_VERSION) #if !defined(PACKAGE_VERSION)
#define PACKAGE_VERSION "???" #define PACKAGE_VERSION "???"
@ -62,6 +63,10 @@ print_version(void)
void void
print_help(void) print_help(void)
{ {
#if defined(CONFIGURE_STRING)
g_writeln("xrdp configure command line parameters [%s]", CONFIGURE_STRING);
g_writeln("%s", "");
#endif
g_writeln("Usage: xrdp [options]"); g_writeln("Usage: xrdp [options]");
g_writeln(" -h, --help show help"); g_writeln(" -h, --help show help");
g_writeln(" -n, --nodaemon don't fork into background"); g_writeln(" -n, --nodaemon don't fork into background");