diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2014-12-22 07:55:51 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-12-22 19:08:12 +1100 |
| commit | 161cf419f412446635013ac49e8c660cadc36080 (patch) | |
| tree | 849be0516d697c2bad7277ed780144a84602d86f /auth2.c | |
| parent | f69b69b8625be447b8826b21d87713874dac25a6 (diff) | |
| download | openssh-git-161cf419f412446635013ac49e8c660cadc36080.tar.gz | |
upstream commit
make internal handling of filename arguments of "none"
more consistent with ssh. "none" arguments are now replaced with NULL when
the configuration is finalised.
Simplifies checking later on (just need to test not-NULL rather than
that + strcmp) and cleans up some inconsistencies. ok markus@
Diffstat (limited to 'auth2.c')
| -rw-r--r-- | auth2.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: auth2.c,v 1.133 2014/12/18 23:58:04 djm Exp $ */ +/* $OpenBSD: auth2.c,v 1.134 2014/12/22 07:55:51 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -151,9 +151,7 @@ userauth_banner(void) { char *banner = NULL; - if (options.banner == NULL || - strcasecmp(options.banner, "none") == 0 || - (datafellows & SSH_BUG_BANNER) != 0) + if (options.banner == NULL || (datafellows & SSH_BUG_BANNER) != 0) return; if ((banner = PRIVSEP(auth2_read_banner())) == NULL) |