summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-08 21:05:30 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-08 21:05:30 +0000
commit79a9bdcfc3f02e480be64cf45300c0e9cf487335 (patch)
tree9ce4d0f4fe11233a57fd5a94da103070e6ad7d5c /usr.sbin
parent98138cc9227fae0eecdf562e895bd5fdc6f43fe0 (diff)
Instead of splitting a flat string into a list for system(), just
pass it a list in the first place. Also fix up some spacing.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/adduser/adduser.perl12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/adduser/adduser.perl b/usr.sbin/adduser/adduser.perl
index f50487136cd..3d05d905647 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.42 2003/05/13 01:23:10 millert Exp $
+# $OpenBSD: adduser.perl,v 1.43 2003/06/08 21:05:29 millert Exp $
#
# Copyright (c) 1995-1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
# All rights reserved.
@@ -47,7 +47,7 @@ $SIG{'TERM'} = 'cleanup';
&config_read(@ARGV); # read variables from config-file
&parse_arguments(@ARGV); # parse arguments
-if (!$check_only && $#batch < 0) {
+if (!$check_only && $#batch < 0) {
&hints;
}
@@ -89,7 +89,7 @@ sub variables {
$group = "/etc/group";
$pwd_mkdb = "pwd_mkdb -p"; # program for building passwd database
$encryptionmethod = "blowfish";
- $rcsid = '$OpenBSD: adduser.perl,v 1.42 2003/05/13 01:23:10 millert Exp $';
+ $rcsid = '$OpenBSD: adduser.perl,v 1.43 2003/06/08 21:05:29 millert Exp $';
# List of directories where shells located
@path = ('/bin', '/usr/bin', '/usr/local/bin');
@@ -285,7 +285,7 @@ sub home_partition_valid {
# check for valid passwddb
sub passwd_check {
- system(split(/\s+/, "$pwd_mkdb -c $etc_passwd"));
+ system($pwd_mkdb, "-c", $etc_passwd);
die "\nInvalid $etc_passwd - cannot add any users!\n" if $?;
}
@@ -605,7 +605,7 @@ sub new_users_pwdmkdb {
local($user);
$user = (split(/:/, $last))[0];
- system(split(/\s+/, "$pwd_mkdb -u $user $etc_passwd"));
+ system($pwd_mkdb, "-u", $user, $etc_passwd);
if ($?) {
warn "$last\n";
warn "``$pwd_mkdb'' failed\n";
@@ -1085,7 +1085,7 @@ sub home_create {
}
if ($dotdir eq 'no') {
- if (!mkdir("$homedir",0755)) {
+ if (!mkdir("$homedir", 0755)) {
warn "mkdir $homedir: $!\n"; return 0;
}
system 'chown', "$name:$group", $homedir;