From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Sep 2007 14:55:50 +0000 (+0000)
Subject:  r15023@catbus:  nickm | 2007-09-10 10:46:16 -0400
X-Git-Tag: release-2.0.1-alpha~575
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c396c767e2abf4d15ce8bf485588f67dbe10c14e;p=libevent

 r15023@catbus:  nickm | 2007-09-10 10:46:16 -0400
 Add a missing begin-comment to the DNS_USE_OPENSSL_FOR_ID code in evdns.c.


svn:r426
---

diff --git a/ChangeLog b/ChangeLog
index 6f82da9b..dc11e975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,3 +7,4 @@ Changes in current version:
  o Fix a memory leak in which failed HTTP connections whould not free the request object
  o Make adding of array members in event_rpcgen more efficient, but doubling memory allocation
  o Fix a memory leak in the DNS server
+ o Fix compilation when DNS_USE_OPENSSL_FOR_ID is enabled
diff --git a/evdns.c b/evdns.c
index 597f1093..a7593456 100644
--- a/evdns.c
+++ b/evdns.c
@@ -1037,9 +1037,11 @@ transaction_id_pick(void) {
 		if (RAND_pseudo_bytes((u8 *) &trans_id, 2) == -1) {
 			/* in the case that the RAND call fails we back */
 			/* down to using gettimeofday. */
-			struct timeval tv;
+			/*
+                        struct timeval tv;
 			gettimeofday(&tv, NULL);
-			trans_id = tv.tv_usec & 0xffff; */
+			trans_id = tv.tv_usec & 0xffff;
+                        */
 			abort();
 		}
 #endif