diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-03-06 23:14:23 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-03-08 05:10:07 +0100 |
| commit | fd10cf027b56f9aaa80c9e3844626a05066589a4 (patch) | |
| tree | d444bc6fe48f7254dcf17f36d56e485b5b604719 /groupaccess.c | |
| parent | upstream: Reset last-seen time when sending a keepalive. Prevents (diff) | |
| download | openssh-fd10cf027b56f9aaa80c9e3844626a05066589a4.tar.xz openssh-fd10cf027b56f9aaa80c9e3844626a05066589a4.zip | |
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 'groupaccess.c')
| -rw-r--r-- | groupaccess.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/groupaccess.c b/groupaccess.c index 43367990d..80d301915 100644 --- a/groupaccess.c +++ b/groupaccess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: groupaccess.c,v 1.16 2015/05/04 06:10:48 djm Exp $ */ +/* $OpenBSD: groupaccess.c,v 1.17 2019/03/06 22:14:23 dtucker Exp $ */ /* * Copyright (c) 2001 Kevin Steves. All rights reserved. * @@ -103,11 +103,8 @@ ga_match_pattern_list(const char *group_pattern) int i, found = 0; for (i = 0; i < ngroups; i++) { -#ifndef HAVE_CYGWIN - switch (match_pattern_list(groups_byname[i], group_pattern, 0)) { -#else - switch (match_pattern_list(groups_byname[i], group_pattern, 1)) { -#endif + switch (match_usergroup_pattern_list(groups_byname[i], + group_pattern)) { case -1: return 0; /* Negated match wins */ case 0: |