summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b733b4601..5f29306fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@
35 - markus@cvs.openbsd.org 2001/06/22 23:35:21 35 - markus@cvs.openbsd.org 2001/06/22 23:35:21
36 [ssh.c] 36 [ssh.c]
37 don't overwrite argv (fixes ssh user@host in 'ps'), report by ericj@ 37 don't overwrite argv (fixes ssh user@host in 'ps'), report by ericj@
38 - deraadt@cvs.openbsd.org 2001/06/23 00:16:16
39 [scp.c]
40 slightly better care
38 41
3920010622 4220010622
40 - (stevesk) handle systems without pw_expire and pw_change. 43 - (stevesk) handle systems without pw_expire and pw_change.
@@ -5719,4 +5722,4 @@
5719 - Wrote replacements for strlcpy and mkdtemp 5722 - Wrote replacements for strlcpy and mkdtemp
5720 - Released 1.0pre1 5723 - Released 1.0pre1
5721 5724
5722$Id: ChangeLog,v 1.1305 2001/06/25 04:26:55 mouring Exp $ 5725$Id: ChangeLog,v 1.1306 2001/06/25 04:28:30 mouring Exp $
diff --git a/scp.c b/scp.c
index 2ca48dd57..1a83a298f 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.74 2001/06/16 08:57:35 markus Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.75 2001/06/23 00:16:16 deraadt Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -662,7 +662,7 @@ sink(argc, argv)
662 662
663#define atime tv[0] 663#define atime tv[0]
664#define mtime tv[1] 664#define mtime tv[1]
665#define SCREWUP(str) { why = str; goto screwup; } 665#define SCREWUP(str) do { why = str; goto screwup; } while (0)
666 666
667 setimes = targisdir = 0; 667 setimes = targisdir = 0;
668 mask = umask(0); 668 mask = umask(0);
@@ -1003,7 +1003,7 @@ okname(cp0)
1003 1003
1004 cp = cp0; 1004 cp = cp0;
1005 do { 1005 do {
1006 c = *cp; 1006 c = (int)*cp;
1007 if (c & 0200) 1007 if (c & 0200)
1008 goto bad; 1008 goto bad;
1009 if (!isalpha(c) && !isdigit(c) && 1009 if (!isalpha(c) && !isdigit(c) &&