upd: move external keywords to own class

[gigi.git] / src / org / cacert / gigi / email / EmailProvider.java

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index f0e5f95e87ce5c3f9770ba6c48e9a1679c73b83d..c053caf8151cc7278c61adc092812c8bfa47ac78 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -23,6 +23,7 @@ import org.cacert.gigi.crypto.SMIME;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.util.DNSUtil;
 import org.cacert.gigi.util.DomainAssessment;
+import org.cacert.gigi.util.SystemKeywords;
 
 public abstract class EmailProvider {
 
@@ -112,7 +113,7 @@ public abstract class EmailProvider {
                         continue;
                     }
 
-                    pw.print("EHLO www.cacert.org\r\n");
+                    pw.print("EHLO " + SystemKeywords.SMTP_NAME + "\r\n");
                     pw.flush();
                     boolean starttls = false;
                     do {
@@ -135,14 +136,14 @@ public abstract class EmailProvider {
                         Socket s1 = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(s, host, 25, true);
                         br = new BufferedReader(new InputStreamReader(s1.getInputStream(), "UTF-8"));
                         pw = new PrintWriter(new OutputStreamWriter(s1.getOutputStream(), "UTF-8"));
-                        pw.print("EHLO www.cacert.org\r\n");
+                        pw.print("EHLO " + SystemKeywords.SMTP_NAME + "\r\n");
                         pw.flush();
                         if ( !SendMail.readSMTPResponse(br, 250)) {
                             continue;
                         }
                     }
 
-                    pw.print("MAIL FROM: <returns@cacert.org>\r\n");
+                    pw.print("MAIL FROM: <" + SystemKeywords.SMTP_PSEUDO_FROM + ">\r\n");
                     pw.flush();
 
                     if ( !SendMail.readSMTPResponse(br, 250)) {