You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by br...@apache.org on 2004/06/25 20:41:31 UTC
cvs commit: maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh ScpWagon.java
brett 2004/06/25 11:41:31
Modified: wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh
ScpWagon.java
Log:
allow empty passphrase to SCP deployer's private key
Revision Changes Path
1.9 +21 -4 maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Index: ScpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ScpWagon.java 21 Jun 2004 17:16:22 -0000 1.8
+++ ScpWagon.java 25 Jun 2004 18:41:31 -0000 1.9
@@ -108,9 +108,7 @@
{
if ( authInfo.getPassphrase() == null )
{
- String msg = "Private key provided " + "without passphrase for repo: " + getRepository().getName();
-
- throw new AuthenticationException( msg );
+ authInfo.setPassphrase( "" );
}
fireSessionDebug( "Using private key: " + privateKey );
@@ -285,9 +283,27 @@
throw new TransferFailedException( msg );
}
+ byte[] buf = new byte[1024];
+
// send a content of lfile
FileInputStream fis = new FileInputStream( source );
+<<<<<<< ScpWagon.java
+ try
+ {
+ while ( true )
+ {
+ int len = fis.read( buf, 0, buf.length );
+ if ( len <= 0 ) break;
+ out.write( buf, 0, len );
+ out.flush();
+ }
+ }
+ finally
+ {
+ fis.close();
+ }
+=======
putTransfer( resource, source, fis, out, false );
byte[] buf = new byte[1024];
@@ -302,6 +318,7 @@
//
// out.flush();
// }
+>>>>>>> 1.8
// send '\0'
buf[0] = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org