[Xfce4-commits] [xfce/xfce4-session] 01/01: Xflock: bypass null/blank LockCommand parameter (Bug #11764)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-session.

commit 495aac78058cd78e2d34505af204e72a1b4f19ac
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sat Mar 28 06:16:10 2015 +0300

    Xflock: bypass null/blank LockCommand parameter (Bug #11764)
    
    Commit http://git.xfce.org/xfce/xfce4-session/commit/?id=e940818853582290af21bf38d73ee26143d500ad
    breaks xflock4 functionality if the xfconf LockCommand parameter doesn't exist or
    is a blank entry. The
    $lock_cmd >/dev/null 2>&1 && exit
    will run a blank (empty string) and then exist, never getting to the other items
    in the list.
    Bug report and patch provided by ToZ.
---
 scripts/xflock4 |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/xflock4 b/scripts/xflock4
index 7d857d3..32770b4 100644
--- a/scripts/xflock4
+++ b/scripts/xflock4
@@ -33,7 +33,9 @@ for lock_cmd in \
     "xscreensaver-command -lock" \
     "gnome-screensaver-command --lock"
 do
-    $lock_cmd >/dev/null 2>&1 && exit
+    if [ ! -z "$lock_cmd" ]; then
+        $lock_cmd >/dev/null 2>&1 && exit
+    fi
 done
 
 # else run another access locking utility, if installed

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.