From: Jeffrey Altman Date: Tue, 16 Jan 2007 17:26:07 +0000 (+0000) Subject: DEVEL15-windows-nsis-fix-rpc-20070116 X-Git-Tag: BP-rxk5-devel-1_5_x~3 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=16f48c4d4c97c25158f9c57c70811243ffaba049;p=packages%2Fo%2Fopenafs.git 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 448d241de..4f26bc5f8 100644 --- 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