d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. Deal with login classes now

Browse Source 
2. Turn on send_message by default for security reasons (mailbox
must be pre-created)
This commit is contained in:
Andrey A. Chernov 1997-05-01 22:55:58 +00:00
parent 18a47d3b2b
commit 84dc96f1be
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=25371
2 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
usr.sbin/adduser/adduser.8
View File

@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" $Id$ .\" $Id: adduser.8,v 1.19 1997/02/22 16:01:17 peter Exp $
.Dd Jan, 9, 1995 .Dd Jan, 9, 1995
.Dt ADDUSER 8 .Dt ADDUSER 8
.Os FreeBSD 2.1 .Os FreeBSD 2.1
@ -34,20 +34,35 @@
.Oo .Oo
.Fl batch Ar username .Fl batch Ar username
.Op Ar group Ns , Ns Op Ar group,... .Op Ar group Ns , Ns Op Ar group,...
.Op Ar class
.Op Ar fullname .Op Ar fullname
.Op Ar password .Op Ar password
.Oc .Oc
.br
.Op Fl check_only .Op Fl check_only
.br
.Op Fl class Ar login_class
.br
.Op Fl config_create .Op Fl config_create
.br
.Op Fl dotdir Ar dotdir .Op Fl dotdir Ar dotdir
.br
.Op Fl group Ar login_group .Op Fl group Ar login_group
.br
.Op Fl h | help .Op Fl h | help
.br
.Op Fl home Ar home .Op Fl home Ar home
.br
.Op Fl message Ar message_file .Op Fl message Ar message_file
.br
.Op Fl noconfig .Op Fl noconfig
.br
.Op Fl shell Ar shell .Op Fl shell Ar shell
.br
.Op Fl s | silent | q | quiet .Op Fl s | silent | q | quiet
.br
.Op Fl uid Ar uid_start .Op Fl uid Ar uid_start
.br
.Op Fl v | verbose .Op Fl v | verbose
.Sh DESCRIPTION .Sh DESCRIPTION
.Nm Adduser .Nm Adduser
@ -120,10 +135,12 @@ Parse command line options
.El .El
.Sh OPTIONS .Sh OPTIONS
.Bl -tag -width Ds .Bl -tag -width Ds
.It Sy -batch username [group[,group]...] [fullname] [password] .It Sy -batch username [group[,group]...] [class] [fullname] [password]
Batch mode. Batch mode.
.It Sy -check_only .It Sy -check_only
Check /etc/passwd, /etc/group, /etc/shells and exit. Check /etc/passwd, /etc/group, /etc/shells and exit.
.It Sy -class Ar login_class
Set default login class
.It Sy -create_config .It Sy -create_config
Create new config and message file and exit. Create new config and message file and exit.
.It Sy -dotdir Ar directory .It Sy -dotdir Ar directory
@ -196,10 +213,11 @@ $ adduser
.Pp .Pp
Start adduser in interactive mode. Start adduser in interactive mode.
.Pp .Pp
$ adduser -batch baerenklau guest,staff,baer 'Teddy II' qwerty7 $ adduser -batch baerenklau guest,staff,baer '' 'Teddy II' qwerty7
.Pp .Pp
Create user 'baerenklau' and login group 'baerenklau'. Invite user 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 is 'Teddy II'. Password is 'qwerty7' (don't use such passwords!). Create
HOME directory HOME directory
.Pa /home/baerenklau .Pa /home/baerenklau
@ -224,6 +242,8 @@ user database
group database group database
.It Pa /etc/shells .It Pa /etc/shells
shell database shell database
.It Pa /etc/login.conf
login classes database
.It Pa /etc/adduser.conf .It Pa /etc/adduser.conf
config file for adduser config file for adduser
.It Pa /etc/adduser.message .It Pa /etc/adduser.message
@ -241,6 +261,7 @@ logfile for adduser
.Xr yp 4 , .Xr yp 4 ,
.Xr aliases 5 , .Xr aliases 5 ,
.Xr group 5 , .Xr group 5 ,
.Xr login.conf 5 ,
.Xr passwd 5 , .Xr passwd 5 ,
.Xr shells 5 , .Xr shells 5 ,
.Xr addgroup 8 , .Xr addgroup 8 ,

39
usr.sbin/adduser/adduser.perl
View File

@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE. # 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 # read variables
@ -33,7 +33,7 @@ sub variables {
$defaultpasswd = "yes"; # use password for new users $defaultpasswd = "yes"; # use password for new users
$dotdir = "/usr/share/skel"; # copy dotfiles from this dir $dotdir = "/usr/share/skel"; # copy dotfiles from this dir
$dotdir_bak = $dotdir; $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'; $send_message_bak = '/etc/adduser.message';
$config = "/etc/adduser.conf"; # config file for adduser $config = "/etc/adduser.conf"; # config file for adduser
$config_read = 1; # read config file $config_read = 1; # read config file
@ -53,6 +53,7 @@ sub variables {
$defaultshell = 'sh'; # defaultshell if not empty $defaultshell = 'sh'; # defaultshell if not empty
$group_uniq = 'USER'; $group_uniq = 'USER';
$defaultgroup = $group_uniq;# login groupname, $group_uniq means username $defaultgroup = $group_uniq;# login groupname, $group_uniq means username
$defaultclass = '';
$uid_start = 1000; # new users get this uid $uid_start = 1000; # new users get this uid
$uid_end = 32000; # max. uid $uid_end = 32000; # max. uid
@ -391,6 +392,15 @@ sub new_users_id {
return &next_id($name); 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 # add user to group
sub add_group { sub add_group {
local($gid, $name) = @_; local($gid, $name) = @_;
@ -532,6 +542,7 @@ Password: ****
Fullname: $fullname Fullname: $fullname
Uid: $u_id Uid: $u_id
Gid: $g_id ($group_login) Gid: $g_id ($group_login)
Class: $class
Groups: $group_login $new_groups Groups: $group_login $new_groups
HOME: $home/$name HOME: $home/$name
Shell: $sh Shell: $sh
@ -676,9 +687,10 @@ sub new_users {
# sh: shell # sh: shell
# u_id: user id # u_id: user id
# g_id: group id # g_id: group id
# class: login class
# group_login: groupname of g_id # group_login: groupname of g_id
# new_groups: some other groups # 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($groupmembers_bak, $cryptpwd);
local($new_users_ok) = 1; local($new_users_ok) = 1;
@ -691,6 +703,7 @@ sub new_users {
$fullname = &new_users_fullname($name); $fullname = &new_users_fullname($name);
$sh = &new_users_shell; $sh = &new_users_shell;
($u_id, $g_id) = &new_users_id($name); ($u_id, $g_id) = &new_users_id($name);
$class = &new_users_class($defaultclass);
($group_login, $defaultgroup) = ($group_login, $defaultgroup) =
&new_users_grplogin($name, $defaultgroup, $new_users_ok); &new_users_grplogin($name, $defaultgroup, $new_users_ok);
# do not use uniq username and login group # do not use uniq username and login group
@ -707,7 +720,7 @@ sub new_users {
$cryptpwd = crypt($password, &salt) if $password ne ""; $cryptpwd = crypt($password, &salt) if $password ne "";
# obscure perl bug # obscure perl bug
$new_entry = "$name\:" . "$cryptpwd" . $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"); &append_file($etc_passwd, "$new_entry");
&new_users_pwdmkdb("$new_entry"); &new_users_pwdmkdb("$new_entry");
&new_users_group_update; &new_users_group_update;
@ -727,7 +740,7 @@ sub new_users {
} }
sub batch { sub batch {
local($name, $groups, $fullname, $password) = @_; local($name, $groups, $class, $fullname, $password) = @_;
local($sh); local($sh);
$defaultshell = &shell_default_valid($defaultshell); $defaultshell = &shell_default_valid($defaultshell);
@ -744,11 +757,12 @@ sub batch {
($flag, $new_groups) = &new_users_groups_valid($groups); ($flag, $new_groups) = &new_users_groups_valid($groups);
return 0 if $flag; return 0 if $flag;
$class = $defaultclass if $class eq "";
$cryptpwd = ""; $cryptpwd = "";
$cryptpwd = crypt($password, &salt) if $password ne ""; $cryptpwd = crypt($password, &salt) if $password ne "";
# obscure perl bug # obscure perl bug
$new_entry = "$name\:" . "$cryptpwd" . $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"); &append_file($etc_passwd, "$new_entry");
&new_users_pwdmkdb("$new_entry"); &new_users_pwdmkdb("$new_entry");
&new_users_group_update; &new_users_group_update;
@ -778,8 +792,9 @@ sub check_root {
sub usage { sub usage {
warn <<USAGE; warn <<USAGE;
usage: adduser usage: adduser
[-batch username [group[,group]...] [fullname] [password]] [-batch username [group[,group]...] [class] [fullname] [password]]
[-check_only] [-check_only]
[-class login_class]
[-config_create] [-config_create]
[-dotdir dotdir] [-dotdir dotdir]
[-group login_group] [-group login_group]
@ -793,7 +808,7 @@ usage: adduser
[-v|-verbose] [-v|-verbose]
home=$home shell=$defaultshell dotdir=$dotdir login_group=$defaultgroup 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 USAGE
exit 1; exit 1;
} }
@ -860,12 +875,13 @@ sub parse_arguments {
elsif (/^--?(shell)$/) { $defaultshell = $argv[0]; shift @argv } elsif (/^--?(shell)$/) { $defaultshell = $argv[0]; shift @argv }
elsif (/^--?(dotdir)$/) { $dotdir = $argv[0]; shift @argv } elsif (/^--?(dotdir)$/) { $dotdir = $argv[0]; shift @argv }
elsif (/^--?(uid)$/) { $uid_start = $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 (/^--?(group)$/) { $defaultgroup = $argv[0]; shift @argv }
elsif (/^--?(check_only)$/) { $check_only = 1 } elsif (/^--?(check_only)$/) { $check_only = 1 }
elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv; elsif (/^--?(message)$/) { $send_message = $argv[0]; shift @argv;
$sendmessage = 1; } $sendmessage = 1; }
elsif (/^--?(batch)$/) { 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; die "batch: too few arguments\n" if $#batch < 0;
} }
# see &config_read # see &config_read
@ -1355,9 +1371,12 @@ shellpref = ($shpref)
# defaultshell if not empty ("bash") # defaultshell if not empty ("bash")
defaultshell = "$defaultshell" 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 defaultgroup = $defaultgroup
# defaultclass if not empty
defaultclass = "$defaultclass"
# new users get this uid (1000) # new users get this uid (1000)
uid_start = 1000 uid_start = 1000