From 9ed5243de9c8cb511a38b2ee09c3f8be76c40065 Mon Sep 17 00:00:00 2001
From: Vraiment <jemc44@gmail.com>
Date: Thu, 8 Feb 2018 02:28:16 -0800
Subject: [PATCH] Make xrdp.ini to be dynamic for each operating system

---
 .gitignore                     |  1 +
 xrdp/Makefile.am               | 17 +++++++++++++++++
 xrdp/{xrdp.ini => xrdp.ini.in} | 14 +++++++-------
 3 files changed, 25 insertions(+), 7 deletions(-)
 rename xrdp/{xrdp.ini => xrdp.ini.in} (95%)

diff --git a/.gitignore b/.gitignore
index a6c180ee..2ddb7ce1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ sesman/xrdp-sesman
 *.so
 stamp-h1
 xrdp/xrdp
+xrdp/xrdp.ini
diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
index a259ef32..fe14d88d 100644
--- a/xrdp/Makefile.am
+++ b/xrdp/Makefile.am
@@ -67,6 +67,23 @@ xrdp_LDADD = \
 
 xrdpsysconfdir=$(sysconfdir)/xrdp
 
+if MACOS
+lib_extension = dylib
+else
+lib_extension = so
+endif
+
+SUBST_VARS = sed \
+   -e 's|@lib_extension[@]|$(lib_extension)|g'
+
+subst_verbose = $(subst_verbose_@AM_V@)
+subst_verbose_ = $(subst_verbose_@AM_DEFAULT_V@)
+subst_verbose_0 = @echo "  SUBST    $@";
+
+SUFFIXES = .in
+.in:
+	$(subst_verbose)$(SUBST_VARS) $< > $@
+
 dist_xrdpsysconf_DATA = \
   xrdp.ini \
   xrdp_keyboard.ini
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini.in
similarity index 95%
rename from xrdp/xrdp.ini
rename to xrdp/xrdp.ini.in
index e3ae2841..fb09bbd9 100644
--- a/xrdp/xrdp.ini
+++ b/xrdp/xrdp.ini.in
@@ -155,7 +155,7 @@ tcutils=true
 ; in sesman.ini. See and configure also sesman.ini.
 [Xorg]
 name=Xorg
-lib=libxup.so
+lib=libxup.@lib_extension@
 username=ask
 password=ask
 ip=127.0.0.1
@@ -164,7 +164,7 @@ code=20
 
 [X11rdp]
 name=X11rdp
-lib=libxup.so
+lib=libxup.@lib_extension@
 username=ask
 password=ask
 ip=127.0.0.1
@@ -174,7 +174,7 @@ code=10
 
 [Xvnc]
 name=Xvnc
-lib=libvnc.so
+lib=libvnc.@lib_extension@
 username=ask
 password=ask
 ip=127.0.0.1
@@ -184,7 +184,7 @@ port=-1
 
 [console]
 name=console
-lib=libvnc.so
+lib=libvnc.@lib_extension@
 ip=127.0.0.1
 port=5900
 username=na
@@ -193,7 +193,7 @@ password=ask
 
 [vnc-any]
 name=vnc-any
-lib=libvnc.so
+lib=libvnc.@lib_extension@
 ip=ask
 port=ask5900
 username=na
@@ -205,7 +205,7 @@ password=ask
 
 [sesman-any]
 name=sesman-any
-lib=libvnc.so
+lib=libvnc.@lib_extension@
 ip=ask
 port=-1
 username=ask
@@ -214,7 +214,7 @@ password=ask
 
 [neutrinordp-any]
 name=neutrinordp-any
-lib=libxrdpneutrinordp.so
+lib=libxrdpneutrinordp.@lib_extension@
 ip=ask
 port=ask3389
 username=ask