diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-26 14:07:26 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-26 14:07:26 +1100 |
commit | 9096740f6c39bbd91f2484c8cf58b4996dd8564f (patch) | |
tree | 5205c22ccf2d6bd2765ff7662c7efe24620ca754 /ssh.c | |
parent | 91d4b12fcb045d93034b2609aaf56a4b41e6eb4f (diff) |
- deraadt@cvs.openbsd.org 2006/03/20 18:26:55
[channels.c monitor.c session.c session.h ssh-agent.c ssh-keygen.c]
[ssh-rsa.c ssh.c sshlogin.c]
annoying spacing fixes getting in the way of real diffs
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1041,7 +1041,7 @@ ssh_control_listener(void) | |||
1041 | fatal("%s socket(): %s", __func__, strerror(errno)); | 1041 | fatal("%s socket(): %s", __func__, strerror(errno)); |
1042 | 1042 | ||
1043 | old_umask = umask(0177); | 1043 | old_umask = umask(0177); |
1044 | if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { | 1044 | if (bind(control_fd, (struct sockaddr *)&addr, addr_len) == -1) { |
1045 | control_fd = -1; | 1045 | control_fd = -1; |
1046 | if (errno == EINVAL || errno == EADDRINUSE) | 1046 | if (errno == EINVAL || errno == EADDRINUSE) |
1047 | fatal("ControlSocket %s already exists", | 1047 | fatal("ControlSocket %s already exists", |
@@ -1299,7 +1299,7 @@ control_client(const char *path) | |||
1299 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) | 1299 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) |
1300 | fatal("%s socket(): %s", __func__, strerror(errno)); | 1300 | fatal("%s socket(): %s", __func__, strerror(errno)); |
1301 | 1301 | ||
1302 | if (connect(sock, (struct sockaddr*)&addr, addr_len) == -1) { | 1302 | if (connect(sock, (struct sockaddr *)&addr, addr_len) == -1) { |
1303 | if (mux_command != SSHMUX_COMMAND_OPEN) { | 1303 | if (mux_command != SSHMUX_COMMAND_OPEN) { |
1304 | fatal("Control socket connect(%.100s): %s", path, | 1304 | fatal("Control socket connect(%.100s): %s", path, |
1305 | strerror(errno)); | 1305 | strerror(errno)); |