diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-07 09:46:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-07 09:46:14 -0400 |
| commit | 99618a9641d02b7b99a79c71517203bb70043515 (patch) | |
| tree | c8a84e2dc913a543879ffe44bbf70c74380cb23e /src/or/control.c | |
| parent | b4126dcd22577c02f46497718783fd792ff32588 (diff) | |
| parent | 0dc47dfebffe9547bc95ba3f2a64fc5f4b15f270 (diff) | |
| download | tor-99618a9641d02b7b99a79c71517203bb70043515.tar tor-99618a9641d02b7b99a79c71517203bb70043515.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index f6f97c918..dfa7d364c 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4254,14 +4254,14 @@ control_event_status(int type, int severity, const char *format, va_list args) log_warn(LD_BUG, "Unrecognized status severity %d", severity); return -1; } - if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s\r\n", + if (tor_snprintf(format_buf, sizeof(format_buf), "650 %s %s", status, sev)<0) { log_warn(LD_BUG, "Format string too long."); return -1; } tor_vasprintf(&user_buf, format, args); - send_control_event(type, ALL_FORMATS, "%s %s", format_buf, user_buf); + send_control_event(type, ALL_FORMATS, "%s %s\r\n", format_buf, user_buf); tor_free(user_buf); return 0; } |