diff options
author | Colin Watson <cjwatson@debian.org> | 2018-08-24 12:49:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2018-08-30 00:57:27 +0100 |
commit | 816386e17654ca36834bebbf351419e460fad8f6 (patch) | |
tree | 3dc79d831cb73bc25b92f5a4d18f8e328c0c570a /scp.c | |
parent | 3e6f76c7039d3df22b1d0a3a5f30150efb09b69d (diff) | |
parent | 16a47fc4b04977a14f44dd433c8da1499fa80671 (diff) |
New upstream release (7.8p1)
Closes: #907534
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.195 2018/02/10 06:15:12 djm Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -319,7 +319,7 @@ do_cmd(char *host, char *remuser, int port, char *cmd, int *fdin, int *fdout) | |||
319 | } | 319 | } |
320 | 320 | ||
321 | /* | 321 | /* |
322 | * This functions executes a command simlar to do_cmd(), but expects the | 322 | * This function executes a command similar to do_cmd(), but expects the |
323 | * input and output descriptors to be setup by a previous call to do_cmd(). | 323 | * input and output descriptors to be setup by a previous call to do_cmd(). |
324 | * This way the input and output of two commands can be connected. | 324 | * This way the input and output of two commands can be connected. |
325 | */ | 325 | */ |
@@ -1100,6 +1100,8 @@ sink(int argc, char **argv) | |||
1100 | SCREWUP("bad mode"); | 1100 | SCREWUP("bad mode"); |
1101 | mode = (mode << 3) | (*cp - '0'); | 1101 | mode = (mode << 3) | (*cp - '0'); |
1102 | } | 1102 | } |
1103 | if (!pflag) | ||
1104 | mode &= ~mask; | ||
1103 | if (*cp++ != ' ') | 1105 | if (*cp++ != ' ') |
1104 | SCREWUP("mode not delimited"); | 1106 | SCREWUP("mode not delimited"); |
1105 | 1107 | ||