summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-03-06 22:14:23 +0000
committerDarren Tucker <dtucker@dtucker.net>2019-03-08 15:10:07 +1100
commitfd10cf027b56f9aaa80c9e3844626a05066589a4 (patch)
treed444bc6fe48f7254dcf17f36d56e485b5b604719 /servconf.c
parentab5fee8eb6a011002fd9e32b1597f02aa8804a25 (diff)
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
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/servconf.c b/servconf.c
index 4fa896fd..a7bfba82 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 "