diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-06-10 23:06:20 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-06-10 23:06:20 +0000 |
| commit | 00999f3dca30c91ccbd4f51b23ead58bf9b61b92 (patch) | |
| tree | 3c3c9c42e56b5118e3b2de35acf3885c04d8e0f9 /usr.bin/ssh/servconf.c | |
| parent | 548bf8f79057a402e214a7c5893fcfa396632fa4 (diff) | |
support CIDR address matching in .ssh/authorized_keys from="..." stanzas
ok and extensive testing dtucker@
Diffstat (limited to 'usr.bin/ssh/servconf.c')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 5a4778efd75..47bf1f53103 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.182 2008/06/10 04:50:25 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.183 2008/06/10 23:06:19 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -584,9 +584,10 @@ match_cfg_line(char **condition, int line, const char *user, const char *host, "%.100s' at line %d", address, arg, line); break; case 0: + case -1: result = 0; break; - case -1: + case -2: return -1; } } else { |