From 8b069df63d5890aa4c09cababd813a3f73b72186 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 11 Apr 2012 13:17:55 +0000 Subject: Support "none" as an argument for AuthorizedPrincipalsFile to indicate no file should be read. --- usr.bin/ssh/auth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.bin/ssh') diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index d3663a487ce..a3920fab111 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.94 2011/05/23 03:33:38 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.95 2012/04/11 13:17:54 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -267,7 +267,8 @@ expand_authorized_keys(const char *filename, struct passwd *pw) char * authorized_principals_file(struct passwd *pw) { - if (options.authorized_principals_file == NULL) + if (options.authorized_principals_file == NULL || + strcasecmp(options.authorized_principals_file, "none") == 0) return NULL; return expand_authorized_keys(options.authorized_principals_file, pw); } -- cgit v1.2.3