1. Deal with login classes now
2. Turn on send_message by default for security reasons (mailbox must be pre-created)
This commit is contained in:
Andrey A. Chernov
parent
18a47d3b2b
commit
84dc96f1be
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=25371
@ -22,7 +22,7 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id$
|
||||
.\" $Id: adduser.8,v 1.19 1997/02/22 16:01:17 peter Exp $
|
||||
.Dd Jan, 9, 1995
|
||||
.Dt ADDUSER 8
|
||||
.Os FreeBSD 2.1
|
||||
@ -34,20 +34,35 @@
|
||||
.Oo
|
||||
.Fl batch Ar username
|
||||
.Op Ar group Ns , Ns Op Ar group,...
|
||||
.Op Ar class
|
||||
.Op Ar fullname
|
||||
.Op Ar password
|
||||
.Oc
|
||||
.br
|
||||
.Op Fl check_only
|
||||
.br
|
||||
.Op Fl class Ar login_class
|
||||
.br
|
||||
.Op Fl config_create
|
||||
.br
|
||||
.Op Fl dotdir Ar dotdir
|
||||
.br
|
||||
.Op Fl group Ar login_group
|
||||
.br
|
||||
.Op Fl h | help
|
||||
.br
|
||||
.Op Fl home Ar home
|
||||
.br
|
||||
.Op Fl message Ar message_file
|
||||
.br
|
||||
.Op Fl noconfig
|
||||
.br
|
||||
.Op Fl shell Ar shell
|
||||
.br
|
||||
.Op Fl s | silent | q | quiet
|
||||
.br
|
||||
.Op Fl uid Ar uid_start
|
||||
.br
|
||||
.Op Fl v | verbose
|
||||
.Sh DESCRIPTION
|
||||
.Nm Adduser
|
||||
@ -120,10 +135,12 @@ Parse command line options
|
||||
.El
|
||||
.Sh OPTIONS
|
||||
.Bl -tag -width Ds
|
||||
.It Sy -batch username [group[,group]...] [fullname] [password]
|
||||
.It Sy -batch username [group[,group]...] [class] [fullname] [password]
|
||||
Batch mode.
|
||||
.It Sy -check_only
|
||||
Check /etc/passwd, /etc/group, /etc/shells and exit.
|
||||
.It Sy -class Ar login_class
|
||||
Set default login class
|
||||
.It Sy -create_config
|
||||
Create new config and message file and exit.
|
||||
.It Sy -dotdir Ar directory
|
||||
@ -196,10 +213,11 @@ $ adduser
|
||||
.Pp
|
||||
Start adduser in interactive mode.
|
||||
.Pp
|
||||
$ adduser -batch baerenklau guest,staff,baer 'Teddy II' qwerty7
|
||||
$ adduser -batch baerenklau guest,staff,baer '' 'Teddy II' qwerty7
|
||||
.Pp
|
||||
Create user 'baerenklau' and login group 'baerenklau'. Invite user
|
||||
baerenklau into groups guest, staff and baer. Realname (fullname)
|
||||
baerenklau into groups guest, staff and baer. Use default login class.
|
||||
Realname (fullname)
|
||||
is 'Teddy II'. Password is 'qwerty7' (don't use such passwords!). Create
|
||||
HOME directory
|
||||
.Pa /home/baerenklau
|
||||
@ -224,6 +242,8 @@ user database
|
||||
group database
|
||||
.It Pa /etc/shells
|
||||
shell database
|
||||
.It Pa /etc/login.conf
|
||||
login classes database
|
||||
.It Pa /etc/adduser.conf
|
||||
config file for adduser
|
||||
.It Pa /etc/adduser.message
|
||||
@ -241,6 +261,7 @@ logfile for adduser
|
||||
.Xr yp 4 ,
|
||||
.Xr aliases 5 ,
|
||||
.Xr group 5 ,
|
||||
.Xr login.conf 5 ,
|
||||
.Xr passwd 5 ,
|
||||
.Xr shells 5 ,
|
||||
.Xr addgroup 8 ,
|
||||
|
||||
@ -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.27 1997/02/22 16:01:18 peter Exp $
|
||||
# $Id: adduser.perl,v 1.28 1997/03/09 12:21:45 wosch Exp $
|
||||
|
||||
|
||||
# read variables
|
||||
@ -33,7 +33,7 @@ sub variables {
|
||||
$defaultpasswd = "yes"; # use password for new users
|
||||
$dotdir = "/usr/share/skel"; # copy dotfiles from this dir
|
||||
$dotdir_bak = $dotdir;
|
||||
$send_message = "no"; # send message to new user
|
||||
$send_message = "/etc/adduser.message"; # send message to new user
|
||||
$send_message_bak = '/etc/adduser.message';
|
||||
$config = "/etc/adduser.conf"; # config file for adduser
|
||||
$config_read = 1; # read config file
|
||||
@ -53,6 +53,7 @@ sub variables {
|
||||
$defaultshell = 'sh'; # defaultshell if not empty
|
||||
$group_uniq = 'USER';
|
||||
$defaultgroup = $group_uniq;# login groupname, $group_uniq means username
|
||||
$defaultclass = '';
|
||||
|
||||
$uid_start = 1000; # new users get this uid
|
||||
$uid_end = 32000; # max. uid
|
||||
@ -391,6 +392,15 @@ sub new_users_id {
|
||||
return &next_id($name);
|
||||
}
|
||||
|
||||
# return login class for user
|
||||
sub new_users_class {
|
||||
local($def) = @_;
|
||||
local($class);
|
||||
|
||||
$class = &confirm_list("Enter login class", 1, $def, "");
|
||||
return $class;
|
||||
}
|
||||
|
||||
# add user to group
|
||||
sub add_group {
|
||||
local($gid, $name) = @_;
|
||||
@ -532,6 +542,7 @@ Password: ****
|
||||
Fullname: $fullname
|
||||
Uid: $u_id
|
||||
Gid: $g_id ($group_login)
|
||||
Class: $class
|
||||
Groups: $group_login $new_groups
|
||||
HOME: $home/$name
|
||||
Shell: $sh
|
||||
@ -676,9 +687,10 @@ sub new_users {
|
||||
# sh: shell
|
||||
# u_id: user id
|
||||
# g_id: group id
|
||||
# class: login class
|
||||
# group_login: groupname of g_id
|
||||
# new_groups: some other groups
|
||||
local($name, $group_login, $fullname, $sh, $u_id, $g_id, $new_groups);
|
||||
local($name, $group_login, $fullname, $sh, $u_id, $g_id, $class, $new_groups);
|
||||
local($groupmembers_bak, $cryptpwd);
|
||||
local($new_users_ok) = 1;
|
||||
|
||||
@ -691,6 +703,7 @@ sub new_users {
|
||||
$fullname = &new_users_fullname($name);
|
||||
$sh = &new_users_shell;
|
||||
($u_id, $g_id) = &new_users_id($name);
|
||||
$class = &new_users_class($defaultclass);
|
||||
($group_login, $defaultgroup) =
|
||||
&new_users_grplogin($name, $defaultgroup, $new_users_ok);
|
||||
# do not use uniq username and login group
|
||||
@ -707,7 +720,7 @@ sub new_users {
|
||||
$cryptpwd = crypt($password, &salt) if $password ne "";
|
||||
# obscure perl bug
|
||||
$new_entry = "$name\:" . "$cryptpwd" .
|
||||
"\:$u_id\:$g_id\::0:0:$fullname:$home/$name:$sh";
|
||||
"\:$u_id\:$g_id\:$class\:0:0:$fullname:$home/$name:$sh";
|
||||
&append_file($etc_passwd, "$new_entry");
|
||||
&new_users_pwdmkdb("$new_entry");
|
||||
&new_users_group_update;
|
||||
@ -727,7 +740,7 @@ sub new_users {
|
||||
}
|
||||
|
||||
sub batch {
|
||||
local($name, $groups, $fullname, $password) = @_;
|
||||
local($name, $groups, $class, $fullname, $password) = @_;
|
||||
local($sh);
|
||||
|
||||
$defaultshell = &shell_default_valid($defaultshell);
|
||||
@ -744,11 +757,12 @@ sub batch {
|
||||
($flag, $new_groups) = &new_users_groups_valid($groups);
|
||||
return 0 if $flag;
|
||||
|
||||
$class = $defaultclass if $class eq "";
|
||||
$cryptpwd = "";
|
||||
$cryptpwd = crypt($password, &salt) if $password ne "";
|
||||
# obscure perl bug
|
||||
$new_entry = "$name\:" . "$cryptpwd" .
|
||||
"\:$u_id\:$g_id\::0:0:$fullname:$home/$name:$sh";
|
||||
"\:$u_id\:$g_id\:$class\:0:0:$fullname:$home/$name:$sh";
|
||||
&append_file($etc_passwd, "$new_entry");
|
||||
&new_users_pwdmkdb("$new_entry");
|
||||
&new_users_group_update;
|
||||
@ -778,8 +792,9 @@ sub check_root {
|
||||
sub usage {
|
||||
warn <<USAGE;
|
||||
usage: adduser
|
||||
[-batch username [group[,group]...] [fullname] [password]]
|
||||
[-batch username [group[,group]...] [class] [fullname] [password]]
|
||||
[-check_only]
|
||||
[-class login_class]
|
||||
[-config_create]
|
||||
[-dotdir dotdir]
|
||||
[-group login_group]
|
||||
@ -793,7 +808,7 @@ usage: adduser
|
||||
[-v|-verbose]
|
||||
|
||||
home=$home shell=$defaultshell dotdir=$dotdir login_group=$defaultgroup
|
||||
message_file=$send_message uid_start=$uid_start
|
||||
login_class=$defaultclass message_file=$send_message uid_start=$uid_start
|
||||
USAGE
|
||||
exit 1;
|
||||
}
|
||||
@ -860,12 +875,13 @@ sub parse_arguments {
|
||||
elsif (/^--?(shell)$/) { $defaultshell = $argv[0]; shift @argv }
|
||||
elsif (/^--?(dotdir)$/) { $dotdir = $argv[0]; shift @argv }
|
||||
elsif (/^--?(uid)$/) { $uid_start = $argv[0]; shift @argv }
|
||||
elsif (/^--?(class)$/) { $defaultclass = $argv[0]; shift @argv }
|
||||
elsif (/^--?(group)$/) { $defaultgroup = $argv[0]; shift @argv }
|
||||
elsif (/^--?(check_only)$/) { $check_only = 1 }
|
||||
elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv;
|
||||
$sendmessage = 1; }
|
||||
elsif (/^--?(batch)$/) {
|
||||
@batch = splice(@argv, 0, 4); $verbose = 0;
|
||||
@batch = splice(@argv, 0, 5); $verbose = 0;
|
||||
die "batch: too few arguments\n" if $#batch < 0;
|
||||
}
|
||||
# see &config_read
|
||||
@ -1355,9 +1371,12 @@ shellpref = ($shpref)
|
||||
# defaultshell if not empty ("bash")
|
||||
defaultshell = "$defaultshell"
|
||||
|
||||
# defaultgroup ('USER' for same as username or any other valid group
|
||||
# defaultgroup ('USER' for same as username or any other valid group)
|
||||
defaultgroup = $defaultgroup
|
||||
|
||||
# defaultclass if not empty
|
||||
defaultclass = "$defaultclass"
|
||||
|
||||
# new users get this uid (1000)
|
||||
uid_start = 1000
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user