uh, and commit the patch too.

svn:r18423

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 71f9f9c1939ab13852fc2252dc43839bac093e7f..444f22a2a20285fe7180604666d7bb491b41c965 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1643,12 +1643,19 @@ authority_cert_parse_from_string(const char *s, const char **end_of_string)
 
   tok = find_opt_by_keyword(tokens, K_DIR_ADDRESS);
   if (tok) {
+    struct in_addr in;
+    char *address = NULL;
     tor_assert(tok->n_args);
-    if (parse_addr_port(LOG_WARN, tok->args[0], NULL, &cert->addr,
-                        &cert->dir_port)<0) {
+    /* XXX021 use tor_addr_port_parse() below instead. -RD */
+    if (parse_addr_port(LOG_WARN, tok->args[0], &address, NULL,
+                        &cert->dir_port)<0 ||
+        tor_inet_aton(address, &in) == 0) {
       log_warn(LD_DIR, "Couldn't parse dir-address in certificate");
+      tor_free(address);
       goto err;
     }
+    cert->addr = ntohl(in.s_addr);
+    tor_free(address);
   }
 
   tok = find_by_keyword(tokens, K_DIR_KEY_PUBLISHED);