Ensure that umask is set at a sensible value before building the chroot.

Since the unprivileged process needs to be able to read /etc/localtime
in the chroot, we ensure that the umask is set correctly for this.

diff --git a/debian/lldpd.init.d b/debian/lldpd.init.d
index 9e09ed596fd4cf3311b748b8c3296842d3c89d26..525f057ca49ba3bdafff608086450d5a551edc15 100644 (file)
--- a/debian/lldpd.init.d
+++ b/debian/lldpd.init.d
@@ -31,10 +31,12 @@ CHROOT=/var/run/$NAME
 
 do_chroot()
 {
-       [ -d $CHROOT ] || mkdir -p $CHROOT
-       [ -d $CHROOT/etc ] || mkdir $CHROOT/etc
+       oldumask=$(umask)
+       umask 022
+       [ -d $CHROOT/etc ] || mkdir -p $CHROOT/etc
        [ -f $CHROOT/etc/localtime ] || [ ! -f /etc/localtime ] || \
                cp /etc/localtime $CHROOT/etc/localtime
+       umask $oldumask
 }
 
 do_start()

diff --git a/redhat/lldpd.init b/redhat/lldpd.init
index 9a2056e4cb3fa30d7deb605a80506513384a9030..67f521fc6f8d85705b2f97310eda684fba36adde 100644 (file)
--- a/redhat/lldpd.init
+++ b/redhat/lldpd.init
@@ -36,10 +36,12 @@ chroot=/var/run/lldpd
 
 build_chroot()
 {
-        [ -d $chroot ] || mkdir -p $chroot
-        [ -d $chroot/etc ] || mkdir $chroot/etc
+        oldumask=$(umask)
+        umask 022
+        [ -d $chroot/etc ] || mkdir -p $chroot/etc
         [ -f $chroot/etc/localtime ] || [ ! -f /etc/localtime ] || \
                 cp /etc/localtime $chroot/etc/localtime
+        umask $oldumask
 }
 
 start() {