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 cbdb89aef1ca8990c9dc5172fb565d73bd77a777..7194e87c7834adea3e914e30cc8baba068487e81 100644 (file)
--- 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 28cafc527f39d8739e52965ab448a8423e42ccda..fa8daccc194ad83863de9f21d34b79ac97d32af2 100644 (file)
--- 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 4d18f5f4c7cde313583c828ce837baac75e39719..f97924167cc725d4e829665b8b55750619823ab7 100644 (file)
--- 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 5095440e6d2a0689062b6e0b2528dc0f4f114ce4..7d647ceb22cb03cc1d84486acc728f1914e3a738 100644 (file)
--- 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">
            <ComponentRef Id="efl_desktop_INI" />
+           <ComponentRef Id="efl_replace_afs_CMD" />
             <Feature Id="feaClient" AllowAdvertise="no" Description="$(loc.StrAFSClientLongDesc)" Display="expand"
                 InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDesc)">
                 

diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 5f4a86e5422d33de17215884257576605ca65d3a..cf18477f2ce3505980757c7782ca2f43fcab064e 100644 (file)
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -9,7 +9,8 @@
             <Registry Id="reg_afslogon04" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Impersonate" Type="integer" Value="1" />
             <Registry Id="reg_afslogon05" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="DLLName" Type="string" Value="[#fileafslogon_DLL]" />
             <Registry Id="reg_afslogon06" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logoff" Type="string" Value="AFS_Logoff_Event" />
-            <Registry Id="reg_afslogon07" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Startup" Type="string" Value="AFS_Startup_Event" />
+            <Registry Id="reg_afslogon07" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Logon" Type="string" Value="AFS_Logon_Event" />
+            <Registry Id="reg_afslogon08" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\AfsLogon" Name="Startup" Type="string" Value="AFS_Startup_Event" />
         </Component>
     <?ifdef DebugSyms?>
         <Component Id="cmp_ClientSystemDebug" Guid="DD34DA09-D9DA-4A5A-9521-87B7738A7D53">
@@ -22,6 +23,9 @@
            <Component Id="efl_desktop_INI" Guid="0ADB427F-3648-4BE0-983B-C454AA51895C">
                <File Id="fildesktop_INI" Name="desktop.ini" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\install\wix\afsdesktop.ini" Hidden="yes" System="yes" />
            </Component>
+            <Component Id="efl_replace_afs_CMD" Guid="C9C93F3E-EEBA-4056-9669-5EF78D748D50">
+               <File Id="filreplace_afs_CMD" Name="replafs.cmd" LongName="replace_afs.cmd" KeyPath="yes" DiskId="1" src="$(var.SrcDir)\WINNT\install\wix\replace_afs.cmd" />
+            </Component>
             <Directory Id="dirCommon" Name="Common">
                 <Component Id="cmp_CommonDir" Guid="C86B03A1-AE97-48B1-A77B-1B2395F1E117" KeyPath="yes">
                     <Environment Id="envCommon" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Common" />

diff --git a/src/WINNT/install/wix/replace_afs.cmd b/src/WINNT/install/wix/replace_afs.cmd
new file mode 100644 (file)
index 0000000..1a4f674
--- /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