diff options
| author | wosch <wosch@FreeBSD.org> | 1996-09-14 23:22:23 +0000 |
|---|---|---|
| committer | wosch <wosch@FreeBSD.org> | 1996-09-14 23:22:23 +0000 |
| commit | 3d9135fb86991688dd5ee6532e3cbbcc7b50ec25 (patch) | |
| tree | 1a2d044fe75df0dc4a5b2ae9e1ba2080788e98ce /usr.sbin/adduser | |
| parent | e394564f7626f999f6512750b8ce79d526b01085 (diff) | |
| download | FreeBSD-src-3d9135fb86991688dd5ee6532e3cbbcc7b50ec25.zip FreeBSD-src-3d9135fb86991688dd5ee6532e3cbbcc7b50ec25.tar.gz | |
Do not backup master.passwd if pwd_mkdb returned an error. This
was to paranoid, pwd_mkdb(8) is carefully enough to not
corrupt master.passwd on failure.
Submitted by: joerg
Diffstat (limited to 'usr.sbin/adduser')
| -rw-r--r-- | usr.sbin/adduser/adduser.perl | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index c757898..8e35578 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: adduser.perl,v 1.16 1996/08/28 17:54:14 adam Exp $ +# $Id: adduser.perl,v 1.17 1996/09/11 08:36:54 jkh Exp $ # read variables @@ -538,19 +538,9 @@ sub new_users_pwdmkdb { system("$pwd_mkdb $etc_passwd"); if ($?) { - local($crash) = "$etc_passwd.crash$$"; warn "$last\n"; - warn "``$pwd_mkdb'' failed, try to restore ...\n"; - - open(R, "> $crash") || die "Sorry, give up\n"; - $j = join("\n", @passwd_backup); - $j =~ s/\n//; - print R $j . "\n"; - close R; - - system("$pwd_mkdb $crash"); - die "Sorry, give up\n" if $?; - die "Successfully restore $etc_passwd. Exit.\n"; + warn "``$pwd_mkdb'' failed\n"; + exit($? >> 8); } } |
