diff options
| -rw-r--r-- | bottin.hcl.example | 2 | ||||
| -rw-r--r-- | ldapserver/packet.go | 3 | ||||
| -rw-r--r-- | write.go | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bottin.hcl.example b/bottin.hcl.example index d10394b..8305a01 100644 --- a/bottin.hcl.example +++ b/bottin.hcl.example @@ -12,7 +12,7 @@ job "directory" { task "server" { driver = "docker" config { - image = "lxpz/bottin_amd64:3" + image = "lxpz/bottin_amd64:4" readonly_rootfs = true port_map { ldap_port = 389 diff --git a/ldapserver/packet.go b/ldapserver/packet.go index bd0f6e5..a87035c 100644 --- a/ldapserver/packet.go +++ b/ldapserver/packet.go @@ -86,7 +86,8 @@ func readTagAndLength(conn *bufio.Reader, bytes *[]byte) (ret ldap.TagAndLength, // } // We are expecting the LDAP sequence tag 0x30 as first byte if b != 0x30 { - return nil, fmt.Errorf("Expecting 0x30 as first byte, but got %#x instead", b) + err = fmt.Errorf("Expecting 0x30 as first byte, but got %#x instead", b) + return } b, err = readBytes(conn, bytes, 1) @@ -337,7 +337,7 @@ func (server *Server) handleModifyInternal(state *State, r *message.ModifyReques continue } if itemDN != dn { - logger.Fatal("itemDN != dn in handleModifyInternal") + server.logger.Fatal("itemDN != dn in handleModifyInternal") } vals, err := parseValue(item.Value) if err != nil { |