summaryrefslogtreecommitdiffstats
path: root/usr.sbin/adduser
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2005-06-07 05:07:54 +0000
committermillert <millert@openbsd.org>2005-06-07 05:07:54 +0000
commitb69faa6c70c5bfcfdddc6138cd8e0ee18cc15b03 (patch)
tree675f04b21bc31cc01b06b275573539aa54521810 /usr.sbin/adduser
parentadding pointer protection to 'G' was too heavyweight. Since malloc guard (diff)
downloadwireguard-openbsd-b69faa6c70c5bfcfdddc6138cd8e0ee18cc15b03.tar.xz
wireguard-openbsd-b69faa6c70c5bfcfdddc6138cd8e0ee18cc15b03.zip
Don't restrict what login name may be removed, the account may
have been made with a tool other than adduser and thus may use characters adduser considers illegal. OK henning@ and krw@
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r--usr.sbin/adduser/rmuser.perl19
1 files changed, 5 insertions, 14 deletions
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl
index c83c06c0123..bda29b86c19 100644
--- a/usr.sbin/adduser/rmuser.perl
+++ b/usr.sbin/adduser/rmuser.perl
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# -*- perl -*-
#
-# $OpenBSD: rmuser.perl,v 1.6 2002/05/31 19:47:00 millert Exp $
+# $OpenBSD: rmuser.perl,v 1.7 2005/06/07 05:07:54 millert Exp $
#
# Copyright 1995, 1996 Guy Helmer, Madison, South Dakota 57042.
# All rights reserved.
@@ -220,20 +220,11 @@ exit 0;
sub get_login_name {
#
# Get new user's name
- local($done, $login_name);
+ local($login_name);
- for ($done = 0; ! $done; ) {
- print "Enter login name for user to remove: ";
- $login_name = <>;
- chomp $login_name;
- if (!($login_name =~ /^\w+$/)) {
- print STDERR "Sorry, login name must contain alphanumeric characters only.\n";
- } elsif (length($login_name) > 31 || length($login_name) == 0) {
- print STDERR "Sorry, login name must be 31 characters or less.\n";
- } else {
- $done = 1;
- }
- }
+ print "Enter login name for user to remove: ";
+ $login_name = <>;
+ chomp $login_name;
print "User name is ${login_name}\n" if $debug;
return($login_name);