From: Jeffrey Altman Date: Tue, 16 Jan 2007 17:21:31 +0000 (+0000) Subject: STABLE14-windows-nsis-fix-rpc-20070116 X-Git-Tag: openafs-stable-1_4_3rc1 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=99b4d81a937db3b63a45b25d0c4f6f9464d09e27;p=packages%2Fo%2Fopenafs.git STABLE14-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 453bf47b7..b6daebe64 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -1243,13 +1243,13 @@ contInstall2: ; 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 contInstall3 + StrCmp $R0 "rpcrt4.dll" contInstall3 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_ip_tcp" - StrCmp $R0 "rpcrt4.dll" +1 contInstall3 + StrCmp $R0 "rpcrt4.dll" contInstall3 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncadg_ip_udp" - StrCmp $R0 "rpcrt4.dll" +1 contInstall3 + StrCmp $R0 "rpcrt4.dll" contInstall3 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\RPC\ClientProtocols" "ncacn_http" - StrCmp $R0 "rpcrt4.dll" +1 contInstall3 + StrCmp $R0 "rpcrt4.dll" contInstall3 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