From b8ed284648002d6a910d5d6657ec5fd1c6a7546f Mon Sep 17 00:00:00 2001
From: Przemyslaw Klys <przemyslaw.klys@evotec.pl>
Date: Fri, 19 Jun 2020 19:27:53 +0200
Subject: [PATCH] Fix for CanonicalName

---
 Examples/Example-14-ListingGPOsPerOU3.ps1 | 5 +++--
 Private/Get-PrivGPOZaurrLInk.ps1          | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Examples/Example-14-ListingGPOsPerOU3.ps1 b/Examples/Example-14-ListingGPOsPerOU3.ps1
index 5a1a7cf..0b9ab79 100644
--- a/Examples/Example-14-ListingGPOsPerOU3.ps1
+++ b/Examples/Example-14-ListingGPOsPerOU3.ps1
@@ -1,5 +1,6 @@
 Import-Module "$PSScriptRoot\..\GPoZaurr.psd1" -Force
 
-#Get-ADOrganizationalUnit -Filter * -Properties distinguishedName, LinkedGroupPolicyObjects | Get-GPOZaurrLink | Format-Table
-#Get-ADObject -Filter * -Properties distinguishedName, gplink -Server 'ad.evotec.pl' | Get-GPOZaurrLink | Format-Table -AutoSize
+Get-ADOrganizationalUnit -Filter * -Properties distinguishedName, LinkedGroupPolicyObjects | Get-GPOZaurrLink | Format-Table
+Get-ADOrganizationalUnit -Filter * -Properties canonicalname, distinguishedName, LinkedGroupPolicyObjects | Get-GPOZaurrLink | Format-Table
+Get-ADObject -Filter * -Properties distinguishedName, gplink -Server 'ad.evotec.pl' | Get-GPOZaurrLink | Format-Table -AutoSize
 Get-GPOZaurrLink | Format-Table -AutoSize
\ No newline at end of file
diff --git a/Private/Get-PrivGPOZaurrLInk.ps1 b/Private/Get-PrivGPOZaurrLInk.ps1
index 11313ec..2032ac8 100644
--- a/Private/Get-PrivGPOZaurrLInk.ps1
+++ b/Private/Get-PrivGPOZaurrLInk.ps1
@@ -13,7 +13,7 @@
                 $DomainCN = ConvertFrom-DistinguishedName -DistinguishedName $_ -ToDomainCN
                 $Output = [ordered] @{
                     DistinguishedName = $Object.DistinguishedName
-                    CanonicalName     = $Object.CanonicalName.TrimEnd('/');
+                    CanonicalName     = if ($Object.CanonicalName) { $Object.CanonicalName.TrimEnd('/') } else { $Object.CanonicalName }
                     Guid              = [Regex]::Match( $_, '(?={)(.*)(?<=})').Value -replace '{' -replace '}'
                 }
                 $Search = -join ($DomainCN, $Output['Guid'])
@@ -45,7 +45,7 @@
                 $DomainCN = ConvertFrom-DistinguishedName -DistinguishedName $_ -ToDomainCN
                 $Output = [ordered] @{
                     DistinguishedName = $Object.DistinguishedName
-                    CanonicalName     = $Object.CanonicalName.TrimEnd('/');
+                    CanonicalName     = if ($Object.CanonicalName) { $Object.CanonicalName.TrimEnd('/') } else { $Object.CanonicalName }
                     Guid              = [Regex]::Match( $_, '(?={)(.*)(?<=})').Value -replace '{' -replace '}'
                 }
                 $Search = -join ($DomainCN, $Output['Guid'])