ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r677532 - in /ant/core/trunk: WHATSNEW docs/manual/OptionalTasks/scp.html src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Date Thu, 17 Jul 2008 08:22:55 GMT
Author: bodewig
Date: Thu Jul 17 01:22:54 2008
New Revision: 677532

URL: http://svn.apache.org/viewvc?rev=677532&view=rev
Log:
SSH keyfiles can be password-less.  PR 33718.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/docs/manual/OptionalTasks/scp.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=677532&r1=677531&r2=677532&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Jul 17 01:22:54 2008
@@ -203,6 +203,10 @@
 
  * <sql> "output" attribute now supports any Resource in addition to a file.
 
+ * <scp> no longer requires a passphrase when using key based
+   authentication.
+   Bugzilla report 33718.
+
 Changes from Ant 1.7.0 TO Ant 1.7.1
 =============================================
 

Modified: ant/core/trunk/docs/manual/OptionalTasks/scp.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/OptionalTasks/scp.html?rev=677532&r1=677531&r2=677532&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/scp.html (original)
+++ ant/core/trunk/docs/manual/OptionalTasks/scp.html Thu Jul 17 01:22:54 2008
@@ -156,8 +156,7 @@
   <tr>
     <td valign="top">passphrase</td>
      <td valign="top">Passphrase for your private key.</td>
-     <td valign="top" align="center">Yes, if you are using key based
-     authentication.</td>
+     <td valign="top" align="center">No, defaults to an empty string.</td>
   </tr>
   <tr>
     <td valign="top">verbose</td>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java?rev=677532&r1=677531&r2=677532&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java Thu Jul 17
01:22:54 2008
@@ -353,15 +353,15 @@
             setUsername(uri.substring(0, indexOfColon));
             setPassword(uri.substring(indexOfColon + 1, indexOfAt));
         } else if (indexOfAt > -1) {
-            // no password, will require passphrase
+            // no password, will require keyfile
             setUsername(uri.substring(0, indexOfAt));
         } else {
             throw new BuildException("no username was given.  Can't authenticate."); 
         }
 
         if (getUserInfo().getPassword() == null
-            && getUserInfo().getPassphrase() == null) {
-            throw new BuildException("neither password nor passphrase for user "
+            && getUserInfo().getKeyfile() == null) {
+            throw new BuildException("neither password nor keyfile for user "
                                      + getUserInfo().getName() + " has been "
                                      + "given.  Can't authenticate.");
         }



Mime
View raw message