diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-01 12:34:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-01 12:34:59 -0400 |
| commit | a2b59dba71687b28546ccc99e98f1a6675ccdc91 (patch) | |
| tree | 9d844ebdea6c2ac26e0d4692b79226adde25fee3 | |
| parent | 0e20825bf22bbe86dbd2a2822864b90ccc45c00b (diff) | |
| parent | a787575b7f2d9bbb8385940977cafcfc87c71234 (diff) | |
| download | tor-a2b59dba71687b28546ccc99e98f1a6675ccdc91.tar tor-a2b59dba71687b28546ccc99e98f1a6675ccdc91.tar.gz | |
Merge branch 'bug11654_squashed'
| -rw-r--r-- | changes/bug11654 | 4 | ||||
| -rw-r--r-- | src/or/nodelist.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug11654 b/changes/bug11654 new file mode 100644 index 000000000..97c70b25d --- /dev/null +++ b/changes/bug11654 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a broken log message about delayed directory fetches that + was caused by a misuse of strlcpy(). Fixes bug 11654; bugfix on + 0.2.5.3-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index a38a6d499..09232f9f9 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void) } if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { - log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, "%s", sizeof(dir_info_status)); + log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); + strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); res = 0; goto done; } |