From 917fa33d382f6ae5ed6115f094894f72b3d23c3f Mon Sep 17 00:00:00 2001
From: Juliusz Chroboczek <jch@irif.fr>
Date: Mon, 8 Jun 2020 22:31:12 +0200
Subject: [PATCH] Don't duplicate username in call to addClient.

---
 group.go     | 4 ++--
 webclient.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/group.go b/group.go
index 5d79250..728f2ac 100644
--- a/group.go
+++ b/group.go
@@ -203,13 +203,13 @@ type userid struct {
 	username string
 }
 
-func addClient(name string, c client, user, pass string) (*group, error) {
+func addClient(name string, c client, pass string) (*group, error) {
 	g, err := addGroup(name, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	perms, err := getPermission(g.description, user, pass)
+	perms, err := getPermission(g.description, c.Username(), pass)
 	if err != nil {
 		return nil, err
 	}
diff --git a/webclient.go b/webclient.go
index aa6b96a..dde26a6 100644
--- a/webclient.go
+++ b/webclient.go
@@ -647,7 +647,7 @@ func startClient(conn *websocket.Conn) (err error) {
 	c.writerDone = make(chan struct{})
 	go clientWriter(conn, c.writeCh, c.writerDone)
 
-	g, err := addClient(m.Group, c, m.Username, m.Password)
+	g, err := addClient(m.Group, c, m.Password)
 	if err != nil {
 		return
 	}
@@ -975,7 +975,7 @@ func handleClientMessage(c *webClient, m clientMessage) error {
 			group: c.group,
 			id:    "recording",
 		}
-		_, err := addClient(c.group.name, disk, "", "")
+		_, err := addClient(c.group.name, disk, "")
 		if err != nil {
 			disk.Close()
 			return c.error(err)