winnt-port-updates-20010802

These patches solve the following problem:

   During Un-Install of AFS for Windows, it removed the following key:
   HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters
   Instead it should have removed only the SMBDeviceEnable=0 item within
   the above key.
   This damaged the NetBT (NetBios over TCP/IP) interface, and required
   re-installing of TCP/IP.  The users found their ability to share files
   and printers damaged.

diff --git a/src/WINNT/install/InstallShield5/Default.rge b/src/WINNT/install/InstallShield5/Default.rge
index 7949523..1ec9276 100644 (file)
--- a/src/WINNT/install/InstallShield5/Default.rge
+++ b/src/WINNT/install/InstallShield5/Default.rge
@@ -11,7 +11,6 @@ HKCR1=CLSID\{DC515C27-6CAC-11D1-BAE7-00C04FD140D2}\InprocServer32
 HKLM5=SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\NetworkProvider
 HKCR2=*\shellex\ContextMenuHandlers\AFS Client Shell Extension
 HKCR3=FOLDER\shellex\ContextMenuHandlers\AFS Client Shell Extension
-HKLM6=SYSTEM\CurrentControlSet\Services\NetBT\Parameters\r
 
 [Client:HKCR:*\shellex\ContextMenuHandlers\AFS Client Shell Extension]
 ---Comment---=
@@ -27,9 +26,6 @@ Cell=S,
 ---Comment---=
 (Default)=S,
 
-[Client:HKLM:SYSTEM\CurrentControlSet\Services\NetBT\Parameters]
-SMBDeviceEnabled=N,0
-
 [Server:HKLM:System\CurrentControlSet\Services\EventLog\Application\AFS Service]
 (Default)=S,
 ---Comment---=

diff --git a/src/WINNT/install/InstallShield5/NTMakefile b/src/WINNT/install/InstallShield5/NTMakefile
index c679e5a..a5d74a8 100644 (file)
--- a/src/WINNT/install/InstallShield5/NTMakefile
+++ b/src/WINNT/install/InstallShield5/NTMakefile
@@ -22,16 +22,16 @@ prep: $(CELLSERVDB) AFS_component_version_number.txt
     CompileScript.bat
 
 build:
-    BuildSetup.bat\r
+    BuildSetup.bat
     xcopy/s/e/y "Media\Transarc AFS\Disk Images\disk1\*.*" $(DESTDIR)\WinInstall
-    copy AFS_component_version_number.txt $(DESTDIR)\WinInstall\Version.txt\r
-    $(DEL) /q "Media\Transarc AFS\Disk Images\disk1\*.*"
-!IF ((EXIST("$(ISWEB)")) &&("$(ISWEB)"!=""))\r
+    copy AFS_component_version_number.txt $(DESTDIR)\WinInstall\Version.txt
+!IF ((EXIST("$(ISWEB)")) &&("$(ISWEB)"!=""))
 !      IF (!EXIST($(DESTDIR)\Wininstall\PackageWeb))
                $(MKDIR) $(DESTDIR)\Wininstall\PackageWeb
 !      ENDIF
-       $(DEL) /q $(DESTDIR)\Wininstall\PackageWeb\*.*\r
-       $(ISWEB)\Pftwwiz.exe $(AFSROOT)\src\winnt\install\InstallShield5\PackageWeb.pfw -s -a \r
-!ENDIF\r
+       $(DEL) /q $(DESTDIR)\Wininstall\PackageWeb\*.*
+       $(ISWEB)\Pftwwiz.exe $(AFSROOT)\src\winnt\install\InstallShield5\PackageWeb.pfw -s -a 
+!ENDIF
+    $(DEL) /q "Media\Transarc AFS\Disk Images\disk1\*.*"
 
 install: prep build