summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:07:33 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:07:33 +1100
commit15d72a00a3cd922f284b8a779a955733f487450f (patch)
treea958ede2085420f29e8319504b414145974abf7e /ssh.c
parent6fd6defbce4c03820b8070b106bfe52bf2bed60a (diff)
- stevesk@cvs.openbsd.org 2005/10/14 02:17:59
[ssh-keygen.c ssh.c sshconnect2.c] no trailing "\n" for log functions; ok djm@
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh.c b/ssh.c
index 2c2b680a2..e51ead726 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.251 2005/09/19 15:42:44 jmc Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.252 2005/10/14 02:17:59 stevesk Exp $");
44 44
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/err.h> 46#include <openssl/err.h>
@@ -1013,7 +1013,7 @@ ssh_control_listener(void)
1013 fatal("ControlPath too long"); 1013 fatal("ControlPath too long");
1014 1014
1015 if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) 1015 if ((control_fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
1016 fatal("%s socket(): %s\n", __func__, strerror(errno)); 1016 fatal("%s socket(): %s", __func__, strerror(errno));
1017 1017
1018 old_umask = umask(0177); 1018 old_umask = umask(0177);
1019 if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) { 1019 if (bind(control_fd, (struct sockaddr*)&addr, addr_len) == -1) {
@@ -1022,12 +1022,12 @@ ssh_control_listener(void)
1022 fatal("ControlSocket %s already exists", 1022 fatal("ControlSocket %s already exists",
1023 options.control_path); 1023 options.control_path);
1024 else 1024 else
1025 fatal("%s bind(): %s\n", __func__, strerror(errno)); 1025 fatal("%s bind(): %s", __func__, strerror(errno));
1026 } 1026 }
1027 umask(old_umask); 1027 umask(old_umask);
1028 1028
1029 if (listen(control_fd, 64) == -1) 1029 if (listen(control_fd, 64) == -1)
1030 fatal("%s listen(): %s\n", __func__, strerror(errno)); 1030 fatal("%s listen(): %s", __func__, strerror(errno));
1031 1031
1032 set_nonblock(control_fd); 1032 set_nonblock(control_fd);
1033} 1033}