diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-08-07 03:37:36 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-08-07 03:37:36 +0000 |
| commit | 05e9a2269cbea69a797c037db3628be00d582be3 (patch) | |
| tree | 943b10564ffd4be98cab5a59d87999dbcf4bfc7a | |
| parent | 1ada52fe87be3e8d0bb547b738fcdb380e783d3a (diff) | |
| download | tor-05e9a2269cbea69a797c037db3628be00d582be3.tar.gz tor-05e9a2269cbea69a797c037db3628be00d582be3.zip | |
Remove obsolete link-key keyword
svn:r2186
| -rw-r--r-- | src/or/routerparse.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 9a9525cb7a..36d4fd38f6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -29,7 +29,6 @@ typedef enum { K_SIGNED_DIRECTORY, K_SIGNING_KEY, K_ONION_KEY, - K_LINK_KEY, /* XXXX obsolete; remove in June. */ K_ROUTER_SIGNATURE, K_PUBLISHED, K_RUNNING_ROUTERS, @@ -102,7 +101,6 @@ static struct { { "signed-directory", K_SIGNED_DIRECTORY, NO_ARGS, NO_OBJ, DIR_ONLY }, { "signing-key", K_SIGNING_KEY, NO_ARGS, NEED_KEY,RTR_ONLY }, { "onion-key", K_ONION_KEY, NO_ARGS, NEED_KEY,RTR_ONLY }, - { "link-key", K_LINK_KEY, NO_ARGS, NEED_KEY,RTR_ONLY }, { "router-signature", K_ROUTER_SIGNATURE, NO_ARGS, NEED_OBJ,RTR_ONLY }, { "running-routers", K_RUNNING_ROUTERS, ARGS, NO_OBJ, DIR_ONLY }, { "ports", K_PORTS, ARGS, NO_OBJ, RTR_ONLY }, @@ -757,10 +755,6 @@ routerinfo_t *router_parse_entry_from_string(const char *s, router->onion_pkey = tok->key; tok->key = NULL; /* Prevent free */ - if ((tok = find_first_by_keyword(tokens, K_LINK_KEY))) { - log_fn(LOG_INFO, "Skipping obsolete link-key"); - } - if (!(tok = find_first_by_keyword(tokens, K_SIGNING_KEY))) { log_fn(LOG_WARN, "Missing identity key"); goto err; } |