AppStd/UserManager
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj

Browse Source
This commit is contained in:
Jonathan Jenne 2019-11-06 09:54:43 +01:00
parent a15877c85c
commit 744a68c8d9
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
DDUserManager/DDUserManager/ClassActiveDirectory.vb
View File

@ -149,26 +149,41 @@ Public Class ClassActiveDirectory
objectCategory = "" objectCategory = ""
End Try End Try
If Not String.IsNullOrEmpty(groupName) Then 'If Not String.IsNullOrEmpty(groupName) Then
Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup) ' Dim isExcluded = excludedGroupNames.Where(Function(excludedGroup)
Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup)) ' Return (groupName.Contains(excludedGroup) Or groupName.StartsWith(excludedGroup))
End Function).Any() ' 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
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
Catch ex As Exception Catch ex As Exception
'MsgBox("Error while fetching Active Directory groups", MsgBoxStyle.Critical)
logger.Error(ex) logger.Error(ex)
Continue For
End Try End Try
Next Next

2
DDUserManager/DDUserManager/frmADImport_Groups.vb
View File

@ -7,6 +7,8 @@ Public Class frmADImport_Groups
Try Try
Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY) Dim groups = ClassActiveDirectory.GetActiveDirectoryGroups(My.Settings.AD_GROUP_QUERY)
logger.Info("Found {0} groups", groups.Count)
UserDataSet.TBLOCAL_ADGROUPS.Clear() UserDataSet.TBLOCAL_ADGROUPS.Clear()
For Each group As ClassActiveDirectory.GroupResult In groups For Each group As ClassActiveDirectory.GroupResult In groups