stop wanting to split init_keys()

svn:r2735
This commit is contained in:
Roger Dingledine 2004-11-09 07:29:05 +00:00
parent cad26b343d
commit 9f3e3d2b71
2 changed files with 1 additions and 3 deletions

View File

@ -704,8 +704,6 @@ static int do_hup(void) {
return -1;
}
options = get_options();
/*XXX this should move to options_act, but only once it's been
* removed from init_keys() */
if(authdir_mode(options)) {
/* reload the approved-routers file */
tor_snprintf(keydir,sizeof(keydir),"%s/approved-routers", options->DataDirectory);

View File

@ -239,7 +239,7 @@ int init_keys(void) {
if (!key_lock)
key_lock = tor_mutex_new();
/* OP's don't need persistant keys; just make up an identity and
/* OP's don't need persistent keys; just make up an identity and
* initialize the TLS context. */
if (!server_mode(options)) {
if (!(prkey = crypto_new_pk_env()))