svn commit: r1150961 - /subversion/trunk/subversion/libsvn_subr/gpg_agent.c

[st...@apache.org]

Author: stsp
Date: Tue Jul 26 00:05:09 2011
New Revision: 1150961

URL: http://svn.apache.org/viewvc?rev=1150961&view=rev
Log:
* subversion/libsvn_subr/gpg_agent.c
  (password_get_gpg_agent): While having the CLI prompt and GPG-Agent prompt
   match up is kind of neat, we should try to minimise the risk of someone
   entering a PGP passphrase into the GPG-Agent dialog.
   So say "Enter your Subversion password for <realm>", instead of
   "Authentication realm: <realm>". Hopefully that is clear enough to
   prevent bad mistakes.  Also, remove a comment that is now obsolete.

Suggested by: danielsh

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=1150961&r1=1150960&r2=1150961&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/gpg_agent.c (original)
+++ subversion/trunk/subversion/libsvn_subr/gpg_agent.c Tue Jul 26 00:05:09 2011
@@ -304,17 +304,12 @@ password_get_gpg_agent(const char **pass
                pool);
   cache_id = svn_checksum_to_cstring(digest, pool);
 
-  /* A newline is required to terminate the GET_PASSPHRASE command.
-   * We append it to REALM_PROMPT because it is the last argument of
-   * the format string below, and because both of the prompt strings
-   * already exist elsewhere in this exact form so they will only
-   * have to be translated once for i18n. */
   password_prompt = apr_psprintf(pool, _("Password for '%s': "), username);
-  realm_prompt = apr_psprintf(pool, _("Authentication realm: %s\n"),
+  realm_prompt = apr_psprintf(pool, _("Enter your Subversion password for %s"),
                               realmstring);
   request = apr_psprintf(pool,
                          "GET_PASSPHRASE --data %s--repeat=1 "
-                         "%s X %s %s",
+                         "%s X %s %s\n",
                          non_interactive ? "--no-ask " : "",
                          cache_id,
                          escape_blanks(password_prompt),