diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
| commit | b856a4573162fbc9ddf1c38fd82b6c728c310d1b (patch) | |
| tree | b2a4ad7a06e845ba72a87d2beedfbbcbb7aeb5bb /crypto/openssh/auth.c | |
| parent | 76107b08804f309434efce7480edc2bbd15e1bf7 (diff) | |
| parent | f8195792ec11c7b20879183ea72e1495f0870617 (diff) | |
| download | FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.zip FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.tar.gz | |
Upgrade to OpenSSH 6.9p1.
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index d569ab6..5f72416 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.110 2015/02/25 17:29:38 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.111 2015/05/01 04:17:51 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -401,8 +401,7 @@ expand_authorized_keys(const char *filename, struct passwd *pw) char * authorized_principals_file(struct passwd *pw) { - if (options.authorized_principals_file == NULL || - strcasecmp(options.authorized_principals_file, "none") == 0) + if (options.authorized_principals_file == NULL) return NULL; return expand_authorized_keys(options.authorized_principals_file, pw); } |
