On Sun, Sep 18, 2011 at 16:53:13 +0200, Luca Capello wrote:
> --8<---------------cut here---------------start------------->8---
> --- 90x11-common_ssh-agent.ORG
> +++ 90x11-common_ssh-agent
> @@ -9,10 +9,15 @@
> if has_option use-ssh-agent; then
> if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
> && [ -z "$SSH2_AUTH_SOCK" ]; then
> - STARTSSH=yes
> - if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
> - # use ssh-agent2's ssh-agent1 compatibility mode
> - SSHAGENTARGS=-1
> + # check if gpg-agent will be started with SSH support
> + : ${GNUPGHOME=$HOME/.gnupg}
> + if ! ( grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" && \
> + grep -qs '^[[:space:]]*enable-ssh-support' "$GNUPGHOME/gpg-agent.conf" ); then
> + STARTSSH=yes
> + if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
> + # use ssh-agent2's ssh-agent1 compatibility mode
> + SSHAGENTARGS=-1
> + fi
> fi
> fi
> fi
> --8<---------------cut here---------------end--------------->8---
>
NAK, as far as I'm concerned this script has no business looking around
in gpg.conf.
Cheers,
Julien
Attachment:
signature.asc
Description: Digital signature