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 6f82da9bff8bd7f5776e704005209ac322812a00..dc11e975f0212081162bd23ed2f4ac97660cfabc 100644 (file)
--- 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 597f109301829310cffd967e54d0bd75ecc3f21c..a7593456ac0deebb4344f7b60f79835b5a594e44 100644 (file)
--- 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