diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 6 | ||||
-rw-r--r-- | ssh.c | 8 | ||||
-rw-r--r-- | sshconnect2.c | 4 |
4 files changed, 13 insertions, 10 deletions
@@ -33,6 +33,9 @@ | |||
33 | - stevesk@cvs.openbsd.org 2005/10/13 22:24:31 | 33 | - stevesk@cvs.openbsd.org 2005/10/13 22:24:31 |
34 | [auth2-gss.c gss-genr.c gss-serv.c monitor.c] | 34 | [auth2-gss.c gss-genr.c gss-serv.c monitor.c] |
35 | KNF; ok djm@ | 35 | KNF; ok djm@ |
36 | - stevesk@cvs.openbsd.org 2005/10/14 02:17:59 | ||
37 | [ssh-keygen.c ssh.c sshconnect2.c] | ||
38 | no trailing "\n" for log functions; ok djm@ | ||
36 | 39 | ||
37 | 20051102 | 40 | 20051102 |
38 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). | 41 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). |
@@ -3166,4 +3169,4 @@ | |||
3166 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3169 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3167 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3170 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3168 | 3171 | ||
3169 | $Id: ChangeLog,v 1.3934 2005/11/05 04:07:05 djm Exp $ | 3172 | $Id: ChangeLog,v 1.3935 2005/11/05 04:07:33 djm Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 89686f5ac..040813c5a 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.130 2005/10/07 11:13:57 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.131 2005/10/14 02:17:59 stevesk Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -1222,7 +1222,7 @@ main(int ac, char **av) | |||
1222 | if (bits == 0) | 1222 | if (bits == 0) |
1223 | bits = DEFAULT_BITS; | 1223 | bits = DEFAULT_BITS; |
1224 | if (gen_candidates(out, memory, bits, start) != 0) | 1224 | if (gen_candidates(out, memory, bits, start) != 0) |
1225 | fatal("modulus candidate generation failed\n"); | 1225 | fatal("modulus candidate generation failed"); |
1226 | 1226 | ||
1227 | return (0); | 1227 | return (0); |
1228 | } | 1228 | } |
@@ -1245,7 +1245,7 @@ main(int ac, char **av) | |||
1245 | out_file, strerror(errno)); | 1245 | out_file, strerror(errno)); |
1246 | } | 1246 | } |
1247 | if (prime_test(in, out, trials, generator_wanted) != 0) | 1247 | if (prime_test(in, out, trials, generator_wanted) != 0) |
1248 | fatal("modulus screening failed\n"); | 1248 | fatal("modulus screening failed"); |
1249 | return (0); | 1249 | return (0); |
1250 | } | 1250 | } |
1251 | 1251 | ||
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.251 2005/09/19 15:42:44 jmc Exp $"); | 43 | RCSID("$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 | } |
diff --git a/sshconnect2.c b/sshconnect2.c index ee7932d68..adf967281 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.142 2005/08/30 22:08:05 djm Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.143 2005/10/14 02:17:59 stevesk Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -702,7 +702,7 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt) | |||
702 | 702 | ||
703 | packet_check_eom(); | 703 | packet_check_eom(); |
704 | 704 | ||
705 | debug("Server GSSAPI Error:\n%s\n", msg); | 705 | debug("Server GSSAPI Error:\n%s", msg); |
706 | xfree(msg); | 706 | xfree(msg); |
707 | xfree(lang); | 707 | xfree(lang); |
708 | } | 708 | } |