accept LDAP (389/tcp) and LDAPS (636/tcp) in default exit policy

svn:r3457

diff --git a/src/or/directory.c b/src/or/directory.c
index 446c9eda736d5e8877909f1f0623dba7c4dbc6dc..4e6a2c75bf40aa228d27f35787ec85141fcf7ccb 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -482,7 +482,7 @@ parse_http_url(char *headers, char **url)
 
 /** Parse an HTTP response string <b>headers</b> of the form
  * "HTTP/1.\%d \%d\%s\r\n...".
- * If it's well-formed, assign *<b>code</b>, point  and return 0.
+ * If it's well-formed, assign *<b>code</b> and return 0.
  * If <b>date</b> is provided, set *date to the Date header in the
  * http headers, or 0 if no such header is found.  If <b>compression</b>
  * is provided, set *<b>compression</b> to the compression method given
@@ -692,6 +692,7 @@ connection_dir_client_reached_eof(connection_t *conn)
       tor_free(body); tor_free(headers);
       return -1;
     }
+    /* xxx maybe we can tell router_... here that it was skewed so don't believe it all. */
     if (router_load_routerlist_from_directory(body, NULL, 1, 0) < 0) {
       log_fn(LOG_WARN,"I failed to parse the directory I fetched from %s:%d. Ignoring.", conn->address, conn->port);
     } else {

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index b86f49193413a179f9e1d251a1e4b4f2b8622ea3..c316622bbe3d7e933a6cdf98aa220ebeb78a94c8 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -313,7 +313,7 @@ dirserv_router_has_valid_address(routerinfo_t *ri)
  *
  * Return 1 if descriptor is well-formed and accepted;
  * 0 if well-formed and server is unapproved;
- * -1 if not well-formed or other error.
+ * -1 if not well-formed or other parsing error.
  */
 int
 dirserv_add_descriptor(const char **desc, const char **msg)

diff --git a/src/or/router.c b/src/or/router.c
index c28e8c35f86a7a22860e087a43695be48424167a..78e7a5d53a999c044d30b4c360142e6634250ca9 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -449,7 +449,7 @@ void router_upload_dir_desc_to_dirservers(int force) {
   directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_DIR, s, strlen(s));
 }
 
-#define DEFAULT_EXIT_POLICY "reject 0.0.0.0/8,reject 169.254.0.0/16,reject 127.0.0.0/8,reject 192.168.0.0/16,reject 10.0.0.0/8,reject 172.16.0.0/12,accept *:20-22,accept *:53,accept *:79-81,accept *:110,accept *:143,accept *:443,accept *:706,accept *:873,accept *:993,accept *:995,reject *:4661-4662,reject *:1214,reject *:6346,accept *:1024-65535,reject *:*"
+#define DEFAULT_EXIT_POLICY "reject 0.0.0.0/8,reject 169.254.0.0/16,reject 127.0.0.0/8,reject 192.168.0.0/16,reject 10.0.0.0/8,reject 172.16.0.0/12,accept *:20-22,accept *:53,accept *:79-81,accept *:110,accept *:143,accept *:389,accept *:443,accept *:636,accept *:706,accept *:873,accept *:993,accept *:995,reject *:4661-4662,reject *:1214,reject *:6346,accept *:1024-65535,reject *:*"
 
 /** Set the exit policy on <b>router</b> to match the exit policy in the
  * current configuration file.  If the exit policy doesn't have a catch-all