diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2008-07-16 23:33:54 +0400 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2008-07-16 23:33:54 +0400 |
commit | bed5a336c4794f807cad9cc887761f9b3ad14674 (patch) | |
tree | 877ee481f035ef2df10e347a1a70ac5884944396 /winsup | |
parent | 80f6f52cb1e673a5196cc18de0a4bfb1f492b80d (diff) |
* cyglsa-config: Always create a /bin/cyglsa directory and copy the
LSA DLL there. Register this copy in the registry.
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/lsaauth/ChangeLog | 5 | ||||
-rwxr-xr-x | winsup/lsaauth/cyglsa-config | 34 |
2 files changed, 26 insertions, 13 deletions
diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog index 962bd6e11..b859c3cc2 100644 --- a/winsup/lsaauth/ChangeLog +++ b/winsup/lsaauth/ChangeLog @@ -1,3 +1,8 @@ +2008-07-16 Corinna Vinschen <corinna@vinschen.de> + + * cyglsa-config: Always create a /bin/cyglsa directory and copy the + LSA DLL there. Register this copy in the registry. + 2008-07-15 Corinna Vinschen <corinna@vinschen.de> * cyglsa.c: Include ntddk.h again, but only if __MINGW32__ is defined. diff --git a/winsup/lsaauth/cyglsa-config b/winsup/lsaauth/cyglsa-config index 7309260b2..4aea2940c 100755 --- a/winsup/lsaauth/cyglsa-config +++ b/winsup/lsaauth/cyglsa-config @@ -38,15 +38,7 @@ request() fi } -# Check if running on NT -_sys="`uname`" -_nt=`expr "${_sys}" : "CYGWIN_NT"` -if [ ${_nt} -eq 0 ] -then - echo "LSA authentication does not work on Windows 95/98/Me. Exiting." - exit 1 -fi -# If running on NT, check if running under at least Windows 2000 +# Check if running under at least Windows 2000 _nt_too_old=`uname | awk -F- '{print ( $2 < 5.0 ) ? 1 : 0;}'` if [ ${_nt_too_old} -eq 1 ] then @@ -79,23 +71,39 @@ request "Are you sure you want to continue?" || exit 0 # The registry value which keeps the authentication packages. value='/HKEY_LOCAL_MACHINE/SYSTEM/CurrentControlSet/Control/Lsa/Authentication Packages' -# Get old content, remove evry trace of "cyglsa" from it and write the +[ -f /bin/cyglsa -a ! -d /bin/cyglsa ] && rm -rf /bin/cyglsa +if [ ! -d /bin/cyglsa ] +then + if ! mkdir -m 755 /bin/cyglsa + then + echo "Creating the /bin/cyglsa directory failed. Exiting." + exit 1 + fi +fi +if ! mv -b /bin/${dll} /bin/cyglsa/${dll} +then + echo "Copying the new LSA authentication package /bin/${dll} to" + echo "/bin/cyglsa/${dll} failed. Exiting." + exit 1 +fi + +# Get old content, remove every trace of "cyglsa" from it and write the # content back to the registry with the new, correct path to the cyglsa DLL. old=`regtool get "${value}"` new=`for i in ${old} do echo $i | grep -v cyglsa done` -if ! regtool set "${value}" ${new} "${bindir}\\${dll}" +if ! regtool set "${value}" ${new} "${bindir}\\cyglsa\\${dll}" then - echo "Setting the new registry value failed." + echo "Setting the new registry value failed. Exiting." exit 1 fi echo echo "Cygwin LSA authentication package registered." echo -echo "Activating the Cygwin's LSA authentication package requires to reboot." +echo "Activating Cygwin's LSA authentication package requires to reboot." if [ -x /bin/shutdown ] then if request "Do you want to do this immediately?" |