diff options
author | Damien Miller <djm@mindrot.org> | 2001-11-12 11:06:54 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-11-12 11:06:54 +1100 |
commit | e4a0ff4748faef9abd0244eef0321d466baf461c (patch) | |
tree | ab700d46049130f4acdfefec5fe7ef86bd0ac74f | |
parent | 79faeff2c1e9e25a0d7d9b11f168a96ca02d46f7 (diff) |
- markus@cvs.openbsd.org 2001/11/09 19:08:35
[sshd.c]
remove extra trailing dot from log message; pilot@naughty.monkey.org
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sshd.c | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -63,7 +63,10 @@ | |||
63 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | 63 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) |
64 | if permit_empty_passwd == 0 so null password check cannot be bypassed. | 64 | if permit_empty_passwd == 0 so null password check cannot be bypassed. |
65 | jayaraj@amritapuri.com OpenBSD bug 2168 | 65 | jayaraj@amritapuri.com OpenBSD bug 2168 |
66 | 66 | - markus@cvs.openbsd.org 2001/11/09 19:08:35 | |
67 | [sshd.c] | ||
68 | remove extra trailing dot from log message; pilot@naughty.monkey.org | ||
69 | |||
67 | 20011103 | 70 | 20011103 |
68 | - (tim) [ contrib/caldera/openssh.spec contrib/caldera/sshd.init] Updates | 71 | - (tim) [ contrib/caldera/openssh.spec contrib/caldera/sshd.init] Updates |
69 | from Raymund Will <ray@caldera.de> | 72 | from Raymund Will <ray@caldera.de> |
@@ -6867,4 +6870,4 @@ | |||
6867 | - Wrote replacements for strlcpy and mkdtemp | 6870 | - Wrote replacements for strlcpy and mkdtemp |
6868 | - Released 1.0pre1 | 6871 | - Released 1.0pre1 |
6869 | 6872 | ||
6870 | $Id: ChangeLog,v 1.1651 2001/11/12 00:06:32 djm Exp $ | 6873 | $Id: ChangeLog,v 1.1652 2001/11/12 00:06:54 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: sshd.c,v 1.207 2001/10/24 08:41:41 markus Exp $"); | 43 | RCSID("$OpenBSD: sshd.c,v 1.208 2001/11/09 19:08:35 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/dh.h> | 45 | #include <openssl/dh.h> |
46 | #include <openssl/bn.h> | 46 | #include <openssl/bn.h> |
@@ -337,7 +337,7 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
337 | /* Send our protocol version identification. */ | 337 | /* Send our protocol version identification. */ |
338 | if (atomicio(write, sock_out, server_version_string, strlen(server_version_string)) | 338 | if (atomicio(write, sock_out, server_version_string, strlen(server_version_string)) |
339 | != strlen(server_version_string)) { | 339 | != strlen(server_version_string)) { |
340 | log("Could not write ident string to %s.", get_remote_ipaddr()); | 340 | log("Could not write ident string to %s", get_remote_ipaddr()); |
341 | fatal_cleanup(); | 341 | fatal_cleanup(); |
342 | } | 342 | } |
343 | 343 | ||
@@ -345,7 +345,7 @@ sshd_exchange_identification(int sock_in, int sock_out) | |||
345 | memset(buf, 0, sizeof(buf)); | 345 | memset(buf, 0, sizeof(buf)); |
346 | for (i = 0; i < sizeof(buf) - 1; i++) { | 346 | for (i = 0; i < sizeof(buf) - 1; i++) { |
347 | if (atomicio(read, sock_in, &buf[i], 1) != 1) { | 347 | if (atomicio(read, sock_in, &buf[i], 1) != 1) { |
348 | log("Did not receive identification string from %s.", | 348 | log("Did not receive identification string from %s", |
349 | get_remote_ipaddr()); | 349 | get_remote_ipaddr()); |
350 | fatal_cleanup(); | 350 | fatal_cleanup(); |
351 | } | 351 | } |