STABLE14-windows-firewall-config-20060830

Enable the firewall detection logic to work on Vista


(cherry picked from commit f56dff0860d5f9a9d92e9a06c1b7cd1728a2844a)
This commit is contained in:
Jeffrey Altman 2006-08-30 21:20:19 +00:00
parent 82fb20bf7b
commit 85874d4da5

View File

@ -142,7 +142,13 @@ IsWindowsFirewallPresent(void)
if (!scm) return FALSE;
/* Open Windows Firewall service */
svc = OpenService(scm, "SharedAccess", SERVICE_QUERY_CONFIG);
svc = OpenService(scm, "MpsSvc", SERVICE_QUERY_CONFIG);
if (!svc) {
afsi_log("MpsSvc Service could not be opened for query: 0x%x", GetLastError());
svc = OpenService(scm, "SharedAccess", SERVICE_QUERY_CONFIG);
if (!svc)
afsi_log("SharedAccess Service could not be opened for query: 0x%x", GetLastError());
}
if (!svc)
goto close_scm;
@ -160,10 +166,13 @@ IsWindowsFirewallPresent(void)
/* Query Windows Firewall service config, this time for real */
flag = QueryServiceConfig(svc, pConfig, BufSize, &BufSize);
if (!flag)
if (!flag) {
afsi_log("QueryServiceConfig failed: 0x%x", GetLastError());
goto free_pConfig;
}
/* Is it autostart? */
afsi_log("AutoStart 0x%x", pConfig->dwStartType);
if (pConfig->dwStartType < SERVICE_DEMAND_START)
result = TRUE;
@ -193,6 +202,10 @@ void cm_Daemon(long parm)
HMODULE hHookDll;
int configureFirewall = IsWindowsFirewallPresent();
if (!configureFirewall) {
afsi_log("No Windows Firewall detected");
}
/* ping all file servers, up or down, with unauthenticated connection,
* to find out whether we have all our callbacks from the server still.
* Also, ping down VLDBs.
@ -244,7 +257,7 @@ void cm_Daemon(long parm)
default:
afsi_log("Unknown Windows Firewall Configuration error");
}
}
}
/* find out what time it is */
now = osi_Time();