Allow ports 465 and 587 in the default exit policy again. We had

rejected them in 0.1.0.15, because back in 2005 they were commonly
misconfigured and ended up as spam targets. We hear they are better
locked down these days.

svn:r16898

diff --git a/ChangeLog b/ChangeLog
index 1485a4c113565cb0bf105988cda1db18cd6c3c8d..41822f0d5a8f18b4304d79454a99c8f46932509a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,10 @@ Changes in version 0.2.1.6-alpha - 2008-09-xx
       fails to establish a TCP connection. Cleanup on 0.2.1.x.
 
   o Minor features:
+    - Allow ports 465 and 587 in the default exit policy again. We had
+      rejected them in 0.1.0.15, because back in 2005 they were commonly
+      misconfigured and ended up as spam targets. We hear they are better
+      locked down these days.
     - Use a lockfile to make sure that two Tor processes are not
       simultaneously running with the same datadir.
     - Directory mirrors store and serve v2 hidden service descriptors by

diff --git a/doc/tor.1.in b/doc/tor.1.in
index 40570d7784791e411735191ae590b2bc09836a16..89d67d26f33f862849583420b26bdc7cbd14f957 100644 (file)
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -832,9 +832,7 @@ either a reject *:* or an accept *:*. Otherwise, you're _augmenting_
 .IP "reject *:119"
 .IP "reject *:135-139"
 .IP "reject *:445"
-.IP "reject *:465"
 .IP "reject *:563"
-.IP "reject *:587"
 .IP "reject *:1214"
 .IP "reject *:4661-4666"
 .IP "reject *:6346-6429"

diff --git a/src/or/policies.c b/src/or/policies.c
index b6816a161530055f1a3374f3bc3d593aa8f008db..64d73375c8fc9b9837f269c5f2ea77f2bb63ee6c 100644 (file)
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -775,8 +775,7 @@ exit_policy_remove_redundancies(smartlist_t *dest)
 
 #define DEFAULT_EXIT_POLICY                                         \
   "reject *:25,reject *:119,reject *:135-139,reject *:445,"         \
-  "reject *:465,reject *:563,reject *:587,"                         \
-  "reject *:1214,reject *:4661-4666,"                               \
+  "reject *:563,reject *:1214,reject *:4661-4666,"                  \
   "reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*"
 
 /** Parse the exit policy <b>cfg</b> into the linked list *<b>dest</b>. If