upstream: Move checks for lists of users or groups into their own

function. This is a no-op on OpenBSD but will make things easier in
-portable, eg on systems where these checks should be case-insensitive.  ok
djm@

OpenBSD-Commit-ID: 8bc9c8d98670e23f8eaaaefe29c1f98e7ba0487e

1 files changed, 2 insertions, 6 deletions

diff --git a/servconf.c b/servconf.c
index 4fa896fd4..a7bfba827 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.348 2019/01/24 02:34:52 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.349 2019/03/06 22:14:23 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1049,11 +1049,7 @@ match_cfg_line(char **condition, int line, struct connection_info *ci)
                         }
                         if (ci->user == NULL)
                                 match_test_missing_fatal("User", "user");
-#ifndef HAVE_CYGWIN
-                        if (match_pattern_list(ci->user, arg, 0) != 1)
-#else
-                        if (match_pattern_list(ci->user, arg, 1) != 1)
-#endif
+                        if (match_usergroup_pattern_list(ci->user, arg) != 1)
                                 result = 0;
                         else
                                 debug("user %.100s matched 'User %.100s' at "