aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go8
-rw-r--r--memberof.go18
-rw-r--r--write.go6
3 files changed, 16 insertions, 16 deletions
diff --git a/main.go b/main.go
index cec68ef..532c8c6 100644
--- a/main.go
+++ b/main.go
@@ -298,7 +298,7 @@ func (server *Server) init() error {
}
base_attributes[suffix_dn[0].Type] = []string{suffix_dn[0].Value}
- err = server.addElements(server.config.Suffix, base_attributes)
+ err = server.putAttributes(server.config.Suffix, base_attributes)
if err != nil {
return err
}
@@ -324,7 +324,7 @@ func (server *Server) init() error {
ATTR_ENTRYUUID: []string{genUuid()},
}
- err = server.addElements(admin_dn, admin_attributes)
+ err = server.putAttributes(admin_dn, admin_attributes)
if err != nil {
return err
}
@@ -338,7 +338,7 @@ func (server *Server) init() error {
return nil
}
-func (server *Server) addElements(dn string, attrs Entry) error {
+func (server *Server) putAttributes(dn string, attrs Entry) error {
prefix, err := dnToConsul(dn)
if err != nil {
return err
@@ -364,7 +364,7 @@ func (server *Server) addElements(dn string, attrs Entry) error {
return err
}
} else {
- json, err := json.Marshal(values)
+ json, err := json.MarshalIndent(values, "", " ")
if err != nil {
return err
}
diff --git a/memberof.go b/memberof.go
index cd0686a..e07ed6c 100644
--- a/memberof.go
+++ b/memberof.go
@@ -13,8 +13,8 @@ func (server *Server) memberOfAdd(member string, group string) {
}
// Return early if group is already in memberOf
- for _, mb := range memberGroups {
- if mb == group {
+ for _, g := range memberGroups {
+ if g == group {
server.logger.Warnf("Inconsistency detected, %s was memberOf %s at a time when it didn't exist! (not an issue anymore)",
member, group)
return
@@ -23,7 +23,7 @@ func (server *Server) memberOfAdd(member string, group string) {
// Add group to memberOf
memberGroups = append(memberGroups, group)
- err = server.addElements(member, Entry{
+ err = server.putAttributes(member, Entry{
ATTR_MEMBEROF: memberGroups,
})
if err != nil {
@@ -41,9 +41,9 @@ func (server *Server) memberOfRemove(member string, group string) {
// Filter out group
newMemberOf := []string{}
- for _, mb := range memberOf {
- if mb != group {
- newMemberOf = append(newMemberOf, mb)
+ for _, g := range memberOf {
+ if g != group {
+ newMemberOf = append(newMemberOf, g)
}
}
@@ -55,7 +55,7 @@ func (server *Server) memberOfRemove(member string, group string) {
}
// Update value of memberOf
- err = server.addElements(member, Entry{
+ err = server.putAttributes(member, Entry{
ATTR_MEMBEROF: newMemberOf,
})
if err != nil {
@@ -105,7 +105,7 @@ func (server *Server) memberOfResync() error {
}
if len(keepMember) != len(member) {
server.logger.Warnf("Writing new member list for %s", dn)
- err = server.addElements(dn, Entry{
+ err = server.putAttributes(dn, Entry{
ATTR_MEMBER: keepMember,
})
if err != nil {
@@ -134,7 +134,7 @@ func (server *Server) memberOfResync() error {
if different {
server.logger.Warnf("Fixing memberOf for %s (%d -> %d)",
dn, len(prevMemberOf), len(newMemberOfV))
- err = server.addElements(dn, Entry{
+ err = server.putAttributes(dn, Entry{
ATTR_MEMBEROF: newMemberOfV,
})
if err != nil {
diff --git a/write.go b/write.go
index b04cd2c..3f0033f 100644
--- a/write.go
+++ b/write.go
@@ -134,7 +134,7 @@ func (server *Server) handleAddInternal(state *State, r *message.AddRequest) (in
entry[dnSplit[0].Type] = []string{dnSplit[0].Value}
// Add our item in the DB
- err = server.addElements(dn, entry)
+ err = server.putAttributes(dn, entry)
if err != nil {
return ldap.LDAPResultOperationsError, err
}
@@ -239,7 +239,7 @@ func (server *Server) handleDeleteInternal(state *State, r *message.DelRequest)
}
}
- err = server.addElements(group, Entry{
+ err = server.putAttributes(group, Entry{
ATTR_MEMBER: newMembers,
})
if err != nil {
@@ -455,7 +455,7 @@ func (server *Server) handleModifyInternal(state *State, r *message.ModifyReques
entry[ATTR_MODIFYTIMESTAMP] = []string{genTimestamp()}
// Save the edited values
- err = server.addElements(dn, entry)
+ err = server.putAttributes(dn, entry)
if err != nil {
return ldap.LDAPResultOperationsError, err
}