diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | scp.c | 8 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20001216 | ||
2 | - (stevesk) OpenBSD CVS updates: | ||
3 | - markus@cvs.openbsd.org 2000/12/16 02:53:57 | ||
4 | [scp.c] | ||
5 | allow + in usernames; request from Florian.Weimer@RUS.Uni-Stuttgart.DE | ||
6 | - markus@cvs.openbsd.org 2000/12/16 02:39:57 | ||
7 | [scp.c] | ||
8 | unused; from stevesk@pobox.com | ||
9 | |||
1 | 20001215 | 10 | 20001215 |
2 | - (stevesk) Old OpenBSD patch wasn't completely applied: | 11 | - (stevesk) Old OpenBSD patch wasn't completely applied: |
3 | - markus@cvs.openbsd.org 2000/01/24 22:11:20 | 12 | - markus@cvs.openbsd.org 2000/01/24 22:11:20 |
@@ -75,7 +75,7 @@ | |||
75 | */ | 75 | */ |
76 | 76 | ||
77 | #include "includes.h" | 77 | #include "includes.h" |
78 | RCSID("$OpenBSD: scp.c,v 1.44 2000/12/11 17:27:33 deraadt Exp $"); | 78 | RCSID("$OpenBSD: scp.c,v 1.46 2000/12/16 09:53:57 markus Exp $"); |
79 | 79 | ||
80 | #include "ssh.h" | 80 | #include "ssh.h" |
81 | #include "xmalloc.h" | 81 | #include "xmalloc.h" |
@@ -126,9 +126,6 @@ char *curfile; | |||
126 | /* This is set to non-zero to enable verbose mode. */ | 126 | /* This is set to non-zero to enable verbose mode. */ |
127 | int verbose_mode = 0; | 127 | int verbose_mode = 0; |
128 | 128 | ||
129 | /* This is set to non-zero if compression is desired. */ | ||
130 | int compress_flag = 0; | ||
131 | |||
132 | /* This is set to zero if the progressmeter is not desired. */ | 129 | /* This is set to zero if the progressmeter is not desired. */ |
133 | int showprogress = 1; | 130 | int showprogress = 1; |
134 | 131 | ||
@@ -1049,7 +1046,8 @@ okname(cp0) | |||
1049 | c = *cp; | 1046 | c = *cp; |
1050 | if (c & 0200) | 1047 | if (c & 0200) |
1051 | goto bad; | 1048 | goto bad; |
1052 | if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-' && c != '.') | 1049 | if (!isalpha(c) && !isdigit(c) && |
1050 | c != '_' && c != '-' && c != '.' && c != '+') | ||
1053 | goto bad; | 1051 | goto bad; |
1054 | } while (*++cp); | 1052 | } while (*++cp); |
1055 | return (1); | 1053 | return (1); |