diff options
author | dougb <dougb@FreeBSD.org> | 2000-12-17 23:42:45 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2000-12-17 23:42:45 +0000 |
commit | 50b480af640ec7a7a0fabc8becf398da5c3e87fc (patch) | |
tree | fda8bab01695508d8839a8087f005013605454ba /usr.sbin/adduser | |
parent | ccc9a8e8764a5c6e8421d6fa0a4765eeb0b7c7e6 (diff) | |
download | FreeBSD-src-50b480af640ec7a7a0fabc8becf398da5c3e87fc.zip FreeBSD-src-50b480af640ec7a7a0fabc8becf398da5c3e87fc.tar.gz |
* Fix a long line that I introduced in the last commit
* Backslash escape non-alphanumeric chars in the login name so that perl
doesn't choke on things like '$'.
Diffstat (limited to 'usr.sbin/adduser')
-rw-r--r-- | usr.sbin/adduser/rmuser.perl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl index b3f1406..c5c9b74 100644 --- a/usr.sbin/adduser/rmuser.perl +++ b/usr.sbin/adduser/rmuser.perl @@ -117,7 +117,8 @@ if ($#ARGV == 0) { $login_name = &get_login_name; } -($name, $password, $uid, $gid, $change, $class, $gecos, $home_dir, $shell) = (getpwnam("$login_name")); +($name, $password, $uid, $gid, $change, $class, $gecos, $home_dir, $shell) = + (getpwnam("$login_name")); if ($?) { print STDERR "${whoami}: Error: User ${login_name} not in password database\n"; @@ -316,7 +317,7 @@ sub update_passwd_file { print STDERR "\n${whoami}: Warning: couldn't set mode of $new_passwd_file to 0600 ($!)\n\tcontinuing, but please check mode of /etc/master.passwd!\n"; $skipped = 0; while (<MASTER_PW>) { - if (not /^$login_name\:/io) { + if (not /^\Q$login_name:/io) { print NEW_PW; } else { print STDERR "Dropped entry for $login_name\n" if $debug; |