[Libreoffice-commits] online.git: loolwsd-systemplate-setup

[Libreoffice Gerrit user]

 loolwsd-systemplate-setup |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1dbc88a32bff317b5249078586797aae72f431fe
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Dec 2 14:30:28 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Dec 2 18:32:34 2018 +0100

    Fix domain name resolution from jail by adding required libs to systemplate
    
    Originally all was good, then ad21717498cc214d5d5d5c0ff378238552137e2f
    removed these files from jail, therefore name resolution broke, then
    ac7d67f43e2b82dcc841ca2ecae91e668eb90613 added back libnss_* libs from one location, which
    happened to work on developer's computer, then 4e5528e5f8b6abbd9ca715d5ac0ec410cbc783af,
    b4f15c714ae5fb5208f4267a76effe8c4f54a4e7, and 9c0ab7215568b53ce4a26de00900f9c6fa36b508
    added back etc/hosts etc/nsswitch.conf etc/resolv.conf that were also needed for proper
    name resolution, finally this patch adds some more possible locations of Name Service
    Switch (NSS) libs, therefore it makes sure that the required libnss_* shared libs
    are found e.g. on Debian based systems. Also, testing with libreoffice/online docker image
    has shown that libresolv.so.2 is also required in systemplate for name resolution, although
    on some other systems it was not needed (preload?).
    
    This fixes two bugs:
    1) Linked images in documents were not displayed on certain systems
    2) Insert image from WOPI host did not work on certain systems
    
    Change-Id: I5d09a65341050f0f729bdbc46977c0f686ac023c
    Reviewed-on: https://gerrit.libreoffice.org/64426
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index b70861834..09d5265fc 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -24,7 +24,8 @@ cd / || exit 1
 find etc/hosts etc/nsswitch.conf etc/resolv.conf \
      etc/ld.so.* \
      lib/ld-* lib64/ld-* \
-     lib64/libnss_* \
+     lib/libnss_* lib64/libnss_* lib/*/libnss_* \
+     lib/libresolv* lib64/libresolv* lib/*/libresolv* \
      var/cache/fontconfig \
      etc/fonts \
      etc/localtime \
@@ -41,7 +42,8 @@ find etc/hosts etc/nsswitch.conf etc/resolv.conf \
 find etc/fonts \
      etc/resolv.conf \
      lib/ld-* lib64/ld-* \
-     lib64/libnss_* \
+     lib/libnss_* lib64/libnss_* lib/*/libnss_* \
+     lib/libresolv* lib64/libresolv* lib/*/libresolv* \
      usr/lib/*/libsqlite* \
 	-type l 2>/dev/null