diff options
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 2cd83212a11..72fdad1166c 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.351 2021/03/03 21:40:16 sthen Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.352 2021/04/03 06:18:41 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -79,7 +79,7 @@ expand_proxy_command(const char *proxy_command, const char *user, { char *tmp, *ret, strport[NI_MAXSERV]; const char *keyalias = options.host_key_alias ? - options.host_key_alias : host_arg; + options.host_key_alias : host_arg; snprintf(strport, sizeof strport, "%d", port); xasprintf(&tmp, "exec %s", proxy_command); @@ -231,8 +231,10 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg, argv[2] = command_string; argv[3] = NULL; - /* Execute the proxy command. Note that we gave up any - extra privileges above. */ + /* + * Execute the proxy command. Note that we gave up any + * extra privileges above. + */ ssh_signal(SIGPIPE, SIG_DFL); execv(argv[0], argv); perror(argv[0]); @@ -377,14 +379,14 @@ ssh_create_socket(struct addrinfo *ai) } else if (options.bind_interface != NULL) { if ((r = getifaddrs(&ifaddrs)) != 0) { error("getifaddrs: %s: %s", options.bind_interface, - strerror(errno)); + strerror(errno)); goto fail; } bindaddrlen = sizeof(bindaddr); if (check_ifaddrs(options.bind_interface, ai->ai_family, ifaddrs, &bindaddr, &bindaddrlen) != 0) { logit("getifaddrs: %s: no suitable addresses", - options.bind_interface); + options.bind_interface); goto fail; } } @@ -827,7 +829,7 @@ load_hostkeys_command(struct hostkeys *hostkeys, const char *command_template, /* Turn the command into an argument vector */ if (argv_split(command_template, &ac, &av) != 0) { error("%s \"%s\" contains invalid quotes", tag, - command_template); + command_template); goto out; } if (ac == 0) { |