diff options
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 @@ | |||
1 | /* $OpenBSD: auth2-none.c,v 1.13 2006/08/05 07:52:52 dtucker Exp $ */ | 1 | /* $OpenBSD: auth2-none.c,v 1.14 2007/08/23 03:22:16 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -32,6 +32,7 @@ | |||
32 | #include <fcntl.h> | 32 | #include <fcntl.h> |
33 | #include <stdarg.h> | 33 | #include <stdarg.h> |
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | #include <string.h> | ||
35 | 36 | ||
36 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
37 | #include "key.h" | 38 | #include "key.h" |
@@ -106,7 +107,9 @@ userauth_banner(void) | |||
106 | { | 107 | { |
107 | char *banner = NULL; | 108 | char *banner = NULL; |
108 | 109 | ||
109 | if (options.banner == NULL || (datafellows & SSH_BUG_BANNER)) | 110 | if (options.banner == NULL || |
111 | strcasecmp(options.banner, "none") == 0 || | ||
112 | (datafellows & SSH_BUG_BANNER) != 0) | ||
110 | return; | 113 | return; |
111 | 114 | ||
112 | if ((banner = PRIVSEP(auth2_read_banner())) == NULL) | 115 | if ((banner = PRIVSEP(auth2_read_banner())) == NULL) |