summaryrefslogtreecommitdiff
path: root/scp.c
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2000-12-16 19:21:03 +0000
committerKevin Steves <stevesk@pobox.com>2000-12-16 19:21:03 +0000
commit8daed1824fdc992d8d59626d20bea87f4982f461 (patch)
tree38e61afdbd0f4d6e26bc7abbc947df1449d26a8d /scp.c
parente2737523bd49ef4a78301fdd0b19ab957ee9ecd4 (diff)
- (stevesk) OpenBSD CVS updates:
- markus@cvs.openbsd.org 2000/12/16 02:53:57 [scp.c] allow + in usernames; request from Florian.Weimer@RUS.Uni-Stuttgart.DE - markus@cvs.openbsd.org 2000/12/16 02:39:57 [scp.c] unused; from stevesk@pobox.com
Diffstat (limited to 'scp.c')
-rw-r--r--scp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/scp.c b/scp.c
index ba19773a2..0323409b9 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.44 2000/12/11 17:27:33 deraadt Exp $"); 78RCSID("$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. */
127int verbose_mode = 0; 127int verbose_mode = 0;
128 128
129/* This is set to non-zero if compression is desired. */
130int 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. */
133int showprogress = 1; 130int 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);