From 744a68c8d9cc2892de50224de89c6df2f5555541 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 6 Nov 2019 09:54:43 +0100
Subject: [PATCH] jj

---
 .../DDUserManager/ClassActiveDirectory.vb     | 51 ++++++++++++-------
 .../DDUserManager/frmADImport_Groups.vb       |  2 +
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/DDUserManager/DDUserManager/ClassActiveDirectory.vb b/DDUserManager/DDUserManager/ClassActiveDirectory.vb
index c40d721..8138932 100644
--- a/DDUserManager/DDUserManager/ClassActiveDirectory.vb
+++ b/DDUserManager/DDUserManager/ClassActiveDirectory.vb
@@ -149,26 +149,41 @@ Public Class ClassActiveDirectory
                     objectCategory = ""
                 End Try
 
-                If Not String.IsNullOrEmpty(groupName) Then
-                    Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup)
-                                                                  Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup))
-                                                              End Function).Any()
-
-                    If Not isExcluded Then
-                        groups.Add(New GroupResult() With {
-                            .SAMAccountName = groupName,
-                            .CN = cn,
-                            .Description = description,
-                            .DistinguishedName = distinguishedName,
-                            .Name = name,
-                            .ObjectCategory = objectCategory,
-                            .ObjectClass = objectClass
-                        })
-                    End If
-                End If
+                'If Not String.IsNullOrEmpty(groupName) Then
+                '    Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup)
+                '                                                  Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup))
+                '                                              End Function).Any()
+
+                '    If Not isExcluded Then
+                '        groups.Add(New GroupResult() With {
+                '            .SAMAccountName = groupName,
+                '            .CN = cn,
+                '            .Description = description,
+                '            .DistinguishedName = distinguishedName,
+                '            .Name = name,
+                '            .ObjectCategory = objectCategory,
+                '            .ObjectClass = objectClass
+                '        })
+                '    End If
+                'End If
+
+                logger.Info("Adding Group '{0}'", groupName)
+
+                'If Not String.IsNullOrEmpty(groupName) Then
+                groups.Add(New GroupResult() With {
+                    .SAMAccountName = groupName,
+                    .CN = cn,
+                    .Description = description,
+                    .DistinguishedName = distinguishedName,
+                    .Name = name,
+                    .ObjectCategory = objectCategory,
+                    .ObjectClass = objectClass
+                })
+                'End If
+
             Catch ex As Exception
-                'MsgBox("Error while fetching Active Directory groups", MsgBoxStyle.Critical)
                 logger.Error(ex)
+                Continue For
             End Try
         Next
 
diff --git a/DDUserManager/DDUserManager/frmADImport_Groups.vb b/DDUserManager/DDUserManager/frmADImport_Groups.vb
index 118161b..ae6f600 100644
--- a/DDUserManager/DDUserManager/frmADImport_Groups.vb
+++ b/DDUserManager/DDUserManager/frmADImport_Groups.vb
@@ -7,6 +7,8 @@ Public Class frmADImport_Groups
         Try
             Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY)
 
+            logger.Info("Found {0} groups", groups.Count)
+
             UserDataSet.TBLOCAL_ADGROUPS.Clear()
 
             For Each group As ClassActiveDirectory.GroupResult In groups