system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

The variable giving the name of the temporary password file was

Browse source 
inconsistently named "ptmp" and "etc_ptmp".  This commit changes
it to "passwd_tmp" for consistency and to match OpenBSD's name
for the variable.

Consulted with: jedgar
This commit is contained in:
Guy Helmer 2001-07-30 16:23:56 +00:00
parent a1ff8bfdb3
commit 15bfd2c9b9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=80645
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr.sbin/adduser/rmuser.perl
View file

@ -42,7 +42,7 @@ $ENV{"PATH"} = "/bin:/sbin:/usr/bin:/usr/sbin";
umask(022);
$whoami = $0;
$passwd_file = "/etc/master.passwd";
$ptmp = "/etc/ptmp";
$passwd_tmp = "/etc/ptmp";
$group_file = "/etc/group";
$new_group_file = "${group_file}.new.$$";
$mail_dir = "/var/mail";
@ -311,8 +311,8 @@ sub update_passwd_file {
print STDERR "Updating password file,";
seek(MASTER_PW, 0, 0);
sysopen(NEW_PW, $etc_ptmp, O_RDWR|O_CREAT|O_EXCL, 0600) ||
die "\n${whoami}: Error: Couldn't open file ${etc_ptmp}:\n $!\n";
sysopen(NEW_PW, $passwd_tmp, O_RDWR|O_CREAT|O_EXCL, 0600) ||
die "\n${whoami}: Error: Couldn't open file ${passwd_tmp}:\n $!\n";
$skipped = 0;
while (<MASTER_PW>) {
@ -339,8 +339,8 @@ sub update_passwd_file {
if ($skipped == 0) {
print STDERR "\n${whoami}: Whoops! Didn't find ${login_name}'s entry second time around!\n";
unlink($etc_ptmp) ||
print STDERR "\n${whoami}: Warning: couldn't unlink $etc_ptmp ($!)\n\tPlease investigate, as this file should not be left in the filesystem\n";
unlink($passwd_tmp) ||
print STDERR "\n${whoami}: Warning: couldn't unlink $passwd_tmp ($!)\n\tPlease investigate, as this file should not be left in the filesystem\n";
&unlockpw;
exit 1;
}