Index: bro.bif
===================================================================
--- bro.bif	(revision 6689)
+++ bro.bif	(working copy)
@@ -2701,8 +2701,11 @@
 	// Overridden from DNS_Mgr:Lookup:Callback.
 	virtual void Resolved(const char* name)
 		{
-		trigger->Cache(call, new StringVal(name));
+		ListVal *lv = new ListVal(TYPE_ADDR);
+		lv->Append(new AddrVal("0.0.0.0"));
+		trigger->Cache(call, lv->ConvertToSet());
 		trigger->Release();
+		Unref(lv);
 		}
 
 	virtual void Resolved(TableVal* addrs)
@@ -2714,8 +2717,11 @@
 
 	virtual void Timeout()
 		{
-		trigger->Cache(call, new StringVal("<dns-timeout>"));
+		ListVal *lv = new ListVal(TYPE_ADDR);
+		lv->Append(new AddrVal("0.0.0.0"));
+		trigger->Cache(call, lv->ConvertToSet());
 		trigger->Release();
+		Unref(lv);
 		}
 
 private:
Index: DNS_Mgr.cc
===================================================================
--- DNS_Mgr.cc	(revision 6689)
+++ DNS_Mgr.cc	(working copy)
@@ -944,7 +944,6 @@
 			{
 			run_time("can't issue DNS request");
 			req->Timeout();
-			delete req;
 			continue;
 			}