diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth2.c | 7 |
2 files changed, 6 insertions, 6 deletions
@@ -17,6 +17,9 @@ | |||
17 | sshconnect2.c sshd.c] | 17 | sshconnect2.c sshd.c] |
18 | more robust rekeying | 18 | more robust rekeying |
19 | don't send channel data after rekeying is started. | 19 | don't send channel data after rekeying is started. |
20 | - markus@cvs.openbsd.org 2001/04/04 20:32:56 | ||
21 | [auth2.c] | ||
22 | we don't care about missing bannerfiles; from tsoome@ut.ee, ok deraadt@ | ||
20 | 23 | ||
21 | 20010404 | 24 | 20010404 |
22 | - OpenBSD CVS Sync | 25 | - OpenBSD CVS Sync |
@@ -4856,4 +4859,4 @@ | |||
4856 | - Wrote replacements for strlcpy and mkdtemp | 4859 | - Wrote replacements for strlcpy and mkdtemp |
4857 | - Released 1.0pre1 | 4860 | - Released 1.0pre1 |
4858 | 4861 | ||
4859 | $Id: ChangeLog,v 1.1058 2001/04/04 23:46:07 mouring Exp $ | 4862 | $Id: ChangeLog,v 1.1059 2001/04/04 23:47:52 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.49 2001/03/28 22:43:31 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.50 2001/04/04 20:32:56 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -274,11 +274,8 @@ userauth_banner(void) | |||
274 | 274 | ||
275 | if (options.banner == NULL || (datafellows & SSH_BUG_BANNER)) | 275 | if (options.banner == NULL || (datafellows & SSH_BUG_BANNER)) |
276 | return; | 276 | return; |
277 | if ((fd = open(options.banner, O_RDONLY)) < 0) { | 277 | if ((fd = open(options.banner, O_RDONLY)) < 0) |
278 | error("userauth_banner: open %s failed: %s", | ||
279 | options.banner, strerror(errno)); | ||
280 | return; | 278 | return; |
281 | } | ||
282 | if (fstat(fd, &st) < 0) | 279 | if (fstat(fd, &st) < 0) |
283 | goto done; | 280 | goto done; |
284 | len = st.st_size; | 281 | len = st.st_size; |