DEVEL15-windows-nsis-fix-rpc-20070116

remove the rpc fix.  the original code was correct

(cherry picked from commit 41df9870148af3527f828a26cc7fbb8d8ffb506e)

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 448d241de6f74fe4e4ab9e5b16cc8e08438b40bb..4f26bc5f8424c060dd8a00649b8b0a4b198b7189 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1303,13 +1303,13 @@ contInstall:
    ; Check that RPC functions are installed (I believe any one of these can be present for
    ; OpenAFS to work)
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_np"
-   StrCmp $R0 "rpcrt4.dll" +1 contInstall2
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_ip_tcp"
-   StrCmp $R0 "rpcrt4.dll" +1 contInstall2
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp"
-   StrCmp $R0 "rpcrt4.dll" +1 contInstall2
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http"
-   StrCmp $R0 "rpcrt4.dll" +1 contInstall2
+   StrCmp $R0 "rpcrt4.dll" contInstall2
    
    MessageBox MB_OK|MB_ICONSTOP|MB_TOPMOST "An error was detected with your Windows RPC installation. Please make sure Windows RPC is installed before installing OpenAFS."
    Abort