diff options
| author |   djm <djm@openbsd.org> | 2012-11-04 11:09:15 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-11-04 11:09:15 +0000 |
| commit | 0613b404977f77c137a5819df84c1f8dd7d3f43a (patch) | |
| tree | 5fb36fd26c34ed26c0056c07c7439272ac480b4f /usr.bin/ssh/auth1.c | |
| parent | Remove default of AuthorizedCommandUser. Administrators are now expected (diff) | |
| download | wireguard-openbsd-0613b404977f77c137a5819df84c1f8dd7d3f43a.tar.xz wireguard-openbsd-0613b404977f77c137a5819df84c1f8dd7d3f43a.zip | |
Support multiple required authentication via an AuthenticationMethods
option. This option lists one or more comma-separated lists of
authentication method names. Successful completion of all the methods in
any list is required for authentication to complete;
feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/auth1.c')
| -rw-r--r-- | usr.bin/ssh/auth1.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/auth1.c b/usr.bin/ssh/auth1.c index 63fecc19e92..ccc86a9a362 100644 --- a/usr.bin/ssh/auth1.c +++ b/usr.bin/ssh/auth1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth1.c,v 1.75 2010/08/31 09:58:37 djm Exp $ */ +/* $OpenBSD: auth1.c,v 1.76 2012/11/04 11:09:15 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -338,6 +338,11 @@ do_authentication(Authctxt *authctxt) authctxt->pw = fakepw(); } + /* Configuration may have changed as a result of Match */ + if (options.num_auth_methods != 0) + fatal("AuthenticationMethods is not supported with SSH " + "protocol 1"); + setproctitle("%s%s", authctxt->valid ? user : "unknown", use_privsep ? " [net]" : ""); |