From a3bbe9f596f9a8e29f8971b7276a4f4f2d2d037b Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Sun, 6 Jan 2013 21:46:32 +0000
Subject: [PATCH] PR 53437prevent ssh tasks from prompting for kerberos
 username/password under Java 7

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1429602 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                     | 5 ++++-
 .../org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WHATSNEW b/WHATSNEW
index 5ace6c07f..bcab2c871 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,4 +1,4 @@
-Changes from Ant 1.8.4 TO Ant 1.9.0
+    Changes from Ant 1.8.4 TO Ant 1.9.0
 ===================================
 
 Changes that could break older environments:
@@ -59,6 +59,9 @@ Fixed bugs:
  * <get> now supports HTTP redirects using status code 307.
    Bugzilla Report 54374.
 
+ * ssh tasks prompt for kerberos username/password under Java 7
+   Bugzilla Report 53437.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
index 9250be93a..5e14d8729 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
@@ -218,6 +218,8 @@ public abstract class SSHBase extends Task implements LogListener {
         }
 
         Session session = jsch.getSession(userInfo.getName(), host, port);
+        session.setConfig("PreferredAuthentications",
+                "publickey,keyboard-interactive,password");
         session.setUserInfo(userInfo);
         log("Connecting to " + host + ":" + port);
         session.connect();