diff options
Diffstat (limited to 'src/ca')
-rw-r--r-- | src/ca/firewall.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ca/firewall.cpp b/src/ca/firewall.cpp index 038f4ea5..caae21a1 100644 --- a/src/ca/firewall.cpp +++ b/src/ca/firewall.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | #include "precomp.h" | 3 | #include "precomp.h" |
4 | 4 | ||
5 | LPCWSTR vcsFirewallExceptionQuery = | 5 | LPCWSTR vcsFirewallExceptionQuery = |
6 | L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `WixFirewallException`"; | 6 | L"SELECT `Name`, `RemoteAddresses`, `Port`, `Protocol`, `Program`, `Attributes`, `Profile`, `Component_`, `Description`, `Direction` FROM `Wix4FirewallException`"; |
7 | enum eFirewallExceptionQuery { feqName = 1, feqRemoteAddresses, feqPort, feqProtocol, feqProgram, feqAttributes, feqProfile, feqComponent, feqDescription }; | 7 | enum eFirewallExceptionQuery { feqName = 1, feqRemoteAddresses, feqPort, feqProtocol, feqProgram, feqAttributes, feqProfile, feqComponent, feqDescription }; |
8 | enum eFirewallExceptionTarget { fetPort = 1, fetApplication, fetUnknown }; | 8 | enum eFirewallExceptionTarget { fetPort = 1, fetApplication, fetUnknown }; |
9 | enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 }; | 9 | enum eFirewallExceptionAttributes { feaIgnoreFailures = 1 }; |
@@ -43,15 +43,15 @@ static UINT SchedFirewallExceptions( | |||
43 | ExitOnFailure(hr, "failed to initialize"); | 43 | ExitOnFailure(hr, "failed to initialize"); |
44 | 44 | ||
45 | // anything to do? | 45 | // anything to do? |
46 | if (S_OK != WcaTableExists(L"WixFirewallException")) | 46 | if (S_OK != WcaTableExists(L"Wix4FirewallException")) |
47 | { | 47 | { |
48 | WcaLog(LOGMSG_STANDARD, "WixFirewallException table doesn't exist, so there are no firewall exceptions to configure."); | 48 | WcaLog(LOGMSG_STANDARD, "Wix4FirewallException table doesn't exist, so there are no firewall exceptions to configure."); |
49 | ExitFunction(); | 49 | ExitFunction(); |
50 | } | 50 | } |
51 | 51 | ||
52 | // query and loop through all the firewall exceptions | 52 | // query and loop through all the firewall exceptions |
53 | hr = WcaOpenExecuteView(vcsFirewallExceptionQuery, &hView); | 53 | hr = WcaOpenExecuteView(vcsFirewallExceptionQuery, &hView); |
54 | ExitOnFailure(hr, "failed to open view on WixFirewallException table"); | 54 | ExitOnFailure(hr, "failed to open view on Wix4FirewallException table"); |
55 | 55 | ||
56 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) | 56 | while (S_OK == (hr = WcaFetchRecord(hView, &hRec))) |
57 | { | 57 | { |
@@ -141,7 +141,7 @@ static UINT SchedFirewallExceptions( | |||
141 | { | 141 | { |
142 | hr = S_OK; | 142 | hr = S_OK; |
143 | } | 143 | } |
144 | ExitOnFailure(hr, "failure occured while processing WixFirewallException table"); | 144 | ExitOnFailure(hr, "failure occured while processing Wix4FirewallException table"); |
145 | 145 | ||
146 | // schedule ExecFirewallExceptions if there's anything to do | 146 | // schedule ExecFirewallExceptions if there's anything to do |
147 | if (pwzCustomActionData && *pwzCustomActionData) | 147 | if (pwzCustomActionData && *pwzCustomActionData) |