From 41fa315b49f9171f0f6f8cc142bcae296697bb09 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 9 Jun 2009 21:54:24 +0000
Subject: [PATCH] Use interactive console certificate accept in headless and/or
 server mode

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@581 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/http/DavGatewayX509TrustManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/davmail/http/DavGatewayX509TrustManager.java b/src/java/davmail/http/DavGatewayX509TrustManager.java
index 7965b369..8ddf983f 100644
--- a/src/java/davmail/http/DavGatewayX509TrustManager.java
+++ b/src/java/davmail/http/DavGatewayX509TrustManager.java
@@ -39,7 +39,7 @@ public class DavGatewayX509TrustManager implements X509TrustManager {
             // first try standard Trust Manager
             this.standardTrustManager.checkServerTrusted(x509Certificates, authType);
         } catch (CertificateException e) {
-            if ((x509Certificates != null) && (x509Certificates.length > 0) && !GraphicsEnvironment.isHeadless()) {
+            if ((x509Certificates != null) && (x509Certificates.length > 0)) {
                 userCheckServerTrusted(x509Certificates);
             } else {
                 throw e;
@@ -65,8 +65,8 @@ public class DavGatewayX509TrustManager implements X509TrustManager {
             DavGatewayTray.debug(new BundleMessage("LOG_FOUND_ACCEPTED_CERTIFICATE", acceptedCertificateHash));
         } else {
             boolean isCertificateTrusted;
-            if (Settings.getBooleanProperty("davmail.server")) {
-                // headless mode
+            if (Settings.getBooleanProperty("davmail.server") || GraphicsEnvironment.isHeadless()) {
+                // headless or server mode
                 isCertificateTrusted = isCertificateTrusted(x509Certificates[0]);
             } else {
                 isCertificateTrusted = AcceptCertificateDialog.isCertificateTrusted(x509Certificates[0]);