From a67962b02d9ff6defbf840766dbdde119be4d649 Mon Sep 17 00:00:00 2001
From: Bolke de Bruin <bolke@xs4all.nl>
Date: Sat, 16 Mar 2024 11:32:02 +0100
Subject: [PATCH] Fix no username issues
---
cmd/rdpgw/config/configuration.go | 2 +-
cmd/rdpgw/web/web.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/rdpgw/config/configuration.go b/cmd/rdpgw/config/configuration.go
index 0a083d2..8bd1ff4 100644
--- a/cmd/rdpgw/config/configuration.go
+++ b/cmd/rdpgw/config/configuration.go
@@ -94,7 +94,7 @@ type ClientConfig struct {
// kept for backwards compatibility
UsernameTemplate string `koanf:"usernametemplate"`
SplitUserDomain bool `koanf:"splituserdomain"`
- NoUsername string `koanf:"nousername"`
+ NoUsername bool `koanf:"nousername"`
}
func ToCamel(s string) string {
diff --git a/cmd/rdpgw/web/web.go b/cmd/rdpgw/web/web.go
index a22d835..30f4b85 100644
--- a/cmd/rdpgw/web/web.go
+++ b/cmd/rdpgw/web/web.go
@@ -37,7 +37,7 @@ type Config struct {
type RdpOpts struct {
UsernameTemplate string
SplitUserDomain bool
- NoUsername bool
+ NoUsername bool
}
type Handler struct {
@@ -211,7 +211,7 @@ func (h *Handler) HandleDownload(w http.ResponseWriter, r *http.Request) {
}
}
- if !NoUsername {
+ if !h.rdpOpts.NoUsername {
d.Settings.Username = render
if domain != "" {
d.Settings.Domain = domain
--
GitLab