diff options
author | Damien Miller <djm@mindrot.org> | 2012-11-04 23:21:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-11-04 23:21:40 +1100 |
commit | a6e3f01d1e230b8acfdd6b4cf3096459d2a325e0 (patch) | |
tree | 577022d2b31e9519d26bc614c3f5396e17d58ec6 /auth1.c | |
parent | d0d1099b3b8a766480ce6df215631bf0af6e6bcd (diff) |
- djm@cvs.openbsd.org 2012/11/04 11:09:15
[auth.h auth1.c auth2.c monitor.c servconf.c servconf.h sshd.c]
[sshd_config.5]
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 'auth1.c')
-rw-r--r-- | auth1.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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 @@ -406,6 +406,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]" : ""); |