lxc: Always allow specifying a password when adding remotes

This fixes a regression introduced in #13567. If the client talks to an older LXD that has the explicit_trust_token extension, let the provided password take priority and don't ask for the token if not provided. Signed-off-by: Julian Pelizäus <[email protected]>
canonical · Jun 21, 2024 · e6c71a1 · e6c71a1
1 parent 18214db
commit e6c71a1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lxc/remote.go b/lxc/remote.go
@@ -558,7 +558,9 @@ func (c *cmdRemoteAdd) run(cmd *cobra.Command, args []string) error {
 		if c.flagAuthType == api.AuthenticationMethodTLS {
 			req := api.CertificatesPost{}
 
-			if d.(lxd.InstanceServer).HasExtension("explicit_trust_token") {
+			// If the password flag isn't provided and the server supports the explicit_trust_token extension,
+			// use the token instead and prompt for it if not present.
+			if d.(lxd.InstanceServer).HasExtension("explicit_trust_token") && c.flagPassword == "" {
 				// Prompt for trust token.
 				if c.flagToken == "" {
 					c.flagToken, err = c.global.asker.AskString(fmt.Sprintf(i18n.G("Trust token for %s: "), server), "", nil)