diff options
| author |   millert <millert@openbsd.org> | 2003-06-09 00:33:52 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2003-06-09 00:33:52 +0000 |
| commit | 2cf952645ab2ed532813138386458a27b3befa61 (patch) | |
| tree | 1b5ceb0d0b25a69d4c4d7544142da3d74ce9e35c /usr.sbin/adduser | |
| parent | Sync man pages w/ NetBSD version (diff) | |
| download | wireguard-openbsd-2cf952645ab2ed532813138386458a27b3befa61.tar.xz wireguard-openbsd-2cf952645ab2ed532813138386458a27b3befa61.zip | |
Fix my previous commit here, pwd_mkdb needs to be a list now too.
Diffstat (limited to 'usr.sbin/adduser')
| -rw-r--r-- | usr.sbin/adduser/adduser.perl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl index 3d05d905647..25898159603 100644 --- a/usr.sbin/adduser/adduser.perl +++ b/usr.sbin/adduser/adduser.perl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# $OpenBSD: adduser.perl,v 1.43 2003/06/08 21:05:29 millert Exp $ +# $OpenBSD: adduser.perl,v 1.44 2003/06/09 00:33:52 millert Exp $ # # Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. # All rights reserved. @@ -87,9 +87,9 @@ sub variables { $etc_passwd = "/etc/master.passwd"; $etc_ptmp = "/etc/ptmp"; $group = "/etc/group"; - $pwd_mkdb = "pwd_mkdb -p"; # program for building passwd database + @pwd_mkdb = ("pwd_mkdb", "-p"); # program for building passwd database $encryptionmethod = "blowfish"; - $rcsid = '$OpenBSD: adduser.perl,v 1.43 2003/06/08 21:05:29 millert Exp $'; + $rcsid = '$OpenBSD: adduser.perl,v 1.44 2003/06/09 00:33:52 millert Exp $'; # List of directories where shells located @path = ('/bin', '/usr/bin', '/usr/local/bin'); @@ -127,7 +127,7 @@ sub variables { $etc_shells = "./shells"; $etc_passwd = "./master.passwd"; $group = "./group"; - $pwd_mkdb = "pwd_mkdb -p -d ."; + @pwd_mkdb = ("pwd_mkdb", "-p", "-d", "."); $config = "adduser.conf"; $send_message = "./adduser.message"; $logfile = "./log.adduser"; @@ -285,7 +285,7 @@ sub home_partition_valid { # check for valid passwddb sub passwd_check { - system($pwd_mkdb, "-c", $etc_passwd); + system(@pwd_mkdb, "-c", $etc_passwd); die "\nInvalid $etc_passwd - cannot add any users!\n" if $?; } @@ -605,10 +605,10 @@ sub new_users_pwdmkdb { local($user); $user = (split(/:/, $last))[0]; - system($pwd_mkdb, "-u", $user, $etc_passwd); + system(@pwd_mkdb, "-u", $user, $etc_passwd); if ($?) { warn "$last\n"; - warn "``$pwd_mkdb'' failed\n"; + warn "``pwd_mkdb'' failed\n"; exit($? >> 8); } } |