Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1500799 -
 /subversion/trunk/subversion/libsvn_subr/gpg_agent.c
Date: Mon, 08 Jul 2013 15:34:55 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20130708153455.878652388860@eris.apache.org>

Author: stsp
Date: Mon Jul  8 15:34:55 2013
New Revision: 1500799

URL: http://svn.apache.org/r1500799
Log:
* subversion/libsvn_subr/gpg_agent.c
  (password_set_gpg_agent): Don't require GPG_TTY to be set in the environment.
   This variable is only needed in some GPG Agent configurations, and we should
   allow other configurations to work as well. For example, a GUI app might
   talk to GPG agent without a TTY. Apparently, this is the case on Mac OS X,
   according to Ben Reser.

Modified:
    subversion/trunk/subversion/libsvn_subr/gpg_agent.c

Modified: subversion/trunk/subversion/libsvn_subr/gpg_agent.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/gpg_agent.c?rev=1500799&r1=1500798&r2=1500799&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Mon Jul  8 15:34:55 2013
@@ -415,7 +415,7 @@ password_get_gpg_agent(svn_boolean_t *do
    worked.  But it isn't.  GPG Agent stores the password provided by
    the user via the pinentry program immediately upon its provision
    (and regardless of its accuracy as passwords go), so we just need
-   to check if a usable GPG Agent exists. */
+   to check if a running GPG Agent exists. */
 static svn_error_t *
 password_set_gpg_agent(svn_boolean_t *done,
                        apr_hash_t *creds,
@@ -436,11 +436,7 @@ password_set_gpg_agent(svn_boolean_t *do
     return SVN_NO_ERROR;
 
   close(sd);
-
-  /* Also ensure that GPG_TTY is set in the evironment.
-   * If it isn't set the user won't be prompted by the agent. */
-  tty_name = getenv("GPG_TTY");
-  *done = (tty_name != NULL);
+  *done = TRUE;
 
   return SVN_NO_ERROR;
 }