- djm@cvs.openbsd.org 2008/06/10 23:06:19

     [auth-options.c match.c servconf.c addrmatch.c sshd.8]
     support CIDR address matching in .ssh/authorized_keys from="..." stanzas
     ok and extensive testing dtucker@

1 files changed, 17 insertions, 8 deletions

diff --git a/auth-options.c b/auth-options.c
index 3a6c3c0f3..25361455e 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.42 2008/05/08 12:02:23 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.43 2008/06/10 23:06:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -226,8 +226,19 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                         }
                         patterns[i] = '\0';
                         opts++;
-                        if (match_host_and_ip(remote_host, remote_ip,
-                            patterns) != 1) {
+                        switch (match_host_and_ip(remote_host, remote_ip,
+                            patterns)) {
+                        case 1:
+                                xfree(patterns);
+                                /* Host name matches. */
+                                goto next_option;
+                        case -1:
+                                debug("%.100s, line %lu: invalid criteria",
+                                    file, linenum);
+                                auth_debug_add("%.100s, line %lu: "
+                                    "invalid criteria", file, linenum);
+                                /* FALLTHROUGH */
+                        case 0:
                                 xfree(patterns);
                                 logit("Authentication tried for %.100s with "
                                     "correct key but not from a permitted "
@@ -236,12 +247,10 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
                                 auth_debug_add("Your host '%.200s' is not "
                                     "permitted to use this key for login.",
                                     remote_host);
-                                /* deny access */
-                                return 0;
+                                break;
                         }
-                        xfree(patterns);
-                        /* Host name matches. */
-                        goto next_option;
+                        /* deny access */
+                        return 0;
                 }
                 cp = "permitopen=\"";
                 if (strncasecmp(opts, cp, strlen(cp)) == 0) {