tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict properly

This commit is contained in:
Tess Gauthier 2024-08-05 16:29:51 -04:00
parent 442c43da10
commit cfd259fcf1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
servconf.c
View File

@ -1867,10 +1867,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
/* XXX appends to list; doesn't respect first-match-wins */ /* XXX appends to list; doesn't respect first-match-wins */
parse_allowdenygroups: parse_allowdenygroups:
while ((arg = argv_next(&ac, &av)) != NULL) { while ((arg = argv_next(&ac, &av)) != NULL) {
if (*arg == '\0') #ifdef WINDOWS
fatal("%s line %d: empty %s pattern",
filename, linenum, keyword);
found = 1;
// it can be a SID string; if it is - use localized name for that SID // it can be a SID string; if it is - use localized name for that SID
PSID Sid = NULL; PSID Sid = NULL;
char* utf8_group_name = NULL; char* utf8_group_name = NULL;
@ -1898,6 +1895,11 @@ process_server_config_line_depth(ServerOptions *options, char *line,
debug3_f("'%s' not recognized as SID", arg); debug3_f("'%s' not recognized as SID", arg);
} }
#endif // WINDOWS #endif // WINDOWS
if (*arg == '\0' ||
match_user(NULL, NULL, NULL, arg) == -1)
fatal("%s line %d: empty %s pattern",
filename, linenum, keyword);
found = 1;
if (!*activep) if (!*activep)
continue; continue;
opt_array_append(filename, linenum, keyword, opt_array_append(filename, linenum, keyword,