- markus@cvs.openbsd.org 2001/04/04 20:32:56
[auth2.c]
we don't care about missing bannerfiles; from tsoome@ut.ee, ok deraadt@
diff --git a/ChangeLog b/ChangeLog
index 83c02ec..c2f8947 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
sshconnect2.c sshd.c]
more robust rekeying
don't send channel data after rekeying is started.
+ - markus@cvs.openbsd.org 2001/04/04 20:32:56
+ [auth2.c]
+ we don't care about missing bannerfiles; from tsoome@ut.ee, ok deraadt@
20010404
- OpenBSD CVS Sync
@@ -4856,4 +4859,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1058 2001/04/04 23:46:07 mouring Exp $
+$Id: ChangeLog,v 1.1059 2001/04/04 23:47:52 mouring Exp $
diff --git a/auth2.c b/auth2.c
index 3e99c5b..8c9eb17 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.49 2001/03/28 22:43:31 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.50 2001/04/04 20:32:56 markus Exp $");
#include <openssl/evp.h>
@@ -274,11 +274,8 @@
if (options.banner == NULL || (datafellows & SSH_BUG_BANNER))
return;
- if ((fd = open(options.banner, O_RDONLY)) < 0) {
- error("userauth_banner: open %s failed: %s",
- options.banner, strerror(errno));
+ if ((fd = open(options.banner, O_RDONLY)) < 0)
return;
- }
if (fstat(fd, &st) < 0)
goto done;
len = st.st_size;