summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-06-06 08:16:04 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-06-06 08:16:04 +1000
commit194454d7a8f8cb8ac55f2b9d0199ef9445788bee (patch)
tree103fac66cd9a121a042b414f38018c2c60d59310
parent4ac66af091cf6db5a42c18e43738ca9c41e338e5 (diff)
- dtucker@cvs.openbsd.org 2013/06/04 19:12:23
[scp.c] use MAXPATHLEN for buffer size instead of fixed value. ok markus
-rw-r--r--ChangeLog3
-rw-r--r--scp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5aa24bd4e..0e9c26755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
22 force the MAC output to be 64-bit aligned so umac won't see unaligned 22 force the MAC output to be 64-bit aligned so umac won't see unaligned
23 accesses on strict-alignment architectures. bz#2101, patch from 23 accesses on strict-alignment architectures. bz#2101, patch from
24 tomas.kuthan at oracle.com, ok djm@ 24 tomas.kuthan at oracle.com, ok djm@
25 - dtucker@cvs.openbsd.org 2013/06/04 19:12:23
26 [scp.c]
27 use MAXPATHLEN for buffer size instead of fixed value. ok markus
25 28
2620130602 2920130602
27 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy 30 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/scp.c b/scp.c
index b75d97bb9..9b5959d44 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.174 2013/06/01 20:59:25 dtucker Exp $ */ 1/* $OpenBSD: scp.c,v 1.175 2013/06/04 19:12:23 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).
@@ -850,7 +850,7 @@ rsource(char *name, struct stat *statp)
850{ 850{
851 DIR *dirp; 851 DIR *dirp;
852 struct dirent *dp; 852 struct dirent *dp;
853 char *last, *vect[1], path[1100]; 853 char *last, *vect[1], path[MAXPATHLEN];
854 854
855 if (!(dirp = opendir(name))) { 855 if (!(dirp = opendir(name))) {
856 run_err("%s: %s", name, strerror(errno)); 856 run_err("%s: %s", name, strerror(errno));