summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2001-04-15 20:43:49 +0000
committerDoug Barton <dougb@FreeBSD.org>2001-04-15 20:43:49 +0000
commitc4e62c5c4a2057491ba24168f433072e87b2eb6c (patch)
tree8786df95efffa584910bb896283e50cc7d39d4ad
parentb3d543a56150752a0828b627605ef745bbac4a3e (diff)
downloadpw-darwin-c4e62c5c4a2057491ba24168f433072e87b2eb6c.tar.gz
pw-darwin-c4e62c5c4a2057491ba24168f433072e87b2eb6c.tar.zst
pw-darwin-c4e62c5c4a2057491ba24168f433072e87b2eb6c.zip
Add a more useful solution to the problem of password files with more than
one user who differs only by case. The other perl tools assume (or enforce) the all lowercase requirement, therefore making the search through master.passwd case insensitive seemed a reasonable optimization, IMO. I understand, although I do not sympathize with, the argument that someone might want to do this on purpose, and might subsequently want to use the wrong tool for the job. So, this fix should hopefully satisfy both camps.
-rw-r--r--adduser/rmuser.perl17
1 files changed, 14 insertions, 3 deletions
diff --git a/adduser/rmuser.perl b/adduser/rmuser.perl
index 96a4ed1..07ba499 100644
--- a/adduser/rmuser.perl
+++ b/adduser/rmuser.perl
@@ -317,11 +317,22 @@ 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 /^\Q$login_name:/o) {
- print NEW_PW;
- } else {
+ if (/^\Q$login_name:/o) {
print STDERR "Dropped entry for $login_name\n" if $debug;
$skipped = 1;
+ } else {
+ print NEW_PW;
+ # The other perl password tools assume all lowercase entries.
+ # Add a warning to help unsuspecting admins who might be
+ # using the wrong tool for the job, or might otherwise
+ # be unwittingly holding a loaded foot-shooting device.
+ if (/^\Q$login_name:/io) {
+ my $name = $_;
+ $name =~ s#\:.*\n##;
+ print STDERR "\n\n\tThere is also an entry for $name in your",
+ "password file.\n\tThis can cause problems in some ",
+ "situations.\n\n";
+ }
}
}
close(NEW_PW);