Send "already existing nickname" error to unregistered client, instead of already...

[goircd.git] / daemon.go

diff --git a/daemon.go b/daemon.go
index d8cc3b8bc2729d87af875dc7ea30ffd06b389c7b..3c1692ffa09a762d9397d65fdf005a7fc9192f2f 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -158,8 +158,8 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
                        return
                }
                nickname := cols[1]
-               for client := range daemon.clients {
-                       if client.nickname == nickname {
+               for existing_client := range daemon.clients {
+                       if existing_client.nickname == nickname {
                                client.ReplyParts("433", "*", nickname, "Nickname is already in use")
                                return
                        }
@@ -377,7 +377,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                target := strings.ToLower(cols[0])
                                for c := range daemon.clients {
                                        if c.nickname == target {
-                                               msg = fmt.Sprintf(":%s %s %s :%s", client, command, c.nickname, cols[1])
+                                               msg = fmt.Sprintf(":%s %s %s %s", client, command, c.nickname, cols[1])
                                                c.Msg(msg)
                                                break
                                        }