diff options
| author | Damien Miller <djm@mindrot.org> | 2007-09-17 03:57:38 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2007-09-17 03:57:38 +0200 |
| commit | 4890e539774ab8b57aa0ee733a5b07bdf9561af6 (patch) | |
| tree | d2f3621c59e1bf6ae1513a74eb54cbdff0444fb3 /auth2-none.c | |
| parent | - djm@cvs.openbsd.org 2007/08/23 03:06:10 (diff) | |
| download | openssh-4890e539774ab8b57aa0ee733a5b07bdf9561af6.tar.xz openssh-4890e539774ab8b57aa0ee733a5b07bdf9561af6.zip | |
- djm@cvs.openbsd.org 2007/08/23 03:22:16
[auth2-none.c sshd_config sshd_config.5]
Support "Banner=none" to disable displaying of the pre-login banner;
ok dtucker@ deraadt@
Diffstat (limited to 'auth2-none.c')
| -rw-r--r-- | auth2-none.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/auth2-none.c b/auth2-none.c index 952b44824..28e593e6c 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-none.c,v 1.13 2006/08/05 07:52:52 dtucker Exp $ */ +/* $OpenBSD: auth2-none.c,v 1.14 2007/08/23 03:22:16 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -32,6 +32,7 @@ #include <fcntl.h> #include <stdarg.h> #include <unistd.h> +#include <string.h> #include "xmalloc.h" #include "key.h" @@ -106,7 +107,9 @@ userauth_banner(void) { char *banner = NULL; - if (options.banner == NULL || (datafellows & SSH_BUG_BANNER)) + if (options.banner == NULL || + strcasecmp(options.banner, "none") == 0 || + (datafellows & SSH_BUG_BANNER) != 0) return; if ((banner = PRIVSEP(auth2_read_banner())) == NULL) |