upstream: warn when the user specifies a ForwardAgent path that does

not exist and exit if ExitOnForwardFailure is set; bz3264

OpenBSD-Commit-ID: 72f7875865e723e464c71bf8692e83110699bf26

diff --git a/ssh.c b/ssh.c
index 220d2080e7f5c3a68c6f89020ebf2afde69e4fba..53330da5aecd18a7a23dbd289889fc07b6398c0c 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.551 2021/02/15 20:43:15 markus Exp $ */
+/* $OpenBSD: ssh.c,v 1.552 2021/02/23 00:05:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1419,6 +1419,12 @@ main(int ac, char **av)
                free(p);
                free(options.forward_agent_sock_path);
                options.forward_agent_sock_path = cp;
+               if (stat(options.forward_agent_sock_path, &st) != 0) {
+                       error("Cannot forward agent socket path \"%s\": %s",
+                           options.forward_agent_sock_path, strerror(errno));
+                       if (options.exit_on_forward_failure)
+                               cleanup_exit(255);
+               }
        }
 
        if (options.num_system_hostfiles > 0 &&