From 544afa6bcc2dd8a72f58e1fb9e95517a0abba7e3 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 9 Aug 2004 05:20:07 +0000 Subject: [PATCH 1/1] release-1370-20040810 Disable the installation of the WinLogon Event Handlers to avoid problems with XP SP2 Final Release booting and profiles being released on logoff. Update version to 1.3.7000 Add VS8 entries to the build system --- doc/txt/winnotes/afs-changes-since-1.2.txt | 6 ++++++ doc/txt/winnotes/afs-install-notes.txt | 11 +++++++++++ doc/txt/winnotes/afs-issues.txt | 1 + src/WINNT/install/NSIS/OpenAFS.nsi | 4 ++++ src/WINNT/install/wix/files.wxi | 4 +++- src/config/NTMakefile.i386_nt40 | 2 +- src/ntbuild.bat | 7 +++++-- 7 files changed, 31 insertions(+), 4 deletions(-) diff --git a/doc/txt/winnotes/afs-changes-since-1.2.txt b/doc/txt/winnotes/afs-changes-since-1.2.txt index 929d638..73eb647 100644 --- a/doc/txt/winnotes/afs-changes-since-1.2.txt +++ b/doc/txt/winnotes/afs-changes-since-1.2.txt @@ -1,4 +1,10 @@ Since 1.3.66: + * The WinLogon Event Handlers for "Startup" and "Logoff" have been + removed at the very last moment due to problems caused with the + final release version of XP SP2. This means that tokens will + not be destroyed on logoff. The code is not being removed it + is simply not going to be enabled. + * file and directory names beginning with "." will now be given the hidden attribute when the volume access is anonymous. this matches the behavior when the volume access is via an authenticated user. diff --git a/doc/txt/winnotes/afs-install-notes.txt b/doc/txt/winnotes/afs-install-notes.txt index 04bcf2e..1ed4d04 100644 --- a/doc/txt/winnotes/afs-install-notes.txt +++ b/doc/txt/winnotes/afs-install-notes.txt @@ -319,6 +319,17 @@ there is no mechanism to determine when the profile has been successfully written back to the network. It is therefore unsafe to release the user's tokens. +Note: This functionality has been disabled in the 1.3.70 installers due +to problems discovered with the final release build of XP SP2. To enable +this functionality on other versions of Windows the following registry +entries should be added: + + REG_DWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Asynchronous" 0 + REG_DWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Impersonate" 1 + REG_SZ HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "DLLName" "afslogon.dll" + REG_SZ HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logoff" "AFS_Logoff_Event" + REG_SZ HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Startup" "AFS_Startup_Event" + 23. Terminal Server installations. When installing under Terminal Server, you must execute the NSIS installer diff --git a/doc/txt/winnotes/afs-issues.txt b/doc/txt/winnotes/afs-issues.txt index 8d4e273..784e23b 100644 --- a/doc/txt/winnotes/afs-issues.txt +++ b/doc/txt/winnotes/afs-issues.txt @@ -196,3 +196,4 @@ List of unfunded projects: afsmap.exe [/PERSISTENT] afsmap.exe [/PERSISTENT] afsmap.exe /DELETE + 23. Fix/Identify cause of WinLogon event handler problems with XP SP2 Gold diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index 691f7ea..b9ab283 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -708,12 +708,16 @@ skipremove: strcpy $REG_DATA_3 "RpcSs" Call RegWriteMultiStr +!ifdef WINLOGON ; WinLogon Event Notification + ; Disabled because of last minute problems with the XP SP2 release final build + ; we are disabling the use of this functionality WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Asynchronous" 0 WriteRegDWORD HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Impersonate" 1 WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "DLLName" "afslogon.dll" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Logoff" "AFS_Logoff_Event" WriteRegStr HKLM "Software\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" "Startup" "AFS_Startup_Event" +!endif SetRebootFlag true diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi index 0411877..1524e42 100644 --- a/src/WINNT/install/wix/files.wxi +++ b/src/WINNT/install/wix/files.wxi @@ -3,13 +3,15 @@ - + diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index 137058c..f0b2dce 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -79,7 +79,7 @@ LIB = $(AFSDEV_LIB) #define used in WinNT/2000 installation and program version display AFSPRODUCT_VER_MAJOR=1 AFSPRODUCT_VER_MINOR=3 -AFSPRODUCT_VER_PATCH=6601 +AFSPRODUCT_VER_PATCH=7000 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD) diff --git a/src/ntbuild.bat b/src/ntbuild.bat index 28390af..2941835 100755 --- a/src/ntbuild.bat +++ b/src/ntbuild.bat @@ -30,7 +30,7 @@ SET _WIN32_IE=0x400 REM ######################################################################## REM Location of base folder where source lies, build directory REM e.g. AFSROOT\SRC is source directory of the build tree (8.3 short name) -set AFSROOT=D:\Dev\AfsSorce\OpenAF~2.2 +set AFSROOT=C:\SRC\OpenAFS REM ######################################################################## REM NTMakefile required definitions: @@ -38,7 +38,8 @@ REM AFSVER_CL = version of the Microsoft compiler: REM "1200" for VC6 REM "1300" for VC7 (.NET) REM "1310" for .NET 2003 -set AFSVER_CL=1200 +REM "1400" for VC8 +set AFSVER_CL=1310 REM Location of Microsoft Visual C++ development folder (8.3 short name) set MSVCDIR=c:\progra~1\micros~2\vc98 @@ -101,12 +102,14 @@ REM AFSDEV_BIN = default build binary directories set AFSDEV_BUILDTYPE=%AFSBLD_TYPE% set AFSDEV_INCLUDE=%MSSDKDIR%\include;%MSVCDIR%\include +IF "%AFSVER_CL%" == "1400" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include IF "%AFSVER_CL%" == "1310" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include IF "%AFSVER_CL%" == "1300" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atlmfc\include IF "%AFSVER_CL%" == "1200" set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%MSVCDIR%\atl\include;%MSVCDIR%\mfc\include set AFSDEV_INCLUDE=%AFSDEV_INCLUDE%;%NTDDKDIR%\include;%W9XDDKDIR%\include set AFSDEV_LIB=%MSSDKDIR%\lib;%MSVCDIR%\lib +IF "%AFSVER_CL%" == "1400" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib IF "%AFSVER_CL%" == "1310" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib IF "%AFSVER_CL%" == "1300" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\atlmfc\lib IF "%AFSVER_CL%" == "1200" set AFSDEV_LIB=%AFSDEV_LIB%;%MSVCDIR%\mfc\lib -- 1.9.4