[Pkg-xfce-devel] Bug#666104: xfce4 should not start ssh-agent if does not exist

[Alexander Gerasiov]

Package: xfce4-utils
Severity: normal

reopen 659921
tag 659921 +patch
severity 659921 minor
thanks

Salut, Yves-Alexis.

I was summoned to this thread by bugreporter. You was not really correct
with this bug, may be because of some misunderstanding and some errors
in bugreport itself. As a result, this produce some personal offence againt
the project. So excuse me my intervention, I just was to calm down both of you.


As I can see, the problem itself is really simple:
init script doesn't check is ssh-agent exists, and this provide error
message in log in such case. This is not critical, just not really
accurate.

The problem is not in the line Miklos reported. I've prepared the
patch, which should fix the problem, I believe. But I had no ability to test it
yet. If you have not enough time to test is yourself, please tell me, I'll test
it later.

Best wishes to both of you, guys.
-------------- next part --------------
--- xinitrc.in.orig	2012-04-03 11:13:13.960286467 +0400
+++ xinitrc.in	2012-04-03 11:21:47.240271779 +0400
@@ -139,8 +139,10 @@
     if test -z "$ssh_agent_type"; then
         if which gpg-agent >/dev/null 2>&1; then
             ssh_agent_type=gpg-agent
-        else
+        else if which ssh-agent >/dev/null 2>&1; then
             ssh_agent_type=ssh-agent
+        else
+            ssh_agent_type=
         fi
     fi
 
@@ -152,8 +154,8 @@
         fi
     fi
 
-    case "$ssh_agent_type" in
-        gpg-agent)
+    case "x$ssh_agent_type" in
+        xgpg-agent)
             if test -z "$SSH_AGENT_PID"; then
                 eval `gpg-agent --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info`
                 ssh_agent_kill_cmd="kill -INT $SSH_AGENT_PID; rm -f $XDG_CACHE_HOME/gpg-agent-info"
@@ -166,7 +168,7 @@
             fi
             ;;
 
-        ssh-agent)
+        xssh-agent)
             if test -z "$SSH_AGENT_PID"; then
                 eval `ssh-agent -s`
                 ssh_agent_kill_cmd="ssh-agent -s -k"
@@ -175,6 +177,10 @@
             fi
             ;;
 
+        x)
+            echo "ssh-agent is not installed."
+            ;;
+
         *)
             echo "Unrecognized agent type '$ssh_agent_type'" >&2
             ;;