TUN-4832: Prevent tunnel from running accidentally when only proxy-dns should run

nmldiegues · nmldiegues · commit aa2433822586 · 2021-07-29T11:05:12.000Z
diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go
@@ -165,7 +165,7 @@ func TunnelCommand(c *cli.Context) error {
 
 	// Unauthenticated named tunnel on <random>.<quick-tunnels-service>.com
 	// For now, default to legacy setup unless quick-service is specified
-	if c.String("hostname") == "" && c.String("quick-service") != "" {
+	if !dnsProxyStandAlone(c, nil) && c.String("hostname") == "" && c.String("quick-service") != "" {
 		return RunQuickTunnel(sc)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func TunnelCommand(c *cli.Context) error {`
`165`	`165`
`166`	`166`	`// Unauthenticated named tunnel on <random>.<quick-tunnels-service>.com`
`167`	`167`	`// For now, default to legacy setup unless quick-service is specified`
`168`		`- if c.String("hostname") == "" && c.String("quick-service") != "" {`
	`168`	`+ if !dnsProxyStandAlone(c, nil) && c.String("hostname") == "" && c.String("quick-service") != "" {`
`169`	`169`	`return RunQuickTunnel(sc)`
`170`	`170`	`}`
`171`	`171`