From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Nov 2011 16:45:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.1-alpha~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ae6e5959d1c30d6043d4bb20f4d8741aec30a46;p=libevent

Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	sample/dns-example.c
---

9ae6e5959d1c30d6043d4bb20f4d8741aec30a46
diff --cc sample/dns-example.c
index d8134e83,f97a0c6b..6ba1359a
--- a/sample/dns-example.c
+++ b/sample/dns-example.c
@@@ -188,12 -195,17 +195,17 @@@ main(int c, char **v) 
  		evdns_add_server_port_with_base(event_base, sock, 0, evdns_server_callback, NULL);
  	}
  	if (idx < c) {
+ 		int res;
 -#ifdef WIN32
 +#ifdef _WIN32
- 		evdns_base_config_windows_nameservers(evdns_base);
+ 		res = evdns_base_config_windows_nameservers(evdns_base);
  #else
- 		evdns_base_resolv_conf_parse(evdns_base, DNS_OPTION_NAMESERVERS,
+ 		res = evdns_base_resolv_conf_parse(evdns_base, DNS_OPTION_NAMESERVERS,
  		    "/etc/resolv.conf");
  #endif
+ 		if (res < 0) {
+ 			fprintf(stderr, "Couldn't configure nameservers");
+ 			return 1;
+ 		}
  	}
  
  	printf("EVUTIL_AI_CANONNAME in example = %d\n", EVUTIL_AI_CANONNAME);