From dd7d6bf6b517a513d644a7a3511a7113d266a29d Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:55:27 +0200
Subject: [PATCH 1/6] bump version to 1.1
---
.../1.1}/AdmPwd.PSModule/AdmPwd.PS.dll | Bin
.../1.1}/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml | 0
.../1.1}/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml | 0
.../1.1}/AdmPwd.PSModule/AdmPwd.PS.psd1 | Bin
.../1.1}/AdmPwd.PSModule/AdmPwd.Utils.dll | Bin
.../1.1}/AdmPwd.PSModule/README.txt | 0
.../ResetLapsPassword/1.1}/Install/Install.ps1 | 5 +++--
.../ResetLapsPassword/1.1}/LICENSE.txt | 0
.../OsPackages/ResetLapsPassword/1.1}/README.txt | 2 +-
.../EmpirumPackageData.xml | 15 ++++++++-------
10 files changed, 12 insertions(+), 10 deletions(-)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/AdmPwd.PS.dll (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/AdmPwd.PS.psd1 (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/AdmPwd.Utils.dll (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/AdmPwd.PSModule/README.txt (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/Install/Install.ps1 (99%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/LICENSE.txt (100%)
rename src/{ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0 => ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1}/README.txt (99%)
rename src/{ResetLapsPassword 1.0 => ResetLapsPassword 1.1}/EmpirumPackageData.xml (95%)
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.dll b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.dll
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.dll
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.dll
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.dll-Help.xml
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.format.ps1xml
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.psd1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.psd1
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.PS.psd1
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.PS.psd1
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.Utils.dll b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.Utils.dll
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/AdmPwd.Utils.dll
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/AdmPwd.Utils.dll
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/README.txt b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/README.txt
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/AdmPwd.PSModule/README.txt
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/AdmPwd.PSModule/README.txt
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/Install/Install.ps1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
similarity index 99%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/Install/Install.ps1
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
index bd9db19..0b5d874 100644
--- a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/Install/Install.ps1
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
@@ -1,8 +1,8 @@
<#
Name: ResetLapsPassword
-Version: 1.0
+Version: 1.1
Developer: htcfreek (Heiko Horwedel)
-Created at: 25.01.2023
+Created at: 30.03.2023
Github URL: https://github.com/htcfreek/PreOS-ResetLapsPassword
Systems requirements:
@@ -44,6 +44,7 @@ Changes (Date / Version / Author / Change):
2022-11-11 / 0.1 / htcfreek / Initial pre-release version of the package.
2023-01-25 / 0.2 / htcfreek / Complete rewrite of the package with changed variables and behavior.
2023-02-19 / 1.0 / htcfreek / Fix exception for missing LAPS user, comment improvement and first stable release.
+2023-03-30 / 1.1 / htcfreek / Fix incorrect detection of missing Windows LAPS on unsupported systems with missing Legacy CSE.; Clean up PXE log in EMC.; Other log improvements (reboot, managed user).
#>
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/LICENSE.txt b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/LICENSE.txt
similarity index 100%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/LICENSE.txt
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/LICENSE.txt
diff --git a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/README.txt b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/README.txt
similarity index 99%
rename from src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/README.txt
rename to src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/README.txt
index e84dafb..450b25e 100644
--- a/src/ResetLapsPassword 1.0/Data/htcfreek/OsPackages/ResetLapsPassword/1.0/README.txt
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/README.txt
@@ -5,7 +5,7 @@
PreOS-Package: ResetLapsPassword
Author: Heiko Horwedel (htcfreek)
-Version: 1.0
+Version: 1.1
PACKAGE INFORMATION
diff --git a/src/ResetLapsPassword 1.0/EmpirumPackageData.xml b/src/ResetLapsPassword 1.1/EmpirumPackageData.xml
similarity index 95%
rename from src/ResetLapsPassword 1.0/EmpirumPackageData.xml
rename to src/ResetLapsPassword 1.1/EmpirumPackageData.xml
index 7284a85..2ce97f4 100644
--- a/src/ResetLapsPassword 1.0/EmpirumPackageData.xml
+++ b/src/ResetLapsPassword 1.1/EmpirumPackageData.xml
@@ -1,6 +1,6 @@
-
-
+
+
This package triggers the reset of the LAPS password for the client on which it is running.
@@ -10,8 +10,8 @@
0001-01-01T00:00:00
- 1829d0fc-11aa-4f8d-8ab1-ca25dcdb384b
- ResetLapsPassword 1.0
+ 88a37929-0b7d-4434-9ee7-1d9f551a4c61
+ ResetLapsPassword 1.1
0
@@ -111,7 +111,7 @@
htcfreek
- 1.0
+ 1.1
false
@@ -122,7 +122,7 @@
This package triggers the reset of the LAPS password for the client on which it is running.
- %Packages%\htcfreek\OsPackages\ResetLapsPassword\1.0
+ %Packages%\htcfreek\OsPackages\ResetLapsPassword\1.1
0
0
@@ -141,7 +141,7 @@
- htcfreek\OsPackages\ResetLapsPassword\1.0
+ htcfreek\OsPackages\ResetLapsPassword\1.1
0
@@ -210,6 +210,7 @@
0
+
\ No newline at end of file
From 59d7b32a4e2b8a02cd3b2f8cf554a260701e054a Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:56:57 +0200
Subject: [PATCH 2/6] remove empty sw tag
---
src/ResetLapsPassword 1.1/EmpirumPackageData.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/ResetLapsPassword 1.1/EmpirumPackageData.xml b/src/ResetLapsPassword 1.1/EmpirumPackageData.xml
index 2ce97f4..a051ba4 100644
--- a/src/ResetLapsPassword 1.1/EmpirumPackageData.xml
+++ b/src/ResetLapsPassword 1.1/EmpirumPackageData.xml
@@ -210,7 +210,6 @@
0
-
\ No newline at end of file
From bf4cb80ef66fee4ac45e312aafaea2e430ad1947 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:04:22 +0200
Subject: [PATCH 3/6] fix Legacy LAPS/Windows LAPS detection (#8)
---
.../OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
index 0b5d874..39d2f91 100644
--- a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
@@ -427,9 +427,9 @@ function Get-WindowsLapsState([bool]$IsLegacyCSE)
}
}
}
- elseif ((Confirm-RegValueIsDefined -RegPath $regKeyLegacy -RegValueName "AdmPwdEnabled") -AND ($IsLegacyCSE -eq $false))
+ elseif ((Confirm-RegValueIsDefined -RegPath $regKeyLegacy -RegValueName "AdmPwdEnabled") -AND ($IsLegacyCSE -eq $false) -AND ($resultData.Installed -eq $true))
{
- # Legacy Microsoft LAPS Policy (AdmPwd-Policy) - Legacy Emulation Mode. (Only if Legacy CSE is not installed.)
+ # Legacy Microsoft LAPS Policy (AdmPwd-Policy) - Legacy Emulation Mode. (Only if Legacy CSE is not installed and Windows LAPS is installed.)
If ((Get-ItemPropertyValue -Path $regKeyLegacy -Name "AdmPwdEnabled") -eq 1)
{
$resultData.Enabled = $true
From c897d3106e5c324e2c31a1b41a71044f20da2723 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:17:28 +0200
Subject: [PATCH 4/6] improve log: laps user (#11)
---
.../ResetLapsPassword/1.1/Install/Install.ps1 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
index 39d2f91..4c663fb 100644
--- a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
@@ -259,7 +259,7 @@ function Get-LegacyLapsState()
# Returns an object with the following members:
# - Installed : Yes=$true, No=$false (bool value)
# - Enabled : Yes=$true, No=$false (bool value)
- # - UserName
+ # - UserName : Name of managed user or empty if built-in Admin
# - UserExists : Yes=$true, No=$false, =$true
# Initialize return object variable
@@ -318,7 +318,7 @@ function Get-WindowsLapsState([bool]$IsLegacyCSE)
# - LegacyEmulation : Yes=$true, No=$false (bool value)
# - ConfigSource (Possible values: "CSP", "GPO", "Local configuration", "Legacy LAPS")
# - TargetDirectory (Possible values: "Azure AD", "Active Directory")
- # - UserName
+ # - UserName : Name of managed user or empty if built-in Admin
# - UserExists : Yes=$true, No=$false, =$true
# Initialize return object variable
@@ -477,11 +477,13 @@ function Get-LapsResetTasks([bool]$LapsIsMandatory)
# Get configuration
WriteLogDebug "Detecting LAPS configuration ..."
$legacyLapsProperties = Get-LegacyLapsState;
+ $legacyLapsUser = if ([string]::IsNullOrWhiteSpace($legacyLapsProperties.UserName)) { "" } Else { $legacyLapsProperties.UserName };
$winLapsProperties = Get-WindowsLapsState -IsLegacyCSE $legacyLapsProperties.Installed;
+ $winLapsUser = if ([string]::IsNullOrWhiteSpace($winLapsProperties.UserName)) { "" } Else { $winLapsProperties.UserName };
WriteLogInfo "Legacy Microsoft LAPS: Installed = $(ConvertTo-YesNo $legacyLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $legacyLapsProperties.Enabled)"
- WriteLogDebug "Legacy Microsoft LAPS user: $($legacyLapsProperties.UserName)"
+ WriteLogDebug "Legacy Microsoft LAPS user: $($legacyLapsUser)"
WriteLogInfo "Windows LAPS: Installed = $(ConvertTo-YesNo $winLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $winLapsProperties.Enabled), Configuration source = $($winLapsProperties.ConfigSource), Target Directory = $($winLapsProperties.TargetDirectory), Legacy emulation mode = $(ConvertTo-YesNo $winLapsProperties.LegacyEmulation)"
- WriteLogDebug "Windows LAPS user: $($winLapsProperties.UserName)"
+ WriteLogDebug "Windows LAPS user: $($winLapsUser)"
# Checking results
if (($legacyLapsProperties.Enabled -eq $false) -AND ($winLapsProperties.Enabled -eq $false))
From fd125dc4a29e5654fb1a4d5499a7491bca9107d4 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:34:54 +0200
Subject: [PATCH 5/6] Log: Change reboot severity (#10)
---
.../OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
index 4c663fb..2fb8472 100644
--- a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
@@ -89,9 +89,9 @@ function WriteLogDebug([string] $Message)
Write-Host "[ResetLapsPassword] $message" -ForegroundColor Magenta;
}
-function ExitWithCodeMessage($errorCode, $errorMessage)
+function ExitWithCodeMessage([int]$errorCode, [string]$errorMessage, [Switch]$isAbortReboot)
{
- If ($errorCode -eq 0)
+ If (($errorCode -eq 0) -or ($isAbortReboot))
{
WriteLogInfo -Message $errorMessage;
}
@@ -202,7 +202,7 @@ function Update-ClientMgmtConfiguration([int]$IntuneSyncTimeout)
$regNetlogon = Get-ChildItem -Path "HKLM:\SYSTEM\CurrentControlSet\Services\Netlogon" -Name
if (($regNetlogon -contains 'JoinDomain') -or ($regNetlogon -contains 'AvoidSpnSet'))
{
- ExitWithCodeMessage -errorCode 504 -errorMessage "ERROR: Pending reboot from an Active Directory domain join detected! - Rebooting client ..."
+ ExitWithCodeMessage -errorCode 504 -errorMessage "IMPORTANT: Pending reboot from an Active Directory domain join detected! - Rebooting client ..." -isAbortReboot
}
# If the device is joined to a local Active Directory, then update the GPOs.
From fd318206087bc11f100518d1053c767ba2ffef98 Mon Sep 17 00:00:00 2001
From: htcfreek <61519853+htcfreek@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:51:37 +0200
Subject: [PATCH 6/6] Log: Clean up PXE log (#9)
---
.../ResetLapsPassword/1.1/Install/Install.ps1 | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1 b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
index 2fb8472..1e19df5 100644
--- a/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
+++ b/src/ResetLapsPassword 1.1/Data/htcfreek/OsPackages/ResetLapsPassword/1.1/Install/Install.ps1
@@ -243,7 +243,7 @@ function Update-ClientMgmtConfiguration([int]$IntuneSyncTimeout)
}
# Write the summary to log.
- WriteLogInfo "Management summary: Azure AD joined = $(ConvertTo-YesNo $isAzureAD), Domain joined = $(ConvertTo-YesNo $isActiveDirectory), Workgroup joined = $(ConvertTo-YesNo $isWorkgroup), Intune enrolled = $(ConvertTo-YesNo $isIntuneMDM)"
+ WriteLogDebug "Management summary: Azure AD joined = $(ConvertTo-YesNo $isAzureAD), Domain joined = $(ConvertTo-YesNo $isActiveDirectory), Workgroup joined = $(ConvertTo-YesNo $isWorkgroup), Intune enrolled = $(ConvertTo-YesNo $isIntuneMDM)"
# Return result (<$true> if joined and <$false> if not.)
return ($isAzureAD -or $isActiveDirectory)
@@ -480,10 +480,8 @@ function Get-LapsResetTasks([bool]$LapsIsMandatory)
$legacyLapsUser = if ([string]::IsNullOrWhiteSpace($legacyLapsProperties.UserName)) { "" } Else { $legacyLapsProperties.UserName };
$winLapsProperties = Get-WindowsLapsState -IsLegacyCSE $legacyLapsProperties.Installed;
$winLapsUser = if ([string]::IsNullOrWhiteSpace($winLapsProperties.UserName)) { "" } Else { $winLapsProperties.UserName };
- WriteLogInfo "Legacy Microsoft LAPS: Installed = $(ConvertTo-YesNo $legacyLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $legacyLapsProperties.Enabled)"
- WriteLogDebug "Legacy Microsoft LAPS user: $($legacyLapsUser)"
- WriteLogInfo "Windows LAPS: Installed = $(ConvertTo-YesNo $winLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $winLapsProperties.Enabled), Configuration source = $($winLapsProperties.ConfigSource), Target Directory = $($winLapsProperties.TargetDirectory), Legacy emulation mode = $(ConvertTo-YesNo $winLapsProperties.LegacyEmulation)"
- WriteLogDebug "Windows LAPS user: $($winLapsUser)"
+ WriteLogDebug "Legacy Microsoft LAPS: Installed = $(ConvertTo-YesNo $legacyLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $legacyLapsProperties.Enabled), Managed user = $($legacyLapsUser)"
+ WriteLogDebug "Windows LAPS: Installed = $(ConvertTo-YesNo $winLapsProperties.Installed), Enabled = $(ConvertTo-YesNo $winLapsProperties.Enabled), Managed user = $($winLapsUser), Configuration source = $($winLapsProperties.ConfigSource), Target Directory = $($winLapsProperties.TargetDirectory), Legacy emulation mode = $(ConvertTo-YesNo $winLapsProperties.LegacyEmulation)"
# Checking results
if (($legacyLapsProperties.Enabled -eq $false) -AND ($winLapsProperties.Enabled -eq $false))
@@ -543,8 +541,8 @@ function Invoke-LapsResetCommands([PSCustomObject]$LapsResetTasks, [bool]$DoRese
# Debug/Log information
WriteLogDebug "Starting reset sequence ..."
WriteLogDebug "Final reset task summary: $($LapsResetTasks -replace ';',',' -replace '@{','' -replace '}',',') DoResetImmediately=$($DoResetImmediately)"
+ WriteLogDebug "Executing user account: $env:Username"
if ($DoResetImmediately) { WriteLogInfo "Immediate reset is enabled." } Else { WriteLogInfo "Immediate reset is disabled. - Only expiration time will be set." }
- WriteLogInfo "Executing user account: $env:Username"
# Reset Windows LAPS password.
if ($LapsResetTasks.WinLaps)
@@ -588,7 +586,7 @@ function Invoke-LapsResetCommands([PSCustomObject]$LapsResetTasks, [bool]$DoRese
if ($LapsResetTasks.WinLapsInEmulationMode -or $LapsResetTasks.LegacyLaps)
{
WriteLogInfo "Resetting password for legacy Microsoft LAPS user ..."
- if ($LapsResetTasks.WinLapsInEmulationMode) { WriteLogInfo "Windows LAPS is running in legacy Microsoft LAPS emulation mode. - Using the Microsoft LAPS module." }
+ if ($LapsResetTasks.WinLapsInEmulationMode) { WriteLogDebug "Windows LAPS is running in legacy Microsoft LAPS emulation mode. - Using the Microsoft LAPS PowerShell module." }
try
{
@@ -635,7 +633,7 @@ function Main() {
}
else {
[string] $osInfo = (Get-WmiObject -class Win32_OperatingSystem).Caption + " " + (Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' -Name "DisplayVersion") + " (Build $([System.Environment]::OSVersion.Version.Build))"
- WriteLogInfo -Message "Operating System: $($osInfo)"
+ WriteLogDebug -Message "Operating System: $($osInfo)"
}
# Check user context
@@ -666,10 +664,10 @@ function Main() {
{
try {
[string] $lapsLegacyModulePath = (Split-Path $PSScriptRoot -Parent) + "\AdmPwd.PSModule\AdmPwd.PS.psd1"
- WriteLogInfo -message "Importing module for legacy 'Microsoft LAPS' (AdmPwd.PS.psd1) ..."
+ WriteLogDebug -message "Importing module for legacy 'Microsoft LAPS' (AdmPwd.PS.psd1) ..."
WriteLogDebug "Module path: $($lapsLegacyModulePath)"
Import-Module "$lapsLegacyModulePath" -ErrorAction Stop
- WriteLogInfo -message "Module imported successfully."
+ WriteLogDebug -message "Module imported successfully."
} catch {
ExitWithCodeMessage -errorCode 509 -errorMessage "ERROR: Failed to import PowerShell module for legacy Microsoft LAPS (AdmPwd.PS.psd1)! - $($_.Exception.Message)"
}