From: Jeffrey Altman Date: Thu, 28 Apr 2005 13:05:45 +0000 (+0000) Subject: STABLE14-windows-afslogon-20050428 X-Git-Tag: openafs-devel-1_3_82~5 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1fe18318493fb8174d9744d0e47aaa3215750395;p=packages%2Fo%2Fopenafs.git STABLE14-windows-afslogon-20050428 Add new "logon" event handler in order to establish a smb connection to the AFS client service with the true logon name as early as possible. ==================== This delta was composed from multiple commits as part of the CVS->Git migration. The checkin message with each commit was inconsistent. The following are the additional commit messages. ==================== Add new "logon" event handler in order to establish a smb connection to the AFS client service with the true logon name as early as possible. Add "replace_afs.cmd" file --- diff --git a/src/WINNT/afsd/NTMakefile b/src/WINNT/afsd/NTMakefile index cbdb89aef..7194e87c7 100644 --- a/src/WINNT/afsd/NTMakefile +++ b/src/WINNT/afsd/NTMakefile @@ -213,15 +213,16 @@ $(AFSKFWLIB): $(AFSKFWLIB_OBJS) LOGON_DLLFILE = $(DESTDIR)\root.client\usr\vice\etc\afslogon.dll LOGON_DLLOBJS =\ - $(OUT)\afslogon.obj \ + $(OUT)\afslogon.obj \ $(OUT)\logon_ad.obj \ - $(OUT)\afslogon.res + $(OUT)\afslogon.res LOGON_DLLLIBS =\ - $(DESTDIR)\lib\afsauthent.lib \ - $(DESTDIR)\lib\libafsconf.lib \ + $(DESTDIR)\lib\afsauthent.lib \ + $(DESTDIR)\lib\libafsconf.lib \ $(DESTDIR)\lib\afsrxkad.lib \ $(DESTDIR)\lib\afsdes.lib \ + $(LANAHELPERLIB) \ $(AFSKFWLIB) LOGON_DLLSDKLIBS =\ diff --git a/src/WINNT/afsd/afslogon.def b/src/WINNT/afsd/afslogon.def index 28cafc527..fa8daccc1 100644 --- a/src/WINNT/afsd/afslogon.def +++ b/src/WINNT/afsd/afslogon.def @@ -10,5 +10,6 @@ EXPORTS NPPasswordChangeNotify AFS_Startup_Event AFS_Logoff_Event + AFS_Logon_Event diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi index 4d18f5f4c..f97924167 100644 --- a/src/WINNT/install/NSIS/OpenAFS.nsi +++ b/src/WINNT/install/NSIS/OpenAFS.nsi @@ -722,6 +722,7 @@ skipremove: 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" "Logon" "AFS_Logon_Event" 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" diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi index 5095440e6..7d647ceb2 100644 --- a/src/WINNT/install/wix/feature.wxi +++ b/src/WINNT/install/wix/feature.wxi @@ -4,6 +4,7 @@ Description="$(loc.StrAFSProdDesc)" Display="expand" InstallDefault="local" Level="30" Title="OpenAFS"> + diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi index 5f4a86e54..cf18477f2 100644 --- a/src/WINNT/install/wix/files.wxi +++ b/src/WINNT/install/wix/files.wxi @@ -9,7 +9,8 @@ - + + @@ -22,6 +23,9 @@ + + + diff --git a/src/WINNT/install/wix/replace_afs.cmd b/src/WINNT/install/wix/replace_afs.cmd new file mode 100644 index 000000000..1a4f6743e --- /dev/null +++ b/src/WINNT/install/wix/replace_afs.cmd @@ -0,0 +1,59 @@ +@echo off + +if "%1"=="" goto show_usage + +rem Instead of running the script from the current location +rem we copy ourselves over to the TMP directory and run +rem from there. + +if not "%2"=="intemp" goto copy_and_run + +rem Do the actual work + +setlocal +echo This will replace the current installation of OpenAFS with +echo the upgraded version at : +echo "%~f1" +set /p response=Continue? (y/n): +if "%response%"=="y" goto do_this +if "%response%"=="Y" goto do_this +endlocal + +echo Cancelling. No changes were made to your computer. + +goto end_script + +:do_this +endlocal + +echo Running MSIEXEC: +echo on + +msiexec /fvomus "%~f1" + +@echo off +echo Done. + +goto end_script + +:copy_and_run + +copy "%~f0" "%TMP%\tmp_replace_afs.cmd" +"%TMP%\tmp_replace_afs.cmd" "%~f1" intemp + +goto end_script + +:show_usage +echo %0: Upgrade an existing installation of OpenAFS +echo. +echo This command replaces the existing installation with a new +echo installation. You need to obtain the new .MSI from openafs.org +echo and run this command as follows : +echo. +echo %0 [path to new .msi] +echo. +echo The latest release can be found at the following URL: +echo http://www.openafs.org/release/latest.html +echo. + +:end_script