use-afsloopback-20040623

[openafs.git] / src / WINNT / install / NSIS / OpenAFS.nsi

diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 053a31e..caa45a6 100644 (file)
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1341,11 +1341,15 @@ DoLoop:
    SectionSetFlags ${secLoopback} $0
    
 SkipLoop:
-   ; Never install debug symbols unless explicitly selected
-       !IFDEF DEBUG
+   ; Never install debug symbols unless explicitly selected, except in DEBUG mode
+       !IFNDEF DEBUG
    SectionGetFlags ${secDebug} $0
        IntOp $0 $0 & ${SECTION_OFF}
        SectionSetFlags ${secDebug} $0
+   !ELSE
+   SectionGetFlags ${secDebug} $0
+       IntOp $0 $0 | ${SF_SELECTED}
+       SectionSetFlags ${secDebug} $0
    !ENDIF
    ; Our logic should be like this.
    ;     1) If no AFS components are installed, we do a clean install with default options. (Client/Docs)
@@ -3419,16 +3423,16 @@ FunctionEnd
 ; Installs the loopback adpater and disables it on Windows 2000
 Function afs.InstallMSLoopback
    GetTempFileName $R0
-   File /oname=$R0 "${AFS_WININSTALL_DIR}\loopback_install.dll"
-   nsExec::Exec "rundll32.exe $R0 doLoopBackEntry quiet"
+   File /oname=$R0 "${AFS_WININSTALL_DIR}\afsloopback.dll"
+   nsExec::Exec "rundll32.exe $R0 doLoopBackEntry AFS  10.254.253.1 255.255.255.0"
    Delete $R0
 FunctionEnd
 
 Function afs.isLoopbackInstalled
    SetOutPath $TEMP
-   File "${AFS_WININSTALL_DIR}\loopback_install.dll"
-   System::Call "$TEMP\loopback_install.dll::loopback_isInstalled() i().r11"
-   Delete "$TEMP\loopback_install.dll"
+   File "${AFS_WININSTALL_DIR}\afsloopback.dll"
+   System::Call "$TEMP\afsloopback.dll::IsLoopbackInstalled() i().r11"
+   Delete "$TEMP\afsloopback.dll"
 FunctionEnd