[or-cvs] accept LDAP (389/tcp) and LDAPS (636/tcp) in default exit p...

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	directory.c dirserv.c router.c 
Log Message:
accept LDAP (389/tcp) and LDAPS (636/tcp) in default exit policy


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- directory.c	22 Jan 2005 00:42:58 -0000	1.203
+++ directory.c	29 Jan 2005 11:16:23 -0000	1.204
@@ -482,7 +482,7 @@
 
 /** 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 @@
       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 {

Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- dirserv.c	21 Jan 2005 23:16:07 -0000	1.137
+++ dirserv.c	29 Jan 2005 11:16:23 -0000	1.138
@@ -313,7 +313,7 @@
  *
  * 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)

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- router.c	29 Jan 2005 11:07:35 -0000	1.142
+++ router.c	29 Jan 2005 11:16:23 -0000	1.143
@@ -449,7 +449,7 @@
   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