Merge pull request #182 from TheJumpCloud/ADMU_1.2.5

ADMU_1.2.5
TheJumpCloud · Dec 2, 2019 · a7d9ff1 · a7d9ff1
2 parents dc3f4e0 + 5527413
commit a7d9ff1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/ADMU/CHANGELOG.md b/ADMU/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.2.5
+
+#### RELEASE DATE
+
+December 2, 2019
+
+#### RELEASE NOTES
+
+- ConvertSID Function updated to work on windows 7 and powershell 2.0
+
 ## 1.2.4
 
 #### RELEASE DATE

diff --git a/ADMU/exe/Windows 7/gui_jcadmu_win7.exe b/ADMU/exe/Windows 7/gui_jcadmu_win7.exe
diff --git a/ADMU/exe/Windows 7/jcadmu_win7.exe b/ADMU/exe/Windows 7/jcadmu_win7.exe
diff --git a/ADMU/exe/Windows 8-10/gui_jcadmu_win10.exe b/ADMU/exe/Windows 8-10/gui_jcadmu_win10.exe
diff --git a/ADMU/exe/Windows 8-10/jcadmu_win10.exe b/ADMU/exe/Windows 8-10/jcadmu_win10.exe
diff --git a/ADMU/powershell/Form.ps1 b/ADMU/powershell/Form.ps1
@@ -11,7 +11,7 @@
  <Window
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-     Title="JumpCloud ADMU 1.2.4" Height="460.945" Width="980.016" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ForceCursor="True">
+     Title="JumpCloud ADMU 1.2.5" Height="460.945" Width="980.016" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" ForceCursor="True">
      <Grid Margin="0,0,-0.2,0.168">
          <ListView Name="lvProfileList" HorizontalAlignment="Left" Height="141.629" Margin="9.9,149.476,0,0" VerticalAlignment="Top" Width="944.422">
              <ListView.View>

diff --git a/ADMU/powershell/Functions.ps1 b/ADMU/powershell/Functions.ps1
@@ -318,18 +318,15 @@ function GetNetBiosName {
 }
 
 function ConvertSID {
+  [CmdletBinding()]
   param
   (
     [Parameter(Mandatory = $true, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
-    [Alias('Value')]
     $Sid
   )
-
   process
   {
-    $objSID = New-Object System.Security.Principal.SecurityIdentifier($sid)
-    $objUser = $objSID.Translate( [System.Security.Principal.NTAccount])
-    $objUser.Value
+    (New-Object System.Security.Principal.SecurityIdentifier($Sid)).Translate( [System.Security.Principal.NTAccount]).Value
   }
 }
 

diff --git a/ADMU/powershell/Migration.ps1 b/ADMU/powershell/Migration.ps1