Commit 7ed528c5 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

r8733@Kushana: nickm | 2006-09-06 17:35:22 -0400

 Add some missing defines to eventdns.c for windows.


svn:r8330
parent 1e262339
Loading
Loading
Loading
Loading
+15 −10
Original line number Diff line number Diff line
@@ -2125,6 +2125,11 @@ config_nameserver_from_reg_key(HKEY key, const char *subkey)
	return status;
}

#define SERVICES_KEY "System\\CurrentControlSet\\Services\\"

#define WIN_NS_9X_KEY  SERVICES_KEY "VxD\\MSTCP"
#define WIN_NS_NT_KEY  SERVICES_KEY "Tcpip\\Parameters"

static int
load_nameservers_from_registry(void)
{
@@ -2142,20 +2147,20 @@ load_nameservers_from_registry(void)
				 KEY_READ, &nt_key) != ERROR_SUCCESS)
			return -1;
		RegOpenKeyEx(nt_key, "Interfaces", 0,
			     KEY_QUERY_VALUE|KEY_ENUMERATE_SUBKEYS,
			     KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS,
			     &interfaces_key);
		TRY(nt_key, NAMESERVER);
		TRY(nt_key, DHCPNAMESERVER);
		TRY(interfaces_key, NAMESERVER);
		TRY(interfaces_key, DHCPNAMESERVER);
		TRY(nt_key, "NameServer");
		TRY(nt_key, "DhcpNameServer");
		TRY(interfaces_key, "NameServer");
		TRY(interfaces_key, "DhcpNameServer");
		RegCloseKey(interfaces_key);
		RegCloseKey(nt_key);
	} else {
		HKEY win_key = 0;
		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X, 0,
		if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_9X_KEY, 0,
				 KEY_READ, &win_key) != ERROR_SUCCESS)
			return -1;
		TRY(win_key, NAMESERVER);
		TRY(win_key, "NameServer");
		RegCloseKey(win_key);
	}
	return found ? 0 : -1;