diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-01-27 15:43:01 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-01-27 15:43:01 +0200 |
| commit | dbbd60331352da8f985ddfc988fbe5f97e3f23af (patch) | |
| tree | 9fdf9309c48399bae875c896738f578135f53c7b /src/app | |
| parent | a7ca08934341deab05d48fa0f074543116a29c38 (diff) | |
| parent | 3d993d4d8569617acf8059a6d6f7702aaf41bba4 (diff) | |
| download | tor-dbbd60331352da8f985ddfc988fbe5f97e3f23af.tar.gz tor-dbbd60331352da8f985ddfc988fbe5f97e3f23af.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/248'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index b5be148895..2d4155e9bc 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4321,6 +4321,7 @@ find_torrc_filename(const config_line_t *cmd_arg, const config_line_t *p_index; const char *fname_opt = defaults_file ? "--defaults-torrc" : "-f"; const char *ignore_opt = defaults_file ? NULL : "--ignore-missing-torrc"; + const char *keygen_opt = "--keygen"; if (defaults_file) *ignore_missing_torrc = 1; @@ -4342,7 +4343,8 @@ find_torrc_filename(const config_line_t *cmd_arg, } *using_default_fname = 0; - } else if (ignore_opt && !strcmp(p_index->key,ignore_opt)) { + } else if ((ignore_opt && !strcmp(p_index->key, ignore_opt)) || + (keygen_opt && !strcmp(p_index->key, keygen_opt))) { *ignore_missing_torrc = 1; } } |