From ec53a0398d22d27fdb21b23fc1f3d1f8c37d3db6 Mon Sep 17 00:00:00 2001
From: Alexandre Quesnel <131881+aquesnel@users.noreply.github.com>
Date: Tue, 8 Sep 2020 17:16:09 +0000
Subject: [PATCH 1/2] Enabling fuse for 32-bit CI builds

---
 .travis.yml  | 10 +++++-----
 configure.ac |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45332ed5..328f031d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,17 +82,17 @@ max_x86_deps: &max_x86_deps
   - libxrandr-dev:i386
   - libxrender-dev:i386
   - openssl:i386
+  - libfuse-dev:i386
 
 # No --enable-pixman to allow testing the replacement code
-# No --enable-fuse due to failing libfuse-dev:i386 package install
 max_x86_conf: &max_x86_conf
   env:
-    - CONF_FLAGS="--enable-ipv6 --enable-jpeg --disable-fuse --enable-mp3lame
+    - CONF_FLAGS="--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
                   --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
                   --disable-pixman --host=i686-linux"
     - PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
-    - CFLAGS=-m32
-    - LDFLAGS=-m32
+    - CFLAGS="-m32"
+    - LDFLAGS="-m32"
   addons:
     apt:
       packages:
@@ -154,5 +154,5 @@ matrix:
 script:
   - ./bootstrap
   - ./configure $CONF_FLAGS
-  - make CFLAGS="$CFLAGS"
+  - make
   - test -z "$DISTCHECK" || make distcheck
diff --git a/configure.ac b/configure.ac
index 8a2d2301..bdd8d584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,6 +406,9 @@ echo "  exec_prefix             $exec_prefix"
 echo "  libdir                  $libdir"
 echo "  bindir                  $bindir"
 echo "  sysconfdir              $sysconfdir"
+echo ""
+echo "  CFLAGS = $CFLAGS"
+echo "  LDFLAGS = $LDFLAGS"
 
 # xrdp_configure_options.h will be written to the build directory, not the source directory
 echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h

From a7462404d5dbf3a1b8a041851aee3dfd00f8c83f Mon Sep 17 00:00:00 2001
From: Alexandre Quesnel <131881+aquesnel@users.noreply.github.com>
Date: Tue, 8 Sep 2020 21:04:02 +0000
Subject: [PATCH 2/2] Adding casts for narrowing to pointer width for issue
 #1678

---
 sesman/chansrv/chansrv_fuse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c
index 62ee050a..2f043d7a 100644
--- a/sesman/chansrv/chansrv_fuse.c
+++ b/sesman/chansrv/chansrv_fuse.c
@@ -1607,7 +1607,7 @@ static void xfuse_cb_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
         log_error("inode %ld is not valid", ino);
         fuse_reply_err(req, ENOENT);
     }
-    else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL)
+    else if ((dh = (struct xfs_dir_handle *) (tintptr) fi->fh) == NULL)
     {
         /* something seriously wrong somewhere! */
         fuse_reply_buf(req, 0, 0);
@@ -2095,7 +2095,7 @@ static void xfuse_cb_read(fuse_req_t req, fuse_ino_t ino, size_t size,
 
     log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
 
-    if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
+    if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
     {
         fuse_reply_err(req, EINVAL);
     }
@@ -2168,7 +2168,7 @@ static void xfuse_cb_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
     log_debug("write %zd bytes at off %lld to inode=%ld",
               size, (long long) off, ino);
 
-    if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
+    if ((fh = (XFUSE_HANDLE *) (tintptr) fi->fh) == NULL)
     {
         log_error("file handle fi->fh is NULL");
         fuse_reply_err(req, EINVAL);
@@ -2436,7 +2436,7 @@ static void xfuse_cb_opendir(fuse_req_t req, fuse_ino_t ino,
 static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
                                 struct fuse_file_info *fi)
 {
-    struct xfs_dir_handle *dh = (struct xfs_dir_handle *) fi->fh;
+    struct xfs_dir_handle *dh = (struct xfs_dir_handle *) (tintptr) fi->fh;
     xfs_closedir(g_xfs, dh);
     fuse_reply_err(req, 0);
 }