summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorghelmer <ghelmer@FreeBSD.org>2001-07-30 16:23:56 +0000
committerghelmer <ghelmer@FreeBSD.org>2001-07-30 16:23:56 +0000
commitcc59bc9eba354b7fa6e43d9bb4c57a44f865fffa (patch)
treee352bc945bb0d2f4731c6577fa3a8ea707e4abb2
parent744165f12b25fb4e38cabac16816e20e32809c50 (diff)
downloadFreeBSD-src-cc59bc9eba354b7fa6e43d9bb4c57a44f865fffa.zip
FreeBSD-src-cc59bc9eba354b7fa6e43d9bb4c57a44f865fffa.tar.gz
The variable giving the name of the temporary password file was
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
-rw-r--r--usr.sbin/adduser/rmuser.perl10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/adduser/rmuser.perl b/usr.sbin/adduser/rmuser.perl
index ae8ce8a..9261708 100644
--- a/usr.sbin/adduser/rmuser.perl
+++ b/usr.sbin/adduser/rmuser.perl
@@ -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;
}
OpenPOWER on IntegriCloud