- (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
diff --git a/ChangeLog b/ChangeLog
index f1ddf84..cb26d6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+20001216
+ - (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
+
20001215
- (stevesk) Old OpenBSD patch wasn't completely applied:
- markus@cvs.openbsd.org 2000/01/24 22:11:20
diff --git a/scp.c b/scp.c
index ba19773..0323409 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.44 2000/12/11 17:27:33 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.46 2000/12/16 09:53:57 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -126,9 +126,6 @@
/* This is set to non-zero to enable verbose mode. */
int verbose_mode = 0;
-/* This is set to non-zero if compression is desired. */
-int compress_flag = 0;
-
/* This is set to zero if the progressmeter is not desired. */
int showprogress = 1;
@@ -1049,7 +1046,8 @@
c = *cp;
if (c & 0200)
goto bad;
- if (!isalpha(c) && !isdigit(c) && c != '_' && c != '-' && c != '.')
+ if (!isalpha(c) && !isdigit(c) &&
+ c != '_' && c != '-' && c != '.' && c != '+')
goto bad;
} while (*++cp);
return (1);