ErrorBanner: bugfix when etcd is not configured

cyrilst · cyrilst · commit 2da9e396f0b6 · 2023-06-15T13:43:43.000+02:00
diff --git a/cmd/sshproxy-dumpd/sshproxy-dumpd.go b/cmd/sshproxy-dumpd/sshproxy-dumpd.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/cmd/sshproxy-replay/sshproxy-replay.go b/cmd/sshproxy-replay/sshproxy-replay.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/cmd/sshproxy/commands.go b/cmd/sshproxy/commands.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/cmd/sshproxy/recorder.go b/cmd/sshproxy/recorder.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/cmd/sshproxy/sshproxy.go b/cmd/sshproxy/sshproxy.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
@@ -334,7 +334,10 @@ func mainExitCode() int {
 	case err != nil:
 		log.Fatalf("Finding destination: %s", err)
 	case hostport == "":
-		errorBanner, _, _ := cli.GetErrorBanner()
+		errorBanner := ""
+		if cli != nil && cli.IsAlive() {
+			errorBanner, _, _ = cli.GetErrorBanner()
+		}
 		if errorBanner == "" {
 			errorBanner = config.ErrorBanner
 		}
diff --git a/cmd/sshproxyctl/sshproxyctl.go b/cmd/sshproxyctl/sshproxyctl.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/record/record.go b/pkg/record/record.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/config.go b/pkg/utils/config.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/duration.go b/pkg/utils/duration.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/etcd.go b/pkg/utils/etcd.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/logging.go b/pkg/utils/logging.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/route.go b/pkg/utils/route.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //
diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2022 CEA/DAM/DIF
+// Copyright 2015-2023 CEA/DAM/DIF
 //  Author: Arnaud Guignard <arnaud.guignard@cea.fr>
 //  Contributor: Cyril Servant <cyril.servant@cea.fr>
 //

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2015-2022 CEA/DAM/DIF`
	`1`	`+// Copyright 2015-2023 CEA/DAM/DIF`
`2`	`2`	`// Author: Arnaud Guignard <[email protected]>`
`3`	`3`	`// Contributor: Cyril Servant <[email protected]>`
`4`	`4`	`//`