RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: in olde rcp/scp protocol mode, when rejecting a path from the 

server as not matching the glob that the client sent, log (at debug level)
the received pathname as well as the list of possible expected paths expanded
from the glob. bz2966

OpenBSD-Commit-ID: 0bd8db8a595334ca86bca8f36e23fc0395315765
This commit is contained in:
djm@openbsd.org 2023-10-11 05:42:08 +00:00 committed by Damien Miller
parent 208c2b7198
commit c97520d23d
No known key found for this signature in database
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.259 2023/09/10 23:12:32 djm Exp $ */ /* $OpenBSD: scp.c,v 1.260 2023/10/11 05:42:08 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -1813,8 +1813,16 @@ sink(int argc, char **argv, const char *src)
fnmatch(patterns[n], cp, 0) == 0) fnmatch(patterns[n], cp, 0) == 0)
break; break;
} }
if (n >= npatterns) if (n >= npatterns) {
debug2_f("incoming filename \"%s\" does not "
"match any of %zu expected patterns", cp,
npatterns);
for (n = 0; n < npatterns; n++) {
debug3_f("expected pattern %zu: \"%s\"",
n, patterns[n]);
}
SCREWUP("filename does not match request"); SCREWUP("filename does not match request");
}
} }
if (targisdir) { if (targisdir) {
static char *namebuf; static char *namebuf;