diff --git a/v2/pkg/handler/config.go b/v2/pkg/handler/config.go index ab2ef5a..4952c8f 100644 --- a/v2/pkg/handler/config.go +++ b/v2/pkg/handler/config.go @@ -238,12 +238,12 @@ func (h configHandler) getGroupMemberDNs(gid int) []string { members := make(map[string]bool) for _, u := range h.cfg.Users { if u.PrimaryGroup == gid { - dn := fmt.Sprintf("%s=%s,%s=%s,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) + dn := fmt.Sprintf("%s=%s,%s=%s,ou=users,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) members[dn] = true } else { for _, othergid := range u.OtherGroups { if othergid == gid { - dn := fmt.Sprintf("%s=%s,%s=%s,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) + dn := fmt.Sprintf("%s=%s,%s=%s,ou=users,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) members[dn] = true } } diff --git a/v2/pkg/plugins/basesqlhandler.go b/v2/pkg/plugins/basesqlhandler.go index f29a27b..309185f 100644 --- a/v2/pkg/plugins/basesqlhandler.go +++ b/v2/pkg/plugins/basesqlhandler.go @@ -369,13 +369,13 @@ func (h databaseHandler) getGroupMemberDNs(gid int) []string { return []string{} } if u.PrimaryGroup == gid { - dn := fmt.Sprintf("%s=%s,%s=%s,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) + dn := fmt.Sprintf("%s=%s,%s=%s,ou=users,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) members[dn] = true } else { u.OtherGroups = h.commaListToIntTable(otherGroups) for _, othergid := range u.OtherGroups { if othergid == gid { - dn := fmt.Sprintf("%s=%s,%s=%s,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) + dn := fmt.Sprintf("%s=%s,%s=%s,ou=users,%s", h.backend.NameFormat, u.Name, h.backend.GroupFormat, h.getGroupName(u.PrimaryGroup), h.backend.BaseDN) members[dn] = true } } diff --git a/v2/scripts/ci/good-results/posixGroupList0 b/v2/scripts/ci/good-results/posixGroupList0 index b1fdccc..79d95b9 100644 --- a/v2/scripts/ci/good-results/posixGroupList0 +++ b/v2/scripts/ci/good-results/posixGroupList0 @@ -3,12 +3,12 @@ cn: superheros uid: superheros description: superheros gidNumber: 5501 -uniqueMember: cn=alexdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=hackers,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jackdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jamesdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=johndoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=sarahdoe,ou=superheros,dc=glauth,dc=com +uniqueMember: cn=alexdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=hackers,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jackdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jamesdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=johndoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=sarahdoe,ou=superheros,ou=users,dc=glauth,dc=com memberUid: alexdoe memberUid: hackers memberUid: jackdoe @@ -23,7 +23,7 @@ cn: svcaccts uid: svcaccts description: svcaccts gidNumber: 5502 -uniqueMember: cn=serviceuser,ou=svcaccts,dc=glauth,dc=com +uniqueMember: cn=serviceuser,ou=svcaccts,ou=users,dc=glauth,dc=com memberUid: serviceuser objectClass: posixGroup objectClass: top @@ -33,12 +33,12 @@ cn: vpnaccess uid: vpnaccess description: vpnaccess gidNumber: 5503 -uniqueMember: cn=alexdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=hackers,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jackdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jamesdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=johndoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=sarahdoe,ou=superheros,dc=glauth,dc=com +uniqueMember: cn=alexdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=hackers,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jackdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jamesdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=johndoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=sarahdoe,ou=superheros,ou=users,dc=glauth,dc=com memberUid: alexdoe memberUid: hackers memberUid: jackdoe @@ -53,13 +53,13 @@ cn: allaccs uid: allaccs description: allaccs gidNumber: 5504 -uniqueMember: cn=alexdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=hackers,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jackdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jamesdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=johndoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=sarahdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=serviceuser,ou=svcaccts,dc=glauth,dc=com +uniqueMember: cn=alexdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=hackers,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jackdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jamesdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=johndoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=sarahdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=serviceuser,ou=svcaccts,ou=users,dc=glauth,dc=com memberUid: alexdoe memberUid: hackers memberUid: jackdoe @@ -75,10 +75,10 @@ cn: mailadmin uid: mailadmin description: mailadmin gidNumber: 5505 -uniqueMember: cn=alexdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jackdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jamesdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=sarahdoe,ou=superheros,dc=glauth,dc=com +uniqueMember: cn=alexdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jackdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jamesdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=sarahdoe,ou=superheros,ou=users,dc=glauth,dc=com memberUid: alexdoe memberUid: jackdoe memberUid: jamesdoe @@ -99,10 +99,10 @@ cn: fulltime uid: fulltime description: fulltime gidNumber: 5507 -uniqueMember: cn=alexdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jackdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=jamesdoe,ou=superheros,dc=glauth,dc=com -uniqueMember: cn=sarahdoe,ou=superheros,dc=glauth,dc=com +uniqueMember: cn=alexdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jackdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=jamesdoe,ou=superheros,ou=users,dc=glauth,dc=com +uniqueMember: cn=sarahdoe,ou=superheros,ou=users,dc=glauth,dc=com memberUid: alexdoe memberUid: jackdoe memberUid: jamesdoe