nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/maint-0.2.1'

Browse Source
This commit is contained in:
Nick Mathewson 2009-08-12 22:02:07 -04:00
commit e0dc2e907e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -67,6 +67,8 @@ Changes in version 0.2.1.20 - 2009-??-??
o Minor bugfixes: o Minor bugfixes:
- Fix a signed/unsigned compile warning in 0.2.1.19. - Fix a signed/unsigned compile warning in 0.2.1.19.
- Fix possible segmentation fault on directory authorities. Bugfix on
0.2.1.14-rc.
Changes in version 0.2.1.19 - 2009-07-28 Changes in version 0.2.1.19 - 2009-07-28

7
src/or/dirserv.c
View File

@ -652,8 +652,8 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose,
/** Examine the parsed server descriptor in <b>ri</b> and maybe insert it into /** Examine the parsed server descriptor in <b>ri</b> and maybe insert it into
* the list of server descriptors. Set *<b>msg</b> to a message that should be * the list of server descriptors. Set *<b>msg</b> to a message that should be
* passed back to the origin of this descriptor. Use <b>source</b> to produce * passed back to the origin of this descriptor, or NULL if there is no such
* better log messages. * message. Use <b>source</b> to produce better log messages.
* *
* Return the status of the operation * Return the status of the operation
* *
@ -667,6 +667,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
routerinfo_t *ri_old; routerinfo_t *ri_old;
char *desc, *nickname; char *desc, *nickname;
size_t desclen = 0; size_t desclen = 0;
*msg = NULL;
/* If it's too big, refuse it now. Otherwise we'll cache it all over the /* If it's too big, refuse it now. Otherwise we'll cache it all over the
* network and it'll clog everything up. */ * network and it'll clog everything up. */
@ -718,7 +719,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
control_event_or_authdir_new_descriptor("REJECTED", desc, desclen, *msg); control_event_or_authdir_new_descriptor("REJECTED", desc, desclen, *msg);
log_info(LD_DIRSERV, log_info(LD_DIRSERV,
"Did not add descriptor from '%s' (source: %s): %s.", "Did not add descriptor from '%s' (source: %s): %s.",
nickname, source, *msg); nickname, source, *msg ? *msg : "(no message)");
} else { } else {
smartlist_t *changed; smartlist_t *changed;
control_event_or_authdir_new_descriptor("ACCEPTED", desc, desclen, *msg); control_event_or_authdir_new_descriptor("ACCEPTED", desc, desclen, *msg);

2
src/or/router.c
View File

@ -546,7 +546,7 @@ init_keys(void)
/* Must be called after keys are initialized. */ /* Must be called after keys are initialized. */
mydesc = router_get_my_descriptor(); mydesc = router_get_my_descriptor();
if (authdir_mode(options)) { if (authdir_mode(options)) {
const char *m; const char *m = NULL;
routerinfo_t *ri; routerinfo_t *ri;
/* We need to add our own fingerprint so it gets recognized. */ /* We need to add our own fingerprint so it gets recognized. */
if (dirserv_add_own_fingerprint(options->Nickname, get_identity_key())) { if (dirserv_add_own_fingerprint(options->Nickname, get_identity_key())) {