diff -pruN 3.129/AdduserCommon.pm 3.134/AdduserCommon.pm --- 3.129/AdduserCommon.pm 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/AdduserCommon.pm 2023-05-25 15:54:35.000000000 +0000 @@ -25,8 +25,8 @@ my $lockfile; 'dief', 'get_group_members', 'gtx', - 'invalidate_nscd', 'read_config', + 'read_pool', 's_print', 's_printf', 'systemcall', @@ -37,45 +37,6 @@ my $lockfile; 'release_lock' ); -sub invalidate_nscd { - # Check if we need to do make -C /var/yp for NIS - my $nisconfig; - if(-f "/etc/default/nis") { - $nisconfig = "/etc/default/nis"; - } elsif(-f "/etc/init.d/nis") { - $nisconfig = "/etc/init.d/nis"; - } - # find out whether a local ypserv is running - # We can ditch any rpcinfo error since if the portmapper is nonfunctional, - # we couldn't connect to ypserv anyway. If this assumption is invalid, - # please file a bug and suggest a better way. - if(defined($nisconfig) && -f "/var/yp/Makefile" && - -x "/usr/sbin/rpcinfo" && grep(/ypserv/, qx{/usr/sbin/rpcinfo -p 2>/dev/null})) { - open(NISCONFIG, "<$nisconfig"); - if(grep(/^NISSERVER=master/, )) { - system("make", "-C", "/var/yp"); - } - close(NISCONFIG); - } - - # Check if we need to invalidate the NSCD cache - my $nscd = &which('nscd',1); - # this function replaces startnscd and stopnscd (closes: #54726) - # We are ignoring any error messages given by nscd here since we - # cannot expect the nscd maintainer and upstream to document their - # interfaces. See #330929. - if(defined($nscd) && -x $nscd) { - my $table = shift; - if ($table) { - system ($nscd, "-i", $table); - } else { - # otherwise we invalidate passwd and group table - system ($nscd, "-i", "passwd"); - system ($nscd, "-i", "group"); - } - } -} - sub gtx { return gettext( shift ); } @@ -135,6 +96,78 @@ sub read_config { close CONF || die "$!"; } +# read names and IDs from a pool file +# parameters: +# -- filename of the pool file, or directory containing files +# -- a hash for the pool data +sub read_pool { + my ($pool_file, $type, $poolref) = @_; + my ($name, $id); + my %ids = (); + my %new; + + if (-d $pool_file) { + opendir (DIR, $pool_file) or + dief gtx("Cannot read directory `%s'"),$pool_file; + my @files = readdir (DIR); + closedir (DIR); + foreach (sort @files) { + next if (/^\./); + next if (!/\.conf$/); + my $file = "$pool_file/$_"; + next if (! -f $file); + read_pool ($file, $type, $poolref); + } + return; + } + if (! -f $pool_file) { + warnf gtx("`%s' does not exist.\n"),$pool_file if $verbose; + return; + } + open (POOL, $pool_file) || dief ("%s: `%s'\n",$pool_file,$!); + while () { + chomp; + next if /^#/ || /^\s*$/; + + if ($type eq "uid") { + ($name, $id, $comment, $home, $shell) = split (/:/); + if (!$name || $name !~ /^([_a-zA-Z0-9-]+)$/ || + !$id || $id !~ /^(\d+)$/) { + warnf gtx("Couldn't parse `%s', line %d.\n"),$pool_file,$.; + next; + } + $new = { + 'id' => $id, + 'comment' => $comment, + 'home' => $home, + 'shell' => $shell + }; + } elsif ($type eq "gid") { + ($name, $id) = split (/:/); + if (!$name || $name !~ /^([_a-zA-Z0-9-]+)$/ || + !$id || $id !~ /^(\d+)$/) { + warnf gtx("Couldn't parse `%s', line %d.\n"),$pool_file,$.; + next; + } + $new = { + 'id' => $id, + }; + } else { + dief gtx("Illegal pool type `%s' reading `%s'.\n"),$type,$pool_file; + } + if (defined($poolref->{$name})) { + dief gtx("Duplicate name `%s' at `%s', line %d.\n"),$name,$pool_file,$.; + } + if (defined($ids{$id})) { + dief gtx("Duplicate ID `%s' at `%s', line %d.\n"),$id,$pool_file,$.; + } + + $poolref->{$name} = $new; + } + + close POOL || die "$!"; +} + sub get_group_members { my $group = shift; @@ -240,6 +273,8 @@ sub which { # preseed the configuration variables # then read the config file /etc/adduser and overwrite the data hardcoded here +# we cannot give defaults for users_gid and users_group here since this will +# probably lead to double defined users_gid and users_group. sub preseed_config { my ($conflistref, $configref) = @_; my %config_defaults = ( @@ -272,11 +307,13 @@ sub preseed_config { setgid_home => "no", no_del_paths => "^/bin\$ ^/boot\$ ^/dev\$ ^/etc\$ ^/initrd ^/lib ^/lost+found\$ ^/media\$ ^/mnt\$ ^/opt\$ ^/proc\$ ^/root\$ ^/run\$ ^/sbin\$ ^/srv\$ ^/sys\$ ^/tmp\$ ^/usr\$ ^/var\$ ^/vmlinu", name_regex => "^[a-z][a-z0-9_-]*\\\$?\$", - sys_name_regex => "^[a-z][a-z0-9_-]*\\\$?\$", + sys_name_regex => "^[a-z_][a-z0-9_-]*\\\$?\$", exclude_fstypes => "(proc|sysfs|usbfs|devpts|devtmpfs|devfs|afs)", - skel_ignore_regex => "(dpkg|ucf)-(old|new|dist)\$", + skel_ignore_regex => "\.(dpkg|ucf)-(old|new|dist)\$", extra_groups => "users", - add_extra_groups => 0 + add_extra_groups => 0, + uid_pool => "", + gid_pool => "", ); # Initialize to the set of known variables. @@ -286,6 +323,7 @@ sub preseed_config { # Read the configuration files foreach( @$conflistref ) { + debugf("read configuration file %s\n", $_); read_config($_,$configref); } } diff -pruN 3.129/adduser 3.134/adduser --- 3.129/adduser 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/adduser 2023-05-25 15:54:35.000000000 +0000 @@ -78,22 +78,22 @@ my $yesexpr = langinfo(YESEXPR()); my %config; # configuration hash -my @defaults = ("/etc/adduser.conf"); my $nogroup_id = getgrnam("nogroup") || 65534; $0 =~ s+.*/++; our $verbose = 1; # should we be verbose? -my $allow_badname = 0; # should we allow bad names? +my $name_check_level = 0; # should we allow bad names? my $ask_passwd = 1; # ask for a passwd? my $disabled_login = 0; # leave the new account disabled? -our $configfile = undef; +our @configfiles; +our @defaults = undef; our $found_group_opt = undef; our $found_sys_opt = undef; our $ingroup_name = undef; our $new_firstgid = undef; our $new_firstuid = undef; -our $new_gecos = undef; +our $new_comment = undef; our $gid_option = undef; our $primary_gid = undef; our $new_lastgid = undef; @@ -121,22 +121,26 @@ my $first_gid = undef; my $last_gid = undef; my $dir_mode = undef; my $perm = undef; +my %uid_pool; +my %gid_pool; our @names; GetOptions( 'add-extra-groups' => \$add_extra_groups, 'add_extra_groups' => \$add_extra_groups_old, - 'allow-all-names' => sub { $allow_badname = 2 }, - 'allow-badname' => sub { $allow_badname = 1 unless $allow_badname }, - 'conf|c=s' => \$configfile, + 'allow-all-names' => sub { $name_check_level = 2 }, + 'allow-badname' => sub { $name_check_level = 1 unless $name_check_level }, + 'allow-bad-names' => sub { $name_check_level = 1 unless $name_check_level }, + 'comment=s' => \$new_comment, + 'conf|c=s' => \@configfiles, 'debug' => sub { $verbose = 2 }, 'disabled-login' => sub { $disabled_login = 1; $ask_passwd = 0 }, 'disabled-password' => sub { $ask_passwd = 0 }, 'firstgid=i' => \$new_firstgid, 'firstuid=i' => \$new_firstuid, - 'force-badname' => sub { $allow_badname = 1 unless $allow_badname }, - 'gecos=s' => \$new_gecos, + 'force-badname' => sub { $name_check_level = 1 unless $name_check_level }, + 'gecos=s' => \$new_comment, 'gid=i' => \$gid_option, 'group' => \$found_group_opt, 'help|h' => sub { &usage; exit }, @@ -149,13 +153,18 @@ GetOptions( 'shell=s' => \$special_shell, 'system' => \$found_sys_opt, 'uid=i' => \$new_uid, + 'verbose' => sub { $verbose = 1 }, 'version|v' => sub { &version; exit }, ) or &usage_error; # everyone can issue "--help" and "--version", but only root can go on dief (gtx("Only root may add a user or group to the system.\n")) if ($> != 0); -if( defined($configfile) ) { @defaults = ($configfile); } +if(!@configfiles) { + @defaults = ("/etc/adduser.conf"); +} else { + @defaults = (@configfiles); +} # detect the right mode my $action = $0 eq "addgroup" ? "addgroup" : "adduser"; @@ -248,6 +257,14 @@ $ENV{"DEBUG"} = $verbose; # preseed configuration data and then read the config file preseed_config(\@defaults,\%config); +# read the uid and gid pool +if ($config{"uid_pool"}) { + read_pool ($config{"uid_pool"}, "uid", \%uid_pool); +} +if ($config{"gid_pool"}) { + read_pool ($config{"gid_pool"}, "gid", \%gid_pool); +} + &checkname($new_name) if defined $new_name; $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'HUP'} = 'handler'; @@ -258,7 +275,7 @@ $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'HUP'} # $action = "adduser" # $new_name - the name of the new user. # $ingroup_name | $gid_option - the group to add the user to -# $special_home, $new_uid, $new_gecos - optional overrides +# $special_home, $new_uid, $new_comment - optional overrides # $action = "addgroup" # $new_name - the name of the new group # $gid_option - optional override @@ -268,7 +285,7 @@ $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'HUP'} # $action = "addsysuser" # $new_name - the name of the new user # $make_group_also | $ingroup_name | $gid_option | 0 - which group -# $special_home, $new_uid, $new_gecos - optional overrides +# $special_home, $new_uid, $new_comment - optional overrides # $action = "addusertogroup" # $existing_user - the user to be added # $existing_group - the group to add her to @@ -304,20 +321,21 @@ if ($action eq "addsysgroup") { } if (!defined($gid_option)) { - $gid_option = &first_avail_gid($config{"first_system_gid"}, - $config{"last_system_gid"}); + $first_gid = $new_firstgid || $config{"first_system_gid"}; + $last_gid = $new_lastgid || $config{"last_system_gid"}; + $gid_option = &first_avail_gid($first_gid, + $last_gid, + $gid_pool{$new_name}{'id'}); if ($gid_option == -1) { - warnf gtx("No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"),$config{"first_system_gid"},$config{"last_system_gid"}; + warnf gtx("No GID is available in the range %d-%d (FIRST_SYS_GID - LAST_SYS_GID).\n"),$first_gid,$last_gid; dief (gtx("The group `%s' was not created.\n"),$new_name); } } printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$gid_option) if $verbose; - &invalidate_nscd("group"); my $groupadd = &which('groupadd'); &systemcall($groupadd, '-g', $gid_option, $new_name); - &invalidate_nscd("group"); release_lock(0); print (gtx("Done.\n")) if $verbose; exit RET_OK; @@ -336,21 +354,28 @@ if ($action eq "addgroup") { dief (gtx("The GID `%s' is already in use.\n"),$gid_option) } if (!defined($gid_option)) { - $gid_option = &first_avail_gid($config{"first_gid"}, - $config{"last_gid"}); + $first_gid = $new_firstgid || $config{"first_gid"}; + $last_gid = $new_lastgid || $config{"last_gid"}; + debugf( "Searching for gid with first_gid=%s, last_gid=%s, new_name=%s, gid_pool=%s", + $first_gid, + $last_gid, + $new_name, + $gid_pool{$new_name}{'id'} + ); + $gid_option = &first_avail_gid($first_gid, + $last_gid, + $gid_pool{$new_name}{'id'}); if ($gid_option == -1) { print STDERR "$0: "; - printf STDERR gtx("No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"),$config{"first_gid"},$config{"last_gid"}; + printf STDERR gtx("No GID is available in the range %d-%d (FIRST_GID - LAST_GID).\n"),$first_gid,$last_gid; dief (gtx("The group `%s' was not created.\n"),$new_name); } } printf (gtx("Adding group `%s' (GID %d) ...\n"),$new_name,$gid_option) if $verbose; - &invalidate_nscd("group"); my $groupadd = &which('groupadd'); &systemcall($groupadd, '-g', $gid_option, $new_name); - &invalidate_nscd("group"); release_lock(0); print (gtx("Done.\n")) if $verbose; exit RET_OK; @@ -373,9 +398,7 @@ if ($action eq 'addusertogroup') { printf gtx("Adding user `%s' to group `%s' ...\n"), $existing_user, $existing_group if $verbose; acquire_lock(); - &invalidate_nscd(); &systemcall('/usr/sbin/usermod', '-a', '-G', $existing_group, $existing_user); - &invalidate_nscd(); release_lock(); print gtx("Done.\n") if $verbose; @@ -409,19 +432,22 @@ if ($action eq "addsysuser") { check_user_group(1); if (!defined($new_uid) && $make_group_also) { - $new_uid = &first_avail_uid($config{"first_system_uid"}, - $config{"last_system_uid"}); + $new_uid = &first_avail_uid($new_firstuid || $config{"first_system_uid"}, + $new_lastuid || $config{"last_system_uid"}, + $uid_pool{$new_name}{'id'}); if ($new_uid == -1) { warnf gtx("No UID/GID pair is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"),$config{"first_system_uid"},$config{"last_system_uid"}; dief (gtx("The user `%s' was not created.\n"),$new_name); } - $gid_option = &first_avail_gid($config{"first_system_gid"}, - $config{"last_system_gid"}); + $gid_option = &first_avail_gid($new_firstgid || $config{"first_system_gid"}, + $new_lastgid || $config{"last_system_gid"}, + $gid_pool{$new_name}{'id'}); $ingroup_name = $new_name; } elsif (!defined($new_uid) && !$make_group_also) { - $new_uid = &first_avail_uid($config{"first_system_uid"}, - $config{"last_system_uid"}); + $new_uid = &first_avail_uid($new_firstuid || $config{"first_system_uid"}, + $new_lastuid || $config{"last_system_uid"}, + $uid_pool{$new_name}{'id'}); if ($new_uid == -1) { warnf gtx("No UID is available in the range %d-%d (FIRST_SYS_UID - LAST_SYS_UID).\n"),$config{"first_system_uid"},$config{"last_system_uid"}; dief (gtx("The user `%s' was not created.\n"),$new_name); @@ -438,38 +464,37 @@ if ($action eq "addsysuser") { } printf (gtx("Adding system user `%s' (UID %d) ...\n"),$new_name,$new_uid) if $verbose; - &invalidate_nscd(); # if we reach this point, and the group does already exist, we can use it. if ($make_group_also && !getgrnam($new_name)) { printf (gtx("Adding new group `%s' (GID %d) ...\n"),$new_name,$gid_option) if $verbose; $undogroup = $new_name; my $groupadd = &which('groupadd'); &systemcall($groupadd, '-g', $gid_option, $new_name); - &invalidate_nscd("group"); } printf gtx("Adding new user `%s' (UID %d) with group `%s' ...\n"),$new_name,$new_uid,$ingroup_name if $verbose; - $home_dir = $special_home || '/nonexistent'; + $home_dir = $special_home || $uid_pool{$new_name}{'home'} || '/nonexistent'; $no_create_home = $home_dir =~ /^\/+nonexistent(\/|$)/ ? 1 : $no_create_home; - $shell = $special_shell || '/usr/sbin/nologin'; + $shell = $special_shell || $uid_pool{$new_name}{'shell'} || '/usr/sbin/nologin'; $undouser = $new_name; &systemcall('/usr/sbin/useradd', '-r', - '-K', sprintf('SYS_UID_MIN=%d', $config{'first_system_uid'}), - '-K', sprintf('SYS_UID_MAX=%d', $config{'last_system_uid'}), + '-K', sprintf('SYS_UID_MIN=%d', $new_firstuid || $config{'first_system_uid'}), + '-K', sprintf('SYS_UID_MAX=%d', $new_lastuid || $config{'last_system_uid'}), '-d', $home_dir, '-g', $ingroup_name, '-s', $shell, '-u', $new_uid, $new_name); - &invalidate_nscd(); release_lock(0); - if (defined($new_gecos)) { - &ch_gecos($new_gecos); + if (defined($new_comment)) { + &ch_comment($new_comment); + } elsif ($uid_pool{$new_name}{'comment'}) { + &ch_comment($uid_pool{$new_name}{'comment'}); } $primary_gid = $gid_option; @@ -494,7 +519,7 @@ if ($action eq "adduser") { debugf( "users_gid %s, users_group %s\n", $config{"users_gid"}, $config{"users_group"} ); debugf( "primary_gid %s, supplemental groups %s\n", $primary_gid, join(", ",@supplemental_groups) ); if( defined($config{"users_gid"}) && defined($config{"users_group"}) ) { - warnf gtx("USERS_GID and USERS_GROUP both given in adduser.conf. This is an error.\n"); + warnf gtx("USERS_GID and USERS_GROUP both given in configuration. This is an error.\n"); dief (gtx("The user `%s' was not created.\n"),$new_name); } @@ -575,16 +600,34 @@ if ($action eq "adduser") { check_user_group(0); $first_uid = $new_firstuid || $config{"first_uid"}; $last_uid = $new_lastuid || $config{"last_uid"}; - $first_gid = $new_firstgid || $config{"first_gid"}; - $last_gid = $new_lastgid || $config{"last_gid"}; + if ($config{"usergroups"} =~ /yes/i) { + $first_gid = $first_uid; + $last_gid = $last_uid; + } else { + $first_gid = $new_firstgid || $config{"first_gid"}; + $last_gid = $new_lastgid || $config{"last_gid"}; + } debugf( "first_uid %s, last_uid %s, first_gid %s, last_gid %s\n", $first_uid, $last_uid, $first_gid, $last_gid ); printf (gtx("Adding user `%s' ...\n"),$new_name) if $verbose; if (!defined($new_uid)) { - my $first_uidgid = ($first_uid, $first_gid)[$first_uid > $first_gid]; - my $last_uidgid = ($last_uid, $last_gid)[$last_uid < $last_gid]; - $new_uid = &first_avail_uid_gid( $first_uidgid, - $last_uidgid); + if ( defined $ingroup_name ) { + $new_uid = &first_avail_uid( $first_uid, + $last_uid, + $uid_pool{$new_name}{'id'}); + } else { + my $first_uidgid = ($first_uid, $first_gid)[$first_uid > $first_gid]; + my $last_uidgid = ($last_uid, $last_gid)[$last_uid < $last_gid]; + # TODO: Check what happens when those ranges do not overlap + $new_uid = &first_avail_uid_gid( $first_uidgid, + $last_uidgid, + $uid_pool{$new_name}{'id'}); + debugf( "uidgid=%s, from first_uidgid %s, last_uidgid %s\n", $new_uid, $first_uidgid, $last_uidgid); + } + # TODO: user can specify different UID and GID here. + # idea: split handling in uid/gid, which are equally the return value of + # first_avail_uid_gid. If either pool_id is defined, set uid and gid from + # distinct first_avail_uid and first_avail_gid calls. debugf( "new_uid %s selected\n", $new_uid); if ($new_uid == -1) { @@ -636,7 +679,6 @@ if ($action eq "adduser") { } } - &invalidate_nscd(); debugf ("make_group_also %s\n", $make_group_also ); if ($make_group_also) { $undogroup = $new_name; @@ -650,7 +692,6 @@ if ($action eq "adduser") { $primary_gid = getgrnam($new_name); debugf( "new group '%s' created with GID %d", $new_name, $primary_gid ); } - &invalidate_nscd(); } if ($verbose) { @@ -658,13 +699,16 @@ if ($action eq "adduser") { my $grname=$grgid[0]; printf gtx("Adding new user `%s' (%d) with group `%s (%d)' ...\n"),$new_name,$new_uid,$grname,$primary_gid; } - $home_dir = $special_home || &homedir($new_name, $ingroup_name); - $shell = $special_shell || $config{"dshell"}; + $home_dir = $special_home || $uid_pool{$new_name}{'home'} || &homedir($new_name, $ingroup_name); + if( !$disabled_login ) { + $shell = $special_shell || $uid_pool{$new_name}{'shell'} || $config{"dshell"}; + } else { + $shell = $special_shell || $uid_pool{$new_name}{'shell'} || "/usr/sbin/nologin"; + } $undouser = $new_name; my $useradd = &which('useradd'); &systemcall($useradd, '-d', $home_dir, '-g', $primary_gid, '-s', $shell, '-u', $new_uid, $new_name); - &invalidate_nscd(); create_homedir (1); # copy skeleton data @@ -702,15 +746,12 @@ if ($action eq "adduser") { last; ## passwd ok } } - } else { - if(!$disabled_login) { - my $usermod = &which('usermod'); - &systemcall($usermod, '-p', '*', $new_name); - } } - if (defined($new_gecos)) { - &ch_gecos($new_gecos); + if (defined($new_comment)) { + &ch_comment($new_comment); + } elsif ($uid_pool{$new_name}{'comment'}) { + &ch_comment($uid_pool{$new_name}{'comment'}); } else { my $noexpr = langinfo(NOEXPR()); my $yesexpr = langinfo(YESEXPR()); @@ -752,12 +793,10 @@ if ($action eq "adduser") { printf gtx("Adding user `%s' to group `%s' ...\n"),$new_name,$newgrp if $verbose; - &invalidate_nscd(); my $gpasswd = &which('gpasswd'); &systemcall($gpasswd, '-M', join(',', get_group_members($newgrp), $new_name), $newgrp); - &invalidate_nscd(); } } @@ -800,12 +839,15 @@ sub homedir { sub create_homedir { my ($copy_skeleton) = @_; - if ($no_create_home) { + if ($home_dir =~ /^\/+nonexistent(\/|$)/) { + printf gtx("Not creating `%s'.\n"), $home_dir if $verbose; + } + elsif ($no_create_home) { printf gtx("Not creating home directory `%s'.\n"), $home_dir if $verbose; } elsif (-e $home_dir) { - warnf gtx("The home directory `%s' already exists. Not copying from `%s'.\n"), - $home_dir,$config{skel} if $verbose && !$no_create_home; + warnf gtx("The home directory `%s' already exists. Not touching this directory.\n"), + $home_dir if $verbose && !$no_create_home; my @homedir_stat = stat($home_dir); my $home_uid = $homedir_stat[4]; my $home_gid = $homedir_stat[5]; @@ -878,6 +920,7 @@ sub existing_user_ok { return 1; } # TODO: do we really need this code? Range check shouldn't performed here + # also, we might be checking a normal user as well here if( $uid >= $config{"first_system_uid"} && $uid <= $config{"last_system_uid" } ) { return 2; @@ -902,6 +945,7 @@ sub existing_group_ok { if (($dummy1,$dummy2,$gid) = getgrnam($new_name)) { # TODO: is this check required? There shouldn't be any gid outside of our allowed range anyways ... + # also, we might be checking a normal user as well here if( $gid >= $config{"first_system_gid"} && $gid <= $config{"last_system_gid" } ) { return 3; @@ -1021,12 +1065,14 @@ sub checkname { my $name_regex = $config{lc $name_regex_var}; if ($name =~ /^[\d]+$/) { + # this check cannot be turned off warnf gtx("To avoid ambiguity with numerical UIDs, usernames which consist of only digits are not allowed.\n"); exit RET_INVALID_CHARS_IN_NAME; } if (length $name > 32) { + # this check cannot be turned off warnf gtx("Usernames must be no more than 32 bytes in length; note that if you are using Unicode characters, the character limit will be less than 32.\n"); @@ -1034,6 +1080,7 @@ sub checkname { } if ($name !~ $min_regex) { + # this check cannot be turned off warnf gtx("To avoid problems, the username must not start with a dash, plus sign, or tilde, and it must not contain any of the following: colon, comma, slash, or any whitespace characters @@ -1043,7 +1090,7 @@ sub checkname { return if ($name =~ qr/$name_regex/); - if ($name !~ $ieee_regex && $allow_badname < 2) { + if ($name !~ $ieee_regex && $name_check_level < 2) { warnf (gtx("To avoid problems, the username should consist only of letters, digits, underscores, periods, at signs and dashes, and not start with a dash (as defined by IEEE Std 1003.1-2001). For @@ -1053,13 +1100,13 @@ sub checkname { exit RET_INVALID_CHARS_IN_NAME; } - if ($allow_badname) { + if ($name_check_level) { print (gtx("Allowing use of questionable username.\n")) if ($verbose); } else { warnf (gtx("Please enter a username matching the regular expression configured via the %s configuration variable. Use the - `--allow-badname' option to relax this check or reconfigure - %s in /etc/adduser.conf.\n"), $name_regex_var, $name_regex_var); + `--allow-bad-names' option to relax this check or reconfigure + %s in configuration.\n"), $name_regex_var, $name_regex_var); exit RET_INVALID_CHARS_IN_NAME; } } @@ -1067,11 +1114,16 @@ sub checkname { # first_avail_uid: return the first available uid in given range # parameters: # min, max: the range +# pool_id: user id suggested from pool # return values: # -1 if no free uid is available # otherwise the choosen uid sub first_avail_uid { - my ($min, $max) = @_; + my ($min, $max, $pool_id) = @_; + if (defined ($pool_id)) { + return $pool_id if (!defined(getpwuid($pool_id))); + return -1; + } printf (gtx("Selecting UID from range %d to %d ...\n"),$min,$max) if ($verbose > 1); my $t = $min; @@ -1085,11 +1137,16 @@ sub first_avail_uid { # first_avail_gid: return the first available gid in given range # parameters: # min, max: the range +# pool_id: group id suggested from pool # return values: # -1 if no free gid is available # otherwise the choosen gid sub first_avail_gid { - my ($min, $max) = @_; + my ($min, $max, $pool_id) = @_; + if (defined ($pool_id)) { + return $pool_id if (!defined(getgrgid($pool_id))); + return -1; + } printf (gtx("Selecting GID from range %d to %d ...\n"),$min,$max) if ($verbose > 1); my $t = $min; @@ -1104,11 +1161,16 @@ sub first_avail_gid { # that is both available as uid and gid # parameters: # min, max: the range +# pool_id: user id suggested from pool # return values: # -1 if no free id is available # otherwise the choosen id sub first_avail_uid_gid { - my ($min, $max) = @_; + my ($min, $max, $pool_id) = @_; + if (defined ($pool_id)) { + return $pool_id if (!defined(getgrgid($pool_id))); + return -1; + } printf (gtx("Selecting UID/GID from range %d to %d ...\n"),$min,$max) if ($verbose > 1); my $t = $min; @@ -1119,22 +1181,22 @@ sub first_avail_uid_gid { return -1; # nothing available } -sub ch_gecos { +sub ch_comment { my $chfn = &which('chfn'); - my $gecos = shift; - if($gecos =~ /,/) { - my($gecos_name,$gecos_room,$gecos_work,$gecos_home,$gecos_other) - = split(/,/,$gecos); + my $comment = shift; + if($comment =~ /,/) { + my($comment_name,$comment_room,$comment_work,$comment_home,$comment_other) + = split(/,/,$comment); - &systemcall($chfn, '-f', $gecos_name, '-r', $gecos_room, $new_name); - &systemcall($chfn,'-w',$gecos_work,$new_name) - if(defined($gecos_work)); - &systemcall($chfn,'-h',$gecos_home,$new_name) - if(defined($gecos_home)); - &systemcall($chfn,'-o',$gecos_other,$new_name) - if(defined($gecos_other)); + &systemcall($chfn, '-f', $comment_name, '-r', $comment_room, $new_name); + &systemcall($chfn,'-w',$comment_work,$new_name) + if(defined($comment_work)); + &systemcall($chfn,'-h',$comment_home,$new_name) + if(defined($comment_home)); + &systemcall($chfn,'-o',$comment_other,$new_name) + if(defined($comment_other)); } else { - &systemcall($chfn, '-f', $gecos, $new_name); + &systemcall($chfn, '-f', $comment, $new_name); } } @@ -1163,7 +1225,6 @@ sub cleanup { printf (gtx("Removing group `%s' ...\n"),$undogroup); &systemcall('groupdel', $undogroup); } - # do we need to invalidate the nscd cache here, too? exit RET_ADDUSER_ABORTED; } @@ -1179,9 +1240,8 @@ sub version { printf (gtx("adduser version %s\n\n"), $version); print gtx("Adds a user or group to the system. -Copyright (C) 1997, 1998, 1999 Guy Maor -Copyright (C) 1995 Ian Murdock , - Ted Hajek +For detailed copyright information, please refer to +/usr/share/doc/adduser/copyright. \n"); print gtx( "This program is free software; you can redistribute it and/or modify @@ -1198,34 +1258,41 @@ General Public License, /usr/share/commo sub usage { printf gtx( -"adduser [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID] -[--firstuid ID] [--lastuid ID] [--gecos GECOS] [--ingroup GROUP | --gid ID] -[--disabled-password] [--disabled-login] [--add-extra-groups] USER - Add a normal user - -adduser --system [--home DIR] [--shell SHELL] [--no-create-home] [--uid ID] -[--gecos GECOS] [--group | --ingroup GROUP | --gid ID] [--disabled-password] -[--disabled-login] [--add-extra-groups] USER +"adduser [--uid id] [--firstuid id] [--lastuid id] + [--gid id] [--firstgid id] [--lastgid id] [--ingroup group] + [--add-extra-groups] [--shell shell] + [--comment comment] [--home dir] [--no-create-home] + [--allow-all-names] [--allow-bad-names] + [--disabled-password] [--disabled-login] + [--conf file] [--quiet] [--verbose] [--debug] + user + Add a normal user + +adduser --system + [--uid id] [--group] [--ingroup group] [--gid id] + [--shell shell] [--comment comment] [--home dir] [--no-create-home] + [--conf file] [--quiet] [--verbose] [--debug] + user Add a system user -adduser --group GROUP -addgroup [--gid=GID] GROUP +adduser --group + [--gid ID] [--firstgid id] [--lastgid id] + [--conf file] [--quiet] [--verbose] [--debug] + group +addgroup + [--gid ID] [--firstgid id] [--lastgid id] + [--conf file] [--quiet] [--verbose] [--debug] + group Add a user group -addgroup --system [--gid=GID] GROUP +addgroup --system + [--gid id] + [--conf file] [--quiet] [--verbose] [--debug] + group Add a system group adduser USER GROUP - Add an existing user to an existing group - -general options: - --allow-badname allow usernames which do not match the - NAME_REGEX configuration variable - -q, --quiet don't give process information to stdout - -d, --debug be more verbose during execution - -h, --help usage message - -v, --version version number and copyright - -c FILE, --conf=FILE use FILE as configuration file\n\n"); + Add an existing user to an existing group\n"); } sub usage_error { @@ -1262,4 +1329,3 @@ sub get_dir_mode # End: # vim: tabstop=4 shiftwidth=4 expandtab - diff -pruN 3.129/adduser.conf 3.134/adduser.conf --- 3.129/adduser.conf 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/adduser.conf 2023-05-25 15:54:35.000000000 +0000 @@ -5,37 +5,22 @@ # code. If you need to change those settings, remove the comment and # make your intended change. -# The DSHELL variable specifies the default login shell on your -# system. +# The login shell to be used for all new users. # Default: DSHELL=/bin/bash #DSHELL=/bin/bash -# The DHOME variable specifies the directory containing users' home -# directories. +# The directory in which new home directories should be created. # Default: DHOME=/home -#DHOME=/home +# DHOME=/home -# If GROUPHOMES is "yes", then the home directories will be created as -# /home/groupname/user. -# Default: GROUPHOMES=no -#GROUPHOMES=no - -# If LETTERHOMES is "yes", then the created home directories will have -# an extra directory - the first letter of the user name. For example: -# /home/u/user. -# Default: LETTERHOMES=no -#LETTERHOMES=no - -# The SKEL variable specifies the directory containing "skeletal" user -# files; in other words, files such as a sample .profile that will be -# copied to the new user's home directory when it is created. +# The directory from which skeletal user configuration files +# will be copied. # Default: SKEL=/etc/skel #SKEL=/etc/skel -# FIRST_SYSTEM_[GU]ID to LAST_SYSTEM_[GU]ID inclusive is the range for UIDs -# for dynamically allocated administrative and system accounts/groups. -# Please note that system software, such as the users allocated by the -# base-passwd package, may assume that UIDs less than 100 are unallocated. +# Specify inclusive ranges of UIDs and GIDs from which UIDs and GIDs +# for system users, system groups, non-system users and non-system groups +# can be dynamically allocated. # Default: FIRST_SYSTEM_UID=100, LAST_SYSTEM_UID=999 #FIRST_SYSTEM_UID=100 #LAST_SYSTEM_UID=999 @@ -44,8 +29,6 @@ #FIRST_SYSTEM_GID=100 #LAST_SYSTEM_GID=999 -# FIRST_[GU]ID to LAST_[GU]ID inclusive is the range of UIDs of dynamically -# allocated user accounts/groups. # Default: FIRST_UID=1000, LAST_UID=59999 #FIRST_UID=1000 #LAST_UID=59999 @@ -54,66 +37,61 @@ #FIRST_GID=1000 #LAST_GID=59999 -# The USERGROUPS variable can be either "yes" or "no". If "yes" each -# created user will be given their own group to use as a default. If -# "no", each created user get the primary group defined below as -# USERS_GROUP or USERS_GID. +# Specify a file or a directory containing UID and GID pool. +#UID_POOL=/etc/adduser-pool.conf +#UID_POOL=/etc/adduser-pool.d/ +#GID_POOL=/etc/adduser-pool.conf +#GID_POOL=/etc/adduser-pool.d/ + +# Specify whether each created non-system user will be +# given their own group to use. # Default: USERGROUPS=yes #USERGROUPS=yes -# Newly created users get this group as primary group if USERGROUPS -# "no", and as a supplemental group if USERGROUPS is "yes". -# Set one of the variables to reference the group. Don't set both. -# Default: USERS_GID=undefined, USERS_GROUP=undefined +# Defines the groupname or GID of the group all newly-created +# non-system users are placed into. +# It is a configuration error to define both variables +# even if the values are consistent. +# Default: USERS_GID=undefined, USERS_GROUP=users #USERS_GID=100 #USERS_GROUP=users -# If DIR_MODE is set, directories will be created with the specified -# mode. Otherwise the default mode 0700 will be used. +# The permissions mode for home directories of non-system users. # Default: DIR_MODE=0700 #DIR_MODE=0700 -# When creating system accounts: if SYS_DIR_MODE is set (and a home -# location is specified), the directories will be created with the -# specified mode. Otherwise the default mode 0755 will be used. +# The permissions mode for home directories of system users. # Default: SYS_DIR_MODE=0755 #SYS_DIR_MODE=0755 -# If SETGID_HOME is "yes" home directories for users with their own -# group the setgid bit will be set. This was the default for -# versions << 3.13 of adduser. Because it has some bad side effects we -# no longer do this per default. If you want it nevertheless you can -# still set it here. Note: this feature is DEPRECATED and will be -# removed in a future version of adduser; please use the DIR_MODE -# settings above instead. -# Default: SETGID_HOME=no -#SETGID_HOME=no - -# If QUOTAUSER is set, a default quota will be set from that user with -# `edquota -p QUOTAUSER newuser' +# If set to a nonempty value, new users will have quotas copied +# from that user with `edquota -p QUOTAUSER newuser' # Default: QUOTAUSER="" #QUOTAUSER="" -# If SKEL_IGNORE_REGEX is set, adduser will ignore files matching this -# regular expression when creating a new home directory -# Default: SKEL_IGNORE_REGEX="(dpkg|ucf)-(old|new|dist|save)" -#SKEL_IGNORE_REGEX="(dpkg|ucf)-(old|new|dist|save)" - -# Set this if you want the --add-extra-groups option to adduser to add -# new users to other groups. -# This is the list of groups that new non-system users will be added to +# Non-system user- and groupnames are checked against this regular +# expression. +# Default: NAME_REGEX="^[a-z][-a-z0-9_]*\$?$" +#NAME_REGEX="^[a-z][-a-z0-9_]*\$?$" + +# System user- and groupnames are checked against this regular +# expression. +# Default: SYS_NAME_REGEX="^[a-z_][-a-z0-9_]*\$?$" +#SYS_NAME_REGEX="^[a-z_][-a-z0-9_]*\$?$" + +# When populating the newly created home directory of a non-system user, +# files in SKEL matching this regex are not copied. +# Default: SKEL_IGNORE_REGEX="\.(dpkg|ucf)-(old|new|dist|save)$" +#SKEL_IGNORE_REGEX="\.(dpkg|ucf)-(old|new|dist|save)$" + +# list of groups that new non-system users will be added to +# if ADD_EXTRA_GROUPS is non-zero or set on the command line. # Default: EXTRA_GROUPS="users" #EXTRA_GROUPS="users" -# If ADD_EXTRA_GROUPS is set to something non-zero, the EXTRA_GROUPS -# option above will be default behavior for adding new, non-system users +# Setting this to something other than 0 will cause adduser to add +# newly created non-system users to the list of groups defined by +# EXTRA_GROUPS. # Default: ADD_EXTRA_GROUPS=0 #ADD_EXTRA_GROUPS=0 -# check user and group names also against this regular expression. -# Default: NAME_REGEX="^[a-z][-a-z0-9_]*\$?$" -#NAME_REGEX="^[a-z][-a-z0-9_]*\$?$" - -# check system user and group names also against this regular expression. -# Default: SYS_NAME_REGEX="^[a-z_][-a-z0-9_]*\$?$" -#SYS_NAME_REGEX="^[a-z_][-a-z0-9_]*\$?$" diff -pruN 3.129/debian/NEWS 3.134/debian/NEWS --- 3.129/debian/NEWS 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/NEWS 2023-05-25 15:54:35.000000000 +0000 @@ -1,3 +1,55 @@ +adduser (3.130) unstable; urgency=low + + deluser's --no-preserve-root option is deprecated, and it will be + removed after Debian bookworm. deluser will in the future completely + refuse to delete the root user. If you want to delete root, you need + to use other tools. + + We are planning to deprecate and remove the GROUPHOMES and LETTERHOMES + configuration options. They help big installations, but nowadays those + installations are probably using a directory service like LDAP and Active + Directory to manage their users and do not use adduser anyway. If you're + using one of these options and want them to stay, please write that to + #1025623 and let us know. Some kind of help and committment, for example + verified autopkgtest scripts, would be appreciated and make it easier for + us to keep the feature around. + + We are planning to deprecate and remove the QUOTAUSER configuration + option. If you're using this, please write that to #1026898 and let us + know. Some kind of help and committment, for example verified autopkg + testscripts, would be appreciated and make it easier for us to keep + the feature around. + + There have been some changes to --disabled-password and --disabled-login, + documented in adduser(8). Maintainers using these options with adduser + --system in their maintainer scripts should review their scripts and + check whether the default is enough and the options can be removed. + + The --gecos option is being renamed to --comment to get aligned with + passwd's terminology. --gecos will continue to work throughout the + bookworm cycle. + + The NEWS entry for 3.124, shown below, was added to give more explanation + about the addition of the users group as a supplementary group to a newly + created user. This change was inconsistently documented in adduser(8), + this inconsistency was fixed in adduser 3.130. + + -- Marc Haber Sun, 25 Dec 2022 17:11:31 +0100 + +adduser (3.124) unstable; urgency=medium + + As pointed out in #678615, adduser has behaved somewhat inconsistently + in the past, using the users group (GID 100) only if USERGROUPS was set + to the non-default 'no'. This has been changed as documented in + adduser.conf(5): If USERGROUPS is yes, the newly created user will now + be added as a supplementary group; if USERGROUPS is no, users will be the + primary group. If you want to restore the old behavior, set USERGROUPS=yes, + leave USERS_GROUP empty and set USERS_GID to "-1". + + (this NEWS entry has been added retroactively with adduser 3.130) + + -- Marc Haber Thu, 01 Dec 2022 00:00:00 +0100 + adduser (3.123) unstable; urgency=medium The default for DIR_MODE has been set to 0700 for this release, again, @@ -12,7 +64,7 @@ adduser (3.123) unstable; urgency=medium System Administrators wanting a different default can set DIR_MODE in /etc/adduser.conf to their desired value after installation. - The one user created during system installation needs to have the + The one user created during system installation needs to have the home directory mode bits adjusted to the preferred value after installation of the system since there is no possibility to have this directly set in the Installer. @@ -23,7 +75,7 @@ adduser (3.123) unstable; urgency=medium adduser (3.122) unstable; urgency=low - This version implements SYS_DIR_MODE for home directories belonging + This version implements SYS_DIR_MODE for home directories belonging to system users. Before that, the home directory of a system user was also influenced by the setting of DIR_MODE. This is no longer the case. @@ -39,7 +91,7 @@ adduser (3.122) unstable; urgency=low System user home defaults to /nonexistent if --home is not specified. Packages that call adduser to create system accounts should explicitly - specify a location for /home (see Lintian check + specify a location for /home (see Lintian check maintainer-script-lacks-home-in-adduser). -- Marc Haber Wed, 13 Jul 2022 20:30:00 +0200 diff -pruN 3.129/debian/README 3.134/debian/README --- 3.129/debian/README 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/README 2023-05-25 15:54:35.000000000 +0000 @@ -10,7 +10,7 @@ accounts in the way Debian expects them to adapt to the probably changing specifications of Debian policy. adduser --system is designed such that it can be called without the -caller needing to check that relevant pre-conditions have been met. +caller needing to check that relevant preconditions have been met. adduser --system take special attention on just needing a single call in the package maintainer scripts without any conditional wrappers, error @@ -29,6 +29,9 @@ maintainers took to bring adduser to whe operational reference, you might want to look at the manual pages that come with the package (see apropos adduser, apropos deluser). +Information that is in the manual pages is probably not going to be +repeated in this README file. + Usage in maintainer scripts --------------------------- @@ -48,22 +51,22 @@ bug if your package needs an if or other calls. See adduser(8) for more documentation about how adduser --system behaves -regarding uid, group membership, shell, and home directory. Consider -whether it should be possible to run processes or even log in as your -user and configure it appropriately. +regarding setting a password, UID, group membership, shell, and home +directory. Consider whether it should be possible to run processes or +even log in as your user and configure it appropriately. We are currently (summer 2022) re-working adduser's logging subsystem with the ultimate goal of adduser becoming silent in the process of -creating a system user unless the loglevel is raised by configuration or -an error happens. +creating a system user unless the log level is raised by configuration +or an error happens. -It might be adviseable to not delete your users on purge of your package +It might be advisable to not delete your users on purge of your package since there might still be files belonging to the user. Instead, lock your user, making it impossible to log in as the user, and unlock it in postinst when your package gets reinstalled. Sadly, currently (summer 2022, adduser 3.125) locking and unlocking -accounts it not well supported yet. We are planning to improve this in +accounts is not well supported yet. We are planning to improve this in time for the release of Debian bookworm. @@ -90,7 +93,7 @@ home directories or not). With adduser growing, this has shown to pose issues since we did not find an explanation to only give these limited choices in debconf. To be consistent, we would have to add many more questions. This does not -seem to be a realistic endeavour given the available personpower. +seem to be a realistic endeavor given the available personpower. Consequently, debconf support was removed complete, making /etc/adduser.conf a regular dpkg-conffile. @@ -109,7 +112,7 @@ maintainer scripts to a more declarative adduser is used in many hundred packages. It is fine to use a more declarative approach to define system users in -Debian pacakges. There is nothing that forces package maintainers to use +Debian packages. There is nothing that forces package maintainers to use adduser to create their package-related users. The packages dh-sysuser, opensysusers, and systemd-sysusers already offer a declarative approach to create package-related users. @@ -130,7 +133,7 @@ support to write to directory services. organization that uses a directory service is unlikely to have enough privileges to write to a directory service anyway. -It might be possible, to add the Desired support via an adduser.local +It might be possible, to add the desired support via an adduser.local hook. If you need more hooks to locally implement what you need, let us know and we will see what we can do for you. A more flexible hook system might be implemented in the nearer future. @@ -145,21 +148,21 @@ Default for DIR_MODE -------------------- DIR_MODE and SYS_DIR_MODE specify the file mode bits for a home directory created by adduser. This has been a controversial setting -throughout most of adduser's life since the 1990ies. +throughout most of adduser's life since the 1990s. Currently, DIR_MODE defaults to 0700, while SYS_DIR_MODE defaults to 0755. The separation between DIR_MODE and SYS_DIR_MODE happened in adduser 3.122 because we got convinced that a normal user needs a different setting than a system user. This allowed us to tighten the file mode bits of a regular user's home directory to 0700 while keeping -the mode permissive setting for system users. +the more permissive setting for system users. Historically, the separation was also implemented to finally solve -#643559, which requested setting the sgid bit for the home directory of +#643559, which requested setting the setgid bit for the home directory of a non-system user by default, in order to ease setting access permissions of shared workspaces in multi-user systems. This default -has oscillated back in forth in adduser multiple times since the -1990ies, because both ways to set this bit by default have advantages +has oscillated back and forth in adduser multiple times since the +1990s, because both ways to set this bit by default have advantages and disadvantages. After a preliminary request for comment (see https://lists.debian.org/debian-devel/2022/03/msg00098.html), the default value for DIR_MODE was changed to 2700 in adduser 3.122 (July @@ -169,8 +172,8 @@ were not fully aware of were adversely i Promptly, #1014901 was filed, requesting that DIR_MODE be changed to 0700, effectively causing home directories of non-system users to be -created without the sgid bit. The biggest point in the reasoning is that -having the sgid bit set will need special measures to keep the home +created without the setgid bit. The biggest point in the reasoning is that +having the setgid bit set will need special measures to keep the home directory's group ownership from propagating to file system images, chroots, and archives, causing wrong file ownership/permissions in those entities, which in turn might propagate to different systems and cause @@ -191,21 +194,21 @@ that is installed by an end-user, who ma this setting at all, but who still might use Internet HOW-TOs to build chroots, images or archives, inadvertently causing security issues on third-party systems. The clear and unsurprising solution is to leave the -sgid bit for newly created users off by default. This is also important +setgid bit for newly created users off by default. This is also important to keep the support effort for other packages down. Users surprised by the behavior might file bugs against other packages, increasing the effort necessary to support those other packages. So, in adduser 3.123, DIR_MODE reached its final default setting of -0700, flipping the default for the sgid bit one last time to the value +0700, flipping the default for the setgid bit one last time to the value we had for the majority of Debian's existence period. With this change, Debian is re-joining ranks again with ALL other major Linux -distributions, none of which setting the sgid bit on home directories to +distributions, none of which setting the setgid bit on home directories to 1 (research done in July 2022). This primarily affects the one user that can be created in the Installer before there is any possibility to configure adduser. Those users will -now again have the sgid bit of the home directory set to 0. Again, +now again have the setgid bit of the home directory set to 0. Again, system administrators have the tools and documentation to configure their systems as their individual requirements dictate (using the DIR_MODE setting in adduser.conf, and/or fixing those initial @@ -221,7 +224,7 @@ discussion period. Rewrite ------- -adduser needs a rewrite. The code base was started in the 1990ies and +adduser needs a rewrite. The code base was started in the 1990s and this fact can easily be seen. The introduction of our test suite has made changes to adduser much easier, but the code is still 25 years old. @@ -253,7 +256,7 @@ when just the test commit is cherry pick Working with branches and merge requests means rebasing a lot. To make this easier, please don't squash your work into one huge commit. -Use small, independent commits that can easily be understood. It is ok +Use small, independent commits that can easily be understood. It is OK to rebase or force-push to your development branch even after opening the merge request. We love merges that can be pulled into master as a fast-forward merge. @@ -268,4 +271,3 @@ Credits ------- This document was compiled by the adduser maintainers. Ximon Eighteen helped to polish the language of the first revisions in August 2022. - diff -pruN 3.129/debian/TODO 3.134/debian/TODO --- 3.129/debian/TODO 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/TODO 2023-05-25 15:54:35.000000000 +0000 @@ -3,7 +3,7 @@ TODO for adduser For adduser 3.x there is to do: - * make adduser also work with super (fix #) + * make adduser also work with super and in taint mode (fix #214546) * Use --msgid-bugs-address when using po4a in debian/rules * Address lintian's "untranslatable debconf template" This is triggered by adduser/title, which is not intended for translation. @@ -22,3 +22,16 @@ For adduser 3.x there is to do: * The --force-badname command line is deprecated as of bookworm+1. Run-time warnings shold be added to notify users of the change; the feature is slated for removal in bookworm+2. + + * get rid of --no-preserve-root, refuse removing the root account in any case + + * define meaningful return values, document them + + * remove interactive stuff ("enter group name to remove") + + * discuss users_group default + + * streamline .conf options (/yes, 1, no, 0, true, false) + + * see whether users is default in too many places + diff -pruN 3.129/debian/changelog 3.134/debian/changelog --- 3.129/debian/changelog 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/changelog 2023-05-25 15:54:35.000000000 +0000 @@ -1,3 +1,118 @@ +adduser (3.134) unstable; urgency=medium + + * Revert "mark adduser as Protected:yes" + + -- Marc Haber Thu, 25 May 2023 17:54:35 +0200 + +adduser (3.133) unstable; urgency=medium + + [ Johannes Schauer Marin Rodrigues ] + * mark adduser as Protected:yes. This is a temporary fix for #1035694 + + -- Marc Haber Tue, 16 May 2023 23:27:12 +0200 + +adduser (3.132) unstable; urgency=medium + + * This is a translation/documentation only release + + [ Marc Haber ] + * Update on Portuguese translation of man page. + Thanks to Américo Monteiro (Closes: #1028103) + + [ Helge Kreutzmann ] + * Fix various trivial issues in man pages. + This partly addresses #1031081 + Thanks to Helge Kreutzmann + * Update German translation of man page. + Thanks to Helge Kreutzmann (Closes: #1031079) + + -- Marc Haber Wed, 08 Mar 2023 21:45:42 +0100 + +adduser (3.131) unstable; urgency=medium + + [ Marc Haber ] + * Fix a bug: system user names are now allowed to begin with an + underscore. Thanks to Guillem Jover for spotting this. + * Updated Portuguese translation of program messages. + Thanks to Américo Monteiro (Closes: #1028147) + * Update on Portuguese translation of man page. + Thanks to Américo Monteiro (Closes: #1028103) + * New Dutch translation of man page. + Thanks to Frans Spiesschaert (Closes: #1028337) + * Update french program translation. + Thanks to Jean-Paul Guillonneau (Closes: #1029486) + + [ Helge Kreutzmann ] + * Update german program translation. + Thanks to Helge Kreutzmann (Closes: #1029572) + * Update Dutch program translation. + Thanks to Frans Spiesschaert (Closes: #1028336) + * Update French translation of man page. + Thanks to Jean-Paul Guillonneau (Closes: #1029124) + + -- Marc Haber Tue, 07 Feb 2023 12:08:36 +0100 + +adduser (3.130) unstable; urgency=low + + [ Marc Haber ] + + * debian/NEWS: inform about planned deprecations + * Fully implement and test (first|last)(uid|gid). + (Closes: #579107, #344824) + * Implement usage of UID-Pool. + Thanks to Hilko Bengen and Christoph Biedl (Closes: #243929) + * More clearly document supplementary group behavior with USERGROUPS=yes. + This fixes an inconsistency between code, adduser.8 and + adduser.conf.5. adduser.conf.5. code and tests implement consensus + reached in summer 2022 in #678615. (Closes: #1025384) + * Re-work --disabled-(login|password) as discussed on -devel. + Thanks to Matthew Woodcraft and Sam Morris (Closes: #625758) + * Add quota to Suggests. Addresses part of #541728. + Thanks to Christoph Anton Mitterer + * Change --allow-badname to --allow-bad-names. + --allow-badname and --force-badname are deprecated but still supported. + * Deprecate --no-preserve-root. + * Deprecate --gecos, new option --comment + * Remove invalidate_nscd calls. (Closes: #1016913) + * Specialcase /nonexistent so that it never gets created + * Multiple --conf options are now allowed + * Sync options in manual pages, help, configuration file and code + * Be clearer in 'directory already exists' message. Addresses part of #541728. + Thanks to Christoph Anton Mitterer + * Manpage re-work + * Re-word, re-structure, many clarifications, remove ambiguities + * Sort options + * Give general options explanation + * Remove wrong information about sgid bits from adduser.8 + * Fix typos and formatting errors in adduser.8. + Thanks to Jean-Paul Guillonneau + * Add test that fails if dangling manpage symlinks are there + * Semantic linebreaks, lint clean, formatting changes to deluser.conf.5 + * Have po4a accept manpages that are > 95 % translated + * README: + * Actually install the file. + Thanks to Olaf van der Spek (Closes: #1020615) + * Fix typos. Thanks to Olaf van der Spek + * Mention no duplication policy from man pages. + * Move po4a to Build-Depends. + Thanks to Adam Borowski (Closes: #1021217) + * Standards-Version: 4.6.2 (no changes necessary) + + [ Jason Franklin ] + * Use "#! /bin/sh" in the maintainer scripts. (Closes: #1023836) + * Remove symbolic links for man pages that do not exist. (Closes: #1016014) + + [ Akbarkhon Variskhanov ] + * adduser.8: Fix formatting issues + + [ Niels Thykier ] + * Make adduser build without (fake)root + + [ Benjamin Drung ] + * adduser: Remove trailing newline. + + -- Marc Haber Sun, 25 Dec 2022 17:11:31 +0100 + adduser (3.129) unstable; urgency=medium * improve parameter interpretation for adduser. @@ -10,7 +125,7 @@ adduser (3.128) unstable; urgency=medium [ Marc Haber ] * increase timeouts, reduce number of tests for delgroup_perf.t they have timed out in Debian infrastructure - * even the legacy testsuite needs cron + * even the legacy test suite needs cron * Write defaults explicitly in configuration file templates. Thanks to Christoph Anton Mitterer (Closes: #1017888) * skip most of the version checks in preinst @@ -27,7 +142,7 @@ adduser (3.128) unstable; urgency=medium adduser (3.127) unstable; urgency=low [ Jason Franklin ] - * Document the intent of the --no-create-home option (Closes: #152195) + * Document the intent of the "--no-create-home" option. (Closes: #152195) [ Marc Haber ] * create home directory with primary group of the user (Closes: #1017694) diff -pruN 3.129/debian/control 3.134/debian/control --- 3.129/debian/control 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/control 2023-05-25 15:54:35.000000000 +0000 @@ -3,10 +3,10 @@ Section: admin Priority: important Maintainer: Debian Adduser Developers Uploaders: Marc Haber -Standards-Version: 4.6.1 -Build-Depends: debhelper-compat (= 13) -Build-Depends-Indep: gettext, po4a -Rules-Requires-Root: binary-targets +Standards-Version: 4.6.2 +Build-Depends: debhelper-compat (= 13), po4a +Build-Depends-Indep: gettext +Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/debian/adduser Vcs-Git: https://salsa.debian.org/debian/adduser.git @@ -15,7 +15,7 @@ Architecture: all Multi-Arch: foreign Pre-Depends: ${misc:Pre-Depends} Depends: passwd, ${misc:Depends} -Suggests: liblocale-gettext-perl, perl, cron +Suggests: liblocale-gettext-perl, perl, cron, quota Description: add and remove users and groups This package includes the 'adduser' and 'deluser' commands for creating and removing users. diff -pruN 3.129/debian/copyright 3.134/debian/copyright --- 3.129/debian/copyright 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/copyright 2023-05-25 15:54:35.000000000 +0000 @@ -68,56 +68,58 @@ Copyright: 2000 Roland Bauerschmidt - 1995 Ted Hajek - 2021-2022 Jason Franklin +Copyright: 1995 Ted Hajek + 2000-2003 Roland Bauerschmidt + 2004-2022 Marc Haber + 2006-2008 Stephen Gran + 2007 Jörg Hoh 2016 Afif Elghraoui 2016 Helge Kreutzmann - 2007 Jörg Hoh - 2006-2008 Stephen Gran - 2004-2006 Marc Haber - 2021-2022 Jason Franklin + 2021 Jason Franklin 2022 Matt Barry License: GPL-2+ Files: doc/deluser.conf.5 -Copyright: 2000-2003 Roland Bauerschmidt - 1995 Ted Hajek - 2021-2022 Jason Franklin - 2016 Helge Kreutzmann - 2006-2007 Jörg Hoh - 2006-2011 Stephen Gran +Copyright: 1995 Ted Hajek + 2000-2003 Roland Bauerschmidt 2004-2022 Marc Haber - 2021-2022 Jason Franklin + 2006-2007 Jörg Hoh + 2011 Stephen Gran + 2016 Helge Kreutzmann + 2021 Jason Franklin 2022 Matt Barry License: GPL-2+ Files: doc/deluser.8 -Copyright: 2000-2003 Roland Bauerschmidt +Copyright: 1994 Ian A. Murdock 1995 Ted Hajek - 1994 Ian A. Murdock - 2021-2022 Jason Franklin - 2016 Helge Kreutzmann - 2011 Justin B Rye - 2004-2009 Jörg Hoh + 1997-1999 Guy Maor + 2000-2003 Roland Bauerschmidt 2004-2022 Marc Haber + 2006-2009 Jörg Hoh + 2011 Justin B Rye + 2016 Helge Kreutzmann 2021-2022 Jason Franklin - 2022 Matt Barry License: GPL-2+ Files: doc/adduser.8 -Copyright: 2000-2003 Roland Bauerschmidt +Copyright: 1994 Ian A. Murdock 1995 Ted Hajek - 1994 Ian A. Murdock - 2021-2022 Jason Franklin + 1997-1999 Guy Maor + 2000-2003 Roland Bauerschmidt + 2004-2022 Marc Haber + 2005-2009 Jörg Hoh + 2006-2011 Stephen Gran + 2011 Justin B Rye 2016 Afif Elghraoui 2016 Helge Kreutzmann - 2011 Justin B Rye - 2006-2011 Stephen Gran - 2005-2009 Jörg Hoh - 2004-2022 Marc Haber 2021-2022 Jason Franklin 2022 Matt Barry + 2022 Akbarkhon Variskhanov +License: GPL-2+ + +Files: doc/adduser.local.8 +Copyright: 2022 Marc Haber License: GPL-2+ Files: po/adduser.pot doc/po4a/po/adduser.pot @@ -150,6 +152,7 @@ Files: po/de.po Copyright: 2000, 2006 Free Software Foundation, Inc. 2000 Roland Bauerschmidt 2006, 2010, 2017 Dr. Tobias Quathamer + 2023 Dr. Helge Kreutzmann License: GPL-2+ Files: po/es.po @@ -199,6 +202,8 @@ License: GPL-2+ Files: po/nl.po Copyright: 2001 Free Software Foundation, Inc. 2001 Guus Sliepen + 2016 Remco Rijnders + 2022 Frans Spiesschaert License: GPL-2+ Files: po/pl.po @@ -216,7 +221,7 @@ License: GPL-2+ Files: po/pt.po Copyright: 2007 the adduser's copyright holder 2007 Ricardo Silva - 2010-2016 Américo Monteiro + 2010-2023 Américo Monteiro License: GPL-2+ Files: po/ru.po @@ -276,7 +281,7 @@ Files: doc/po4a/po/fr.po Copyright: 2004 Software in the Public Interest 2008 Nicolas François 2010 David Prévot - 2016 Jean-Paul Guillonneau + 2016-2023 Jean-Paul Guillonneau License: GPL-2+ Files: doc/po4a/po/it.po @@ -295,7 +300,7 @@ License: GPL-2+ Files: doc/po4a/po/pt.po Copyright: 2010 Free Software Foundation, Inc. - 2010-2019 Américo Monteiro + 2010-2023 Américo Monteiro License: GPL-2+ Files: doc/po4a/po/ru.po diff -pruN 3.129/debian/docs 3.134/debian/docs --- 3.129/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/docs 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1 @@ +debian/README diff -pruN 3.129/debian/links 3.134/debian/links --- 3.129/debian/links 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/links 2023-05-25 15:54:35.000000000 +0000 @@ -1,22 +1,3 @@ -# Those links are necessary due to #1006939 +usr/share/man/man8/adduser.local.8.gz usr/share/man/man8/deluser.local.8.gz usr/share/man/man8/adduser.8.gz usr/share/man/man8/addgroup.8.gz usr/share/man/man8/deluser.8.gz usr/share/man/man8/delgroup.8.gz -# And this is #1006945 -usr/share/man/da/man8/adduser.8.gz usr/share/man/da/man8/addgroup.8.gz -usr/share/man/da/man8/deluser.8.gz usr/share/man/da/man8/delgroup.8.gz -usr/share/man/de/man8/adduser.8.gz usr/share/man/de/man8/addgroup.8.gz -usr/share/man/de/man8/deluser.8.gz usr/share/man/de/man8/delgroup.8.gz -#usr/share/man/es/man8/adduser.8.gz usr/share/man/es/man8/addgroup.8.gz -usr/share/man/es/man8/deluser.8.gz usr/share/man/es/man8/delgroup.8.gz -usr/share/man/fr/man8/adduser.8.gz usr/share/man/fr/man8/addgroup.8.gz -usr/share/man/fr/man8/deluser.8.gz usr/share/man/fr/man8/delgroup.8.gz -usr/share/man/it/man8/adduser.8.gz usr/share/man/it/man8/addgroup.8.gz -usr/share/man/it/man8/deluser.8.gz usr/share/man/it/man8/delgroup.8.gz -usr/share/man/pl/man8/adduser.8.gz usr/share/man/pl/man8/addgroup.8.gz -usr/share/man/pl/man8/deluser.8.gz usr/share/man/pl/man8/delgroup.8.gz -usr/share/man/pt/man8/adduser.8.gz usr/share/man/pt/man8/addgroup.8.gz -usr/share/man/pt/man8/deluser.8.gz usr/share/man/pt/man8/delgroup.8.gz -usr/share/man/ru/man8/adduser.8.gz usr/share/man/ru/man8/addgroup.8.gz -usr/share/man/ru/man8/deluser.8.gz usr/share/man/ru/man8/delgroup.8.gz -#usr/share/man/sv/man8/adduser.8.gz usr/share/man/sv/man8/addgroup.8.gz -usr/share/man/sv/man8/deluser.8.gz usr/share/man/sv/man8/delgroup.8.gz diff -pruN 3.129/debian/manpages 3.134/debian/manpages --- 3.129/debian/manpages 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/manpages 2023-05-25 15:54:35.000000000 +0000 @@ -1,4 +1,8 @@ doc/adduser.8 +doc/adduser.*.8 doc/deluser.8 +doc/deluser.*.8 doc/adduser.conf.5 +doc/adduser.conf.*.5 doc/deluser.conf.5 +doc/deluser.conf.*.5 diff -pruN 3.129/debian/manpages.disabled.po4a 3.134/debian/manpages.disabled.po4a --- 3.129/debian/manpages.disabled.po4a 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/manpages.disabled.po4a 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -doc/adduser.8 -doc/adduser.*.8 -doc/deluser.8 -doc/deluser.*.8 -doc/adduser.conf.5 -doc/adduser.conf.*.5 -doc/deluser.conf.5 -doc/deluser.conf.*.5 diff -pruN 3.129/debian/manpages.englishonly 3.134/debian/manpages.englishonly --- 3.129/debian/manpages.englishonly 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/manpages.englishonly 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,5 @@ +doc/adduser.8 +doc/deluser.8 +doc/adduser.local.8 +doc/adduser.conf.5 +doc/deluser.conf.5 diff -pruN 3.129/debian/postrm 3.134/debian/postrm --- 3.129/debian/postrm 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/postrm 2023-05-25 15:54:35.000000000 +0000 @@ -1,11 +1,14 @@ -#!/bin/bash +#! /bin/sh -set -e -case "$1" in +set -eu + +case $1 in purge) - rm -f /etc/adduser.conf /etc/adduser.conf.update-old /etc/adduser.conf.dpkg-save + rm -fv /etc/adduser.conf /etc/adduser.conf.dpkg-save /etc/adduser.conf.update-old ;; esac +set +eu + #DEBHELPER# diff -pruN 3.129/debian/preinst 3.134/debian/preinst --- 3.129/debian/preinst 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/preinst 2023-05-25 15:54:35.000000000 +0000 @@ -1,7 +1,7 @@ -#!/bin/bash +#! /bin/sh -set -e -set -u + +set -eu # this needs to be here until bookworm+2. # this is messy @@ -26,7 +26,7 @@ create_adduser_conf() { d8502b9daf3a3a486ca563a15f2bb03a25eb9247d201d15a4640088626c660a03416b62217f59c37aa94050317243b8979fd46d99e081f555eb7f8adf325a7f8 \ 42ead32621022ca6c5d63e95b19838442cdd118d64077574b80fdafd5e6946a6de4608cad89576f887bec85c3398248ccb8f2a9d5c94d0571cc36c009c0f1b33 \ 53ab619b03fb957e8b965b745257ae44d626851b4e23d407e25d21e20013cea2a32b090c9864695fab7eb0c3310b44ddba363e9e8370ab878e6a91aafb0e2839 \ - 5f213119a342d8923113fc93a0f2ac15e223d13574ccafe02731f31aeb8c04ab0d3ce5b7d9d3eef4c5382038935e0bece43b5fb2765e31b4c82af1f0bdcc711a \ + 5f213119a342d8923113fc93a0f2ac15e223d13574ccafe02731f31aeb8c04ab0d3ce5b7d9d3eef4c5382038935e0bece43b5fb2765e31b4c82af1f0bdcc711a \ ab6adcf4067d7d50ef45cc93ca3a8c54b7ab3e7748420434ad846e8d6e6c34d2ae10d576029d3e1e501f7a743951aed3876c8f3d0e03a918410fa3c9d82460e2 \ b26329cba15b817a79d19c542c49a3e34b7535ffbd60057df7aca2b7027a1ad8db0cdecfd5c00c40d60f50e8b7e2e1675d8401696cf8933a5530e31e430a6675 \ a91cdf6bf59602a7c7dbb745bca1b4d374035026dd89aa62eb9edea8ffcdff4a764a2274770de81687291d57cf9fbc0f0eb495451460c2b44229cebcecd9d870 \ @@ -38,12 +38,12 @@ create_adduser_conf() { AUCSHA="$(< /etc/adduser.conf grep -v '^DIR_MODE' | sha512sum -)" MATCH=0 for sha in ${SHA}; do - if [ "${sha} -" == "${AUCSHA}" ]; then + if [ "${sha} -" = "${AUCSHA}" ]; then MATCH=1 break fi done - if [ "${MATCH}" == "1" ]; then + if [ "${MATCH}" = 1 ]; then if [ -e "/etc/adduser.conf.update-old" ]; then printf "cannot move unchanged adduser.conf to adduser.conf.update-old. You can continue after answering the dpkg configuration file question.\n" else @@ -70,11 +70,12 @@ create_adduser_conf() { fi } - -case "$1" in +case $1 in upgrade) create_adduser_conf "${2:-}" ;; esac +set +eu + #DEBHELPER# diff -pruN 3.129/debian/rules 3.134/debian/rules --- 3.129/debian/rules 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/rules 2023-05-25 15:54:35.000000000 +0000 @@ -10,10 +10,10 @@ version = $(DEB_VERSION_UPSTREAM) override_dh_auto_build: # generate man pages - cd doc/po4a && po4a --previous po4a.conf + cd doc/po4a && po4a --keep 95 --previous po4a.conf override_dh_auto_clean: - cd doc/po4a && po4a --previous --rm-translations po4a.conf + cd doc/po4a && po4a --keep 95 --previous --rm-translations po4a.conf override_dh_auto_install: $(MAKE) -C po install DESTDIR=`pwd`/debian/adduser @@ -26,7 +26,5 @@ override_dh_install: ln -s adduser debian/adduser/usr/sbin/addgroup ln -s deluser debian/adduser/usr/sbin/delgroup - install -o root -g root -m0755 -d debian/adduser/DEBIAN - override_dh_compress: dh_compress -X examples/adduser.local diff -pruN 3.129/debian/tests/f/addgroup_2_args.t 3.134/debian/tests/f/addgroup_2_args.t --- 3.129/debian/tests/f/addgroup_2_args.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/addgroup_2_args.t 2023-05-25 15:54:35.000000000 +0000 @@ -13,7 +13,7 @@ my $test_user="testuser"; my $test_group="testgroup"; assert_user_does_not_exist($test_user); assert_group_does_not_exist($test_group); -assert_command_success('/usr/sbin/adduser', '--quiet', '--disabled-password', '--gecos', '', $test_user); +assert_command_success('/usr/sbin/adduser', '--quiet', '--disabled-password', '--comment', '', $test_user); assert_command_success('/usr/sbin/addgroup', '--quiet', $test_group); assert_user_exists($test_user); assert_group_exists($test_group); diff -pruN 3.129/debian/tests/f/adduser_system.t 3.134/debian/tests/f/adduser_system.t --- 3.129/debian/tests/f/adduser_system.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/adduser_system.t 2023-05-25 15:54:35.000000000 +0000 @@ -30,7 +30,9 @@ for (100..999) { assert_user_does_not_exist('foo'); assert_path_does_not_exist('/nonexistent'); -assert_command_success('/usr/sbin/adduser', '--quiet', '--system', 'foo'); +assert_command_success('/usr/sbin/adduser', '--quiet', + '--system', + 'foo'); assert_user_exists('foo'); assert_user_has_uid('foo', $uid); @@ -47,3 +49,28 @@ assert_user_has_disabled_password('foo') # Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004710 assert_path_does_not_exist('/var/mail/foo'); + +$uid++; +assert_user_does_not_exist('foo2'); +assert_path_does_not_exist('/nonexistent'); + +assert_command_success('/usr/sbin/adduser', '--quiet', + '--system', + '--shell', '/bin/sh', + 'foo2'); +assert_user_exists('foo2'); + +assert_user_has_uid('foo2', $uid); + +assert_group_does_not_exist('foo2'); +assert_primary_group_membership_exists('foo2', 'nogroup'); + +assert_user_has_home_directory('foo2', '/nonexistent'); +assert_path_does_not_exist('/nonexistent'); + +assert_user_has_login_shell('foo2', '/bin/sh'); + +assert_user_has_disabled_password('foo2'); + +# Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1004710 +assert_path_does_not_exist('/var/mail/foo2'); diff -pruN 3.129/debian/tests/f/delgroup_perf.t 3.134/debian/tests/f/delgroup_perf.t --- 3.129/debian/tests/f/delgroup_perf.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/delgroup_perf.t 2023-05-25 15:54:35.000000000 +0000 @@ -85,7 +85,7 @@ close($fp); close($fs); close($fg); # ### ironically, our own tools are far too slow for this :) # # -# # system('/usr/sbin/adduser','--quiet','--gecos="x"','--no-create-home', '--disabled-password', $username); +# # system('/usr/sbin/adduser','--quiet','--comment="x"','--no-create-home', '--disabled-password', $username); # # system('/usr/sbin/addgroup', '--quiet', $groupname); # # system('/usr/sbin/adduser', '--quiet', "dgpu_$_", $groupname) for (1..$_); # # system("/usr/sbin/groupmod", "-a", "-U", "dgpu_$_", $groupname) for (1..$_); diff -pruN 3.129/debian/tests/f/disabled-login-password.t 3.134/debian/tests/f/disabled-login-password.t --- 3.129/debian/tests/f/disabled-login-password.t 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/tests/f/disabled-login-password.t 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,68 @@ +#! /usr/bin/perl -Idebian/tests/lib + +use diagnostics; +use strict; +use warnings; + +use AdduserTestsCommon; + + +END { + remove_tree('/home/foo'); + remove_tree('/var/mail/foo'); +} + +my $uid; + +# --- disabled-login +assert_user_does_not_exist('disabledlogin'); + +assert_command_success('/usr/sbin/adduser', '--quiet', + '--disabled-login', + '--comment', '""', + 'disabledlogin'); +assert_user_exists('disabledlogin'); + +assert_user_has_login_shell('disabledlogin', '/usr/sbin/nologin'); +assert_user_has_disabled_password('disabledlogin'); + +# --- disabled-login with explicit shell + +assert_user_does_not_exist('disabledlogins'); + +assert_command_success('/usr/sbin/adduser', '--quiet', + '--disabled-login', + '--comment', '""', + '--shell', '/bin/sh', + 'disabledlogins'); +assert_user_exists('disabledlogins'); + +assert_user_has_login_shell('disabledlogins', '/bin/sh'); +assert_user_has_disabled_password('disabledlogins'); + +# --- disabled-password +assert_user_does_not_exist('disabledpassword'); + +assert_command_success('/usr/sbin/adduser', '--quiet', + '--disabled-password', + '--comment', '""', + 'disabledpassword'); +assert_user_exists('disabledpassword'); + +assert_user_has_login_shell('disabledpassword', '/bin/bash'); +assert_user_has_disabled_password('disabledpassword'); + +# --- disabled-password with explicit shell + +assert_user_does_not_exist('disabledpasswords'); + +assert_command_success('/usr/sbin/adduser', '--quiet', + '--disabled-password', + '--comment', '""', + '--shell', '/bin/bash', + 'disabledpasswords'); +assert_user_exists('disabledpasswords'); + +assert_user_has_login_shell('disabledpasswords', '/bin/bash'); +assert_user_has_disabled_password('disabledpasswords'); + diff -pruN 3.129/debian/tests/f/explicit_id.t 3.134/debian/tests/f/explicit_id.t --- 3.129/debian/tests/f/explicit_id.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/explicit_id.t 2023-05-25 15:54:35.000000000 +0000 @@ -108,7 +108,7 @@ my $test4="myuser4"; $uid=pop(@testuid); assert_command_success('/usr/sbin/adduser', $quiet, '--no-create-home', - '--gecos', '""', '--disabled-password', + '--comment', '""', '--disabled-password', '--ingroup', $test1, '--uid', $uid, $test4); assert_user_exists($test4); @@ -121,7 +121,7 @@ $uid=pop(@testuid); assert_command_failure_silent('/usr/sbin/adduser', $quiet, '--no-create-home', '--ingroup', "does-not-exist", - '--gecos', '""', '--disabled-password', + '--comment', '""', '--disabled-password', $test5); assert_user_does_not_exist($test5); assert_group_does_not_exist($test5); @@ -131,7 +131,7 @@ my $test6="myuser6"; $uid=pop(@testuid); assert_command_success('/usr/sbin/adduser', $quiet, '--no-create-home', - '--gecos', '""', '--disabled-password', + '--comment', '""', '--disabled-password', '--uid', $uid, $test6); assert_user_exists($test6); assert_uid_exists($uid); diff -pruN 3.129/debian/tests/f/firstlastuidgid.t 3.134/debian/tests/f/firstlastuidgid.t --- 3.129/debian/tests/f/firstlastuidgid.t 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/tests/f/firstlastuidgid.t 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,975 @@ +#! /usr/bin/perl -Idebian/tests/lib + +# check first/last uid/gid functionality + +use diagnostics; +use strict; +use warnings; + +use AdduserTestsCommon; + +my $quiet='--quiet'; +my $gidcount; +my $uidcount; + +my @unames = ( 'flugu01', 'flugu02', 'flugu03', 'flugu04' ); +my $unamex = 'flugu05'; +my @gnames = ( 'flugg01', 'flugg02', 'flugg03', 'flugg04' ); +my $gnamex = 'flugg05'; +my $funame = 'fixedu01'; +my $fgname = 'fixedg01'; +my $user; +my $userbase; +my $fuid; +my $group; +my $groupbase; +my $fgid; +my $prefix; + +my $firstuid1; +my $lastuid1; +my $firstgid1; +my $lastgid1; + +sub cleanup { + my $prefix=$_[0] || ''; + foreach $userbase( @unames ) { + $user=$prefix.$userbase; + system("/usr/sbin/deluser $quiet --remove-home $user 2>/dev/null"); + assert_user_does_not_exist($user); + } + system("/usr/sbin/deluser $quiet --remove-home $prefix$unamex 2>/dev/null"); + assert_user_does_not_exist($prefix.$unamex); + system("/usr/sbin/deluser $quiet --remove-home $prefix$funame 2>/dev/null"); + assert_user_does_not_exist($prefix.$funame); + $uidcount=0; + foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + system("/usr/sbin/delgroup $quiet $group 2>/dev/null"); + assert_group_does_not_exist($group); + } + system("/usr/sbin/delgroup $quiet $prefix$gnamex 2>/dev/null"); + assert_group_does_not_exist($prefix.$gnamex); + system("/usr/sbin/delgroup $quiet $prefix$fgname 2>/dev/null"); + assert_user_does_not_exist($prefix.$fgname); + $gidcount=0; +} +cleanup(); + +# test group U1A: default config, no command line + +$prefix = 'u1a'; +$fuid = 3750; +$fgid = 3761; +my %confhash=(); +apply_config_hash(\%confhash); + +foreach $groupbase( @gnames ) { + $group = $prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, $group); + assert_group_exists($group); + if ($gidcount==0) { + $gidcount=((getgrnam($group))[2]); + } + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user = $prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + if ($uidcount==0) { + $uidcount=((getpwnam($user))[2]); + } + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='u1a2'; +foreach $userbase( @unames ) { + $user = $prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_group_exists($user); + if ($uidcount==0) { + $uidcount=((getpwnam($user))[2]); + } + if ($gidcount==0) { + $gidcount=((getgrnam($user))[2]); + } + assert_primary_group_membership_exists($user, $user); + assert_user_has_uid($user, $uidcount); + assert_group_has_gid($user, $gidcount); + $uidcount++; + $gidcount++; +} +cleanup($prefix); + +# test group U2A: default config, uid/gid range requested on command line + +$prefix='u2a'; +$firstuid1=2000; +$firstgid1=2100; +$fuid = 3750; +$fgid = 3761; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_group_does_not_exist($prefix.$fgname); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='u2a2'; +$firstuid1=2000; +$fuid = 3750; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_group_exists($user); + assert_primary_group_membership_exists($user, $user); + assert_user_has_uid($user, $uidcount); + assert_group_has_gid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +# test group U3A: uid range requested by config, no command line + +$prefix='u3a'; +$firstuid1=2000; +$firstgid1=2100; +$fuid = 3750; +$fgid = 3761; +%confhash=(); +$confhash{'FIRST_UID'}="$firstuid1"; +$confhash{'FIRST_GID'}="$firstgid1"; +apply_config_hash(\%confhash); + +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='u3a2'; +$firstuid1=2000; +$fuid = 3750; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_group_exists($user); + assert_primary_group_membership_exists($user, $user); + assert_user_has_uid($user, $uidcount); + assert_group_has_gid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +# test group U4A: ranges requested by config, overriden by command line + +$prefix='u4a'; +$firstuid1=2200; +$firstgid1=2300; +$fuid = 3750; +$fgid = 3761; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='u4a2'; +$firstuid1=2000; +$fuid = 3750; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_group_exists($user); + assert_primary_group_membership_exists($user, $user); + assert_user_has_uid($user, $uidcount); + assert_group_has_gid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +%confhash=(); +apply_config_hash(\%confhash); + +# test group S1A: default config, no command line + +$prefix = 's1a'; +$fuid = 200; +$fgid = 210; +%confhash=(); +apply_config_hash(\%confhash); + +foreach $groupbase( @gnames ) { + $group = $prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, '--system', $group); + assert_group_exists($group); + if ($gidcount==0) { + $gidcount=((getgrnam($group))[2]); + } + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user = $prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + if ($uidcount==0) { + $uidcount=((getpwnam($user))[2]); + } + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='s1a2'; +foreach $userbase( @unames ) { + $user = $prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + if ($uidcount==0) { + $uidcount=((getpwnam($user))[2]); + } + assert_primary_group_membership_exists($user, 'nogroup'); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +# test group S2A: default config, uid/gid range requested on command line + +$prefix='s2a'; +$firstuid1=220; +$firstgid1=230; +$fuid = 950; +$fgid = 960; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_group_does_not_exist($prefix.$fgname); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='s2a2'; +$firstuid1=240; +$fuid = 250; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, 'nogroup'); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +# test group S3A: uid range requested by config, no command line + +$prefix='s3a'; +$firstuid1=260; +$firstgid1=270; +$fuid = 970; +$fgid = 980; +%confhash=(); +$confhash{'FIRST_SYSTEM_UID'}="$firstuid1"; +$confhash{'FIRST_SYSTEM_GID'}="$firstgid1"; +apply_config_hash(\%confhash); + +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', '--system', $quiet, $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='s3a2'; +$firstuid1=260; +$fuid = 970; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, 'nogroup'); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +# test group S4A: ranges requested by config, overriden by command line + +$prefix='s4a'; +$firstuid1=290; +$firstgid1=300; +$fuid = 810; +$fgid = 820; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +$prefix='s4a2'; +$firstuid1=310; +$fuid = 830; +$uidcount=$firstuid1; +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, 'nogroup'); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +cleanup($prefix); + +%confhash=(); +apply_config_hash(\%confhash); + + +# tests with last_ options: we set a range and fill it, last creation must fail + +# test group U1L: not applicable +# test group U2L: default config, uid/gid range requested on command line + +$prefix='u2l'; +$firstuid1=2090; +$lastuid1=2093; +$firstgid1=2190; +$lastgid1=2193; +$fuid = 3750; +$fgid = 3761; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $prefix.$unamex); +assert_user_does_not_exist($prefix.$unamex); +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +# test group U3L: uid range requested by config, no command line + +$prefix='u3l'; +$firstuid1=2090; +$lastuid1=2093; +$firstgid1=2190; +$lastgid1=2193; +$fuid = 3750; +$fgid = 3761; +%confhash=(); +$confhash{'FIRST_UID'}="$firstuid1"; +$confhash{'FIRST_GID'}="$firstgid1"; +$confhash{'LAST_UID'}="$lastuid1"; +$confhash{'LAST_GID'}="$lastgid1"; +apply_config_hash(\%confhash); +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $prefix.$unamex); +assert_user_does_not_exist($unamex); +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +# test group U4L: ranges requested by config, overriden by command line + +$prefix='u4l'; +$firstuid1=2290; +$lastuid1=2293; +$firstgid1=2390; +$lastgid1=2393; +$fuid = 3750; +$fgid = 3761; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $prefix.$unamex); +assert_user_does_not_exist($prefix.$unamex); +assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +%confhash=(); +apply_config_hash(\%confhash); + +# test group S1L: not applicable +# test group S2L: default config, uid/gid range requested on command line + +$prefix='s2l'; +$firstuid1=400; +$lastuid1=403; +$firstgid1=500; +$lastgid1=503; +$fuid = 700; +$fgid = 750; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $prefix.$unamex); +assert_user_does_not_exist($prefix.$unamex); +assert_command_success_silent('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +# test group S3L: uid range requested by config, no command line + +$prefix='s3l'; +$firstuid1=410; +$lastuid1=413; +$firstgid1=510; +$lastgid1=513; +$fuid = 710; +$fgid = 760; +%confhash=(); +$confhash{'FIRST_SYSTEM_UID'}="$firstuid1"; +$confhash{'FIRST_SYSTEM_GID'}="$firstgid1"; +$confhash{'LAST_SYSTEM_UID'}="$lastuid1"; +$confhash{'LAST_SYSTEM_GID'}="$lastgid1"; +apply_config_hash(\%confhash); +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + '--system', + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + $prefix.$unamex); +assert_user_does_not_exist($unamex); +assert_command_success_silent('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +# test group S4L: ranges requested by config, overriden by command line + +$prefix='s4l'; +$firstuid1=420; +$lastuid1=423; +$firstgid1=520; +$lastgid1=523; +$fuid = 720; +$fgid = 770; +$gidcount=$firstgid1; +$uidcount=$firstuid1; +foreach $groupbase( @gnames ) { + $group=$prefix.$groupbase; + assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $group); + assert_group_exists($group); + assert_group_has_gid($group, $gidcount); + $gidcount++; +} +assert_command_failure_silent('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + $prefix.$gnamex); +assert_group_does_not_exist($prefix.$gnamex); +assert_command_success('/usr/sbin/addgroup', $quiet, + '--system', + '--firstgid', $firstgid1, '--lastgid', $lastgid1, + '--gid', $fgid, + $prefix.$fgname); +assert_group_exists($prefix.$fgname); +assert_group_has_gid($prefix.$fgname, $fgid); + +foreach $userbase( @unames ) { + $user=$prefix.$userbase; + assert_command_success('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $user); + assert_user_exists($user); + assert_primary_group_membership_exists($user, $prefix.$gnames[0]); + assert_user_has_uid($user, $uidcount); + $uidcount++; +} +assert_command_failure_silent('/usr/sbin/adduser', $quiet, + '--system', + '--ingroup', $prefix.$gnames[0], + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + $prefix.$unamex); +assert_user_does_not_exist($prefix.$unamex); +assert_command_success_silent('/usr/sbin/adduser', $quiet, + '--system', + '--comment', '""', '--disabled-password', '--no-create-home', + '--firstuid', $firstuid1, '--lastuid', $lastuid1, + '--uid', $fuid, + $prefix.$funame); +assert_user_exists($prefix.$funame); +assert_user_has_uid($prefix.$funame, $fuid); +cleanup($prefix); + +%confhash=(); +apply_config_hash(\%confhash); +cleanup(); + +# vim: tabstop=4 shiftwidth=4 expandtab diff -pruN 3.129/debian/tests/f/quiet.t 3.134/debian/tests/f/quiet.t --- 3.129/debian/tests/f/quiet.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/quiet.t 2023-05-25 15:54:35.000000000 +0000 @@ -17,7 +17,7 @@ END { assert_user_does_not_exist('foo'); assert_group_does_not_exist('foo'); -assert_command_success('/usr/sbin/adduser', '--quiet', '--disabled-login', '--gecos="x"', '--no-create-home', 'foo'); +assert_command_success('/usr/sbin/adduser', '--quiet', '--disabled-login', '--comment="x"', '--no-create-home', 'foo'); assert_user_exists('foo'); assert_group_exists('foo'); diff -pruN 3.129/debian/tests/f/symlinks.t 3.134/debian/tests/f/symlinks.t --- 3.129/debian/tests/f/symlinks.t 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/tests/f/symlinks.t 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,10 @@ +#! /usr/bin/perl -Idebian/tests/lib + +use diagnostics; +use strict; +use warnings; + +use AdduserTestsCommon; + +assert_command_failure("dpkg --listfiles adduser | grep /usr/share/man | xargs -I{} find {} -xtype l -maxdepth 1 -print | grep -q '.'"); + diff -pruN 3.129/debian/tests/f/uidgidpool.t 3.134/debian/tests/f/uidgidpool.t --- 3.129/debian/tests/f/uidgidpool.t 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/debian/tests/f/uidgidpool.t 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,255 @@ +#! /usr/bin/perl -Idebian/tests/lib + +# check uidgidpool functionality + +use diagnostics; +use strict; +use warnings; + +use AdduserTestsCommon; + +my $quiet="--quiet"; + +# single pool file +my $uidpoolfile="/etc/adduser-uidpool.conf"; +my $gidpoolfile="/etc/adduser-gidpool.conf"; +my $poolbasedir="/etc/adduser-pool.d"; +my $uidpooldir="$poolbasedir/uid"; +my $gidpooldir="$poolbasedir/gid"; +my %confhash; + +my $auid=40123; +my $agid=40234; +my $ashell="/bin/dash"; +my $acomment="alternate comment"; + +my @uidlist = ( + { + 'name' => 'pooluid101', + 'id' => 23101, + 'comment' => 'pooluid101 pool account', + 'home' => '/home/pool101', + 'ahome' => '/home/alt101', + 'shell' => '/bin/bash', + },{ + 'name' => 'pooluid202', + 'id' => 23202, + 'comment' => 'pooluid202 pool account', + 'home' => '/home/pool202', + 'ahome' => '/home/alt202', + 'shell' => '/bin/sh', + } +); + +my @gidlist = ( + { + name => 'poolgid101', + id => 32101, + },{ + name => 'poolgid202', + id => 32202, + } +); + +# test creating user/group without uidpool set + +foreach my $group( @gidlist ) { + assert_command_success('/usr/sbin/addgroup', $quiet, + '--comment', '""', '--disabled-password', $group->{name}); + assert_group_exists($group->{name}); + assert_gid_does_not_exist($group->{id}); +} + +foreach my $user( @uidlist ) { + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', '""', '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_uid_does_not_exist($user->{id}); +} + +sub cleanup { + foreach my $user( @uidlist ) { + system("/usr/sbin/deluser $quiet --remove-home $user->{name} 2>/dev/null"); + assert_user_does_not_exist($user->{name}); + } + foreach my $group( @gidlist ) { + system("/usr/sbin/delgroup $quiet $group->{name} 2>/dev/null"); + assert_group_does_not_exist($group->{name}); + } +} +cleanup(); + +# create test pool files +my $fh; +open ($fh, ">>", $uidpoolfile) or die "Failed to open file $uidpoolfile for writing"; +foreach my $idset( @uidlist ) { + print $fh $idset->{name}. ":". $idset->{id}. ":". $idset->{comment}. ":". $idset->{home}. ":". $idset->{shell}. "\n" +} + +open ($fh, ">>", $gidpoolfile) or die "Failed to open file $gidpoolfile for writing"; +foreach my $idset( @gidlist ) { + print $fh $idset->{name}. ":". $idset->{id}. "\n" +} + +# configure adduser to use uidpool +%confhash=(); +$confhash{"UID_POOL"}="$uidpoolfile"; +$confhash{"GID_POOL"}="$gidpoolfile"; +apply_config_hash(\%confhash); + +# test creating user/group with uidpool set + +foreach my $group( @gidlist ) { + assert_command_success('/usr/sbin/addgroup', $quiet, + $group->{name}); + assert_group_exists($group->{name}); + assert_group_has_gid($group->{name}, $group->{id}); + cleanup(); + + assert_command_success('/usr/sbin/addgroup', $quiet, + '--gid', $agid, $group->{name}); + assert_group_exists($group->{name}); + assert_group_has_gid($group->{name}, $agid); + cleanup(); +} + +foreach my $user( @uidlist ) { + assert_command_success('/usr/sbin/adduser', $quiet, + '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--uid', $auid, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $auid); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', $acomment, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $acomment); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--home', $user->{ahome}, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{ahome}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--shell', $ashell, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $ashell); + cleanup(); +} + +# remove test pool files +assert_command_success('rm', '-f', $uidpoolfile, $gidpoolfile); + +# create and fill test pool directories +assert_command_success('mkdir', '-p', $uidpooldir, $gidpooldir); +my $counter=1; +foreach my $idset( @uidlist ) { + my $fn = $uidpooldir. "/uidpool". $counter. ".conf"; + open (my $fh, ">>", $fn) or die "Failed to open file $fn for writing"; + print $fh $idset->{name}. ":". $idset->{id}. ":". $idset->{comment}. ":". $idset->{home}. ":". $idset->{shell}. "\n"; + $counter++; +} + +foreach my $idset( @gidlist ) { + my $fn = $gidpooldir. "/gidpool". $counter. ".conf"; + open (my $fh, ">>", $fn) or die "Failed to open file $fn for writing"; + print $fh $idset->{name}. ":". $idset->{id}. "\n"; + $counter++; +} + +# configure adduser to use uidpool +%confhash=(); +$confhash{"UID_POOL"}="$uidpooldir"; +$confhash{"GID_POOL"}="$gidpooldir"; +apply_config_hash(\%confhash); + +# test creating user/group with uidpool set + +foreach my $group( @gidlist ) { + assert_command_success('/usr/sbin/addgroup', $quiet, + $group->{name}); + assert_group_exists($group->{name}); + assert_group_has_gid($group->{name}, $group->{id}); + cleanup(); + + assert_command_success('/usr/sbin/addgroup', $quiet, + '--gid', $agid, $group->{name}); + assert_group_exists($group->{name}); + assert_group_has_gid($group->{name}, $agid); + cleanup(); +} + +foreach my $user( @uidlist ) { + assert_command_success('/usr/sbin/adduser', $quiet, + '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--uid', $auid, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $auid); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--comment', $acomment, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $acomment); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--home', $user->{ahome}, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{ahome}); + assert_user_has_login_shell($user->{name}, $user->{shell}); + cleanup(); + + assert_command_success('/usr/sbin/adduser', $quiet, + '--shell', $ashell, '--disabled-password', $user->{name}); + assert_user_exists($user->{name}); + assert_user_has_uid($user->{name}, $user->{id}); + assert_user_has_comment($user->{name}, $user->{comment}); + assert_user_has_home_directory($user->{name}, $user->{home}); + assert_user_has_login_shell($user->{name}, $ashell); + cleanup(); +} + +# remove test pool directories +assert_command_success('rm', '-rf', $uidpooldir, $gidpooldir, $poolbasedir); + +# vim: tabstop=4 shiftwidth=4 expandtab diff -pruN 3.129/debian/tests/f/user_group.t 3.134/debian/tests/f/user_group.t --- 3.129/debian/tests/f/user_group.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/user_group.t 2023-05-25 15:54:35.000000000 +0000 @@ -34,7 +34,7 @@ $confhash{"USERS_GROUP"}='users'; $confhash{"USERS_GID"}='100'; apply_config_hash(\%confhash); assert_command_failure_silent('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); my $homedir; @@ -54,7 +54,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); my $test_uid=getpwnam($test_name); @@ -80,7 +80,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", '--uid', "$useruid", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -105,7 +105,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -129,7 +129,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -151,7 +151,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -176,7 +176,7 @@ assert_command_success('/usr/sbin/adduse '--gid', $dusergid, '--uid', "$useruid", '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -195,7 +195,7 @@ $confhash{"USERS_GID"}=''; $confhash{"EXTRA_GROUPS"}=join(' ', @extragroups); apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -220,7 +220,7 @@ $confhash{"EXTRA_GROUPS"}=join(' ', @ext apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -243,7 +243,7 @@ $confhash{"EXTRA_GROUPS"}=join(' ', @ext apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--add-extra-groups', - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -269,7 +269,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--add-extra-groups', '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -292,7 +292,7 @@ $confhash{"EXTRA_GROUPS"}=join(' ', @ext apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--add_extra_groups', - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -318,7 +318,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--add_extra_groups', '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -341,7 +341,7 @@ $confhash{"EXTRA_GROUPS"}=join(' ', @ext $confhash{"ADD_EXTRA_GROUPS"}='1'; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -367,7 +367,7 @@ $confhash{"ADD_EXTRA_GROUPS"}='1'; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -387,7 +387,7 @@ $confhash{"USERS_GROUP"}=$cusergroup; $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -408,7 +408,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -428,7 +428,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -447,7 +447,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -463,7 +463,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -482,7 +482,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -496,7 +496,7 @@ $confhash{"USERS_GROUP"}=''; $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -517,7 +517,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -537,7 +537,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -556,7 +556,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -572,7 +572,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -591,7 +591,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -608,7 +608,7 @@ $confhash{"USERS_GID"}=-1; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -635,7 +635,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", '--uid', "$useruid", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_exists($test_name); $test_uid=getpwnam($test_name); @@ -661,7 +661,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -687,7 +687,7 @@ assert_command_success('/usr/sbin/adduse '--ingroup', $dusergroup, '--home', "$homedir", '--uid', "$useruid", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -707,7 +707,7 @@ $confhash{"USERS_GID"}=-1; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -727,7 +727,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -745,7 +745,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $cusergroup); @@ -770,7 +770,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", '--uid', "$useruid", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $cusergroup); @@ -791,7 +791,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -811,7 +811,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -828,7 +828,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -848,7 +848,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -863,7 +863,7 @@ $confhash{"USERS_GROUP"}=''; $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $cusergroup); @@ -882,7 +882,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $cusergroup); @@ -900,7 +900,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -920,7 +920,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -937,7 +937,7 @@ $confhash{"USERS_GID"}=$cusergid; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -957,7 +957,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -975,7 +975,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $usergroup); @@ -1000,7 +1000,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--home', "$homedir", '--uid', "$useruid", - '--gecos', '""', '--disabled-password', $test_name); + '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $usergroup); @@ -1021,7 +1021,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -1041,7 +1041,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--ingroup', $dusergroup, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -1058,7 +1058,7 @@ $confhash{"USERS_GID"}=''; apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_exists($test_name); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -1078,7 +1078,7 @@ apply_config_hash(\%confhash); assert_command_success('/usr/sbin/adduser', $quiet, '--gid', $dusergid, '--uid', "$useruid", - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); assert_user_uid_exists($test_name,$useruid); assert_group_does_not_exist($test_name); assert_primary_group_membership_exists($test_name, $dusergroup); @@ -1094,7 +1094,7 @@ $confhash{"USERS_GROUP"}=''; $confhash{"USERS_GID"}=-1; apply_config_hash(\%confhash); assert_command_failure_silent('/usr/sbin/adduser', $quiet, - '--no-create-home', '--gecos', '""', '--disabled-password', $test_name); + '--no-create-home', '--comment', '""', '--disabled-password', $test_name); ##+# TODO: write tests with loops diff -pruN 3.129/debian/tests/f/valid_username.t 3.134/debian/tests/f/valid_username.t --- 3.129/debian/tests/f/valid_username.t 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/f/valid_username.t 2023-05-25 15:54:35.000000000 +0000 @@ -26,6 +26,7 @@ use constant PASS => 2; use constant BAD => 4; use constant ALL => 8; use constant FBAD => 16; +use constant ABAD => 32; my %pat = ( # Traditional Debian username patterns @@ -40,78 +41,91 @@ my %pat = ( caps => qr{^[A-Za-z0-9_.]+$} ); -test_name('12345', FAIL, FAIL|BAD, FAIL|ALL, +test_name('12345', FAIL, FAIL|BAD, FAIL|FBAD, FAIL|ABAD, FAIL|ALL, $pat{min}, FAIL, FAIL|ALL); test_name('1abc33', FAIL, PASS|BAD); +test_name('1abc33', FAIL, PASS|ABAD); test_name('1abc33', FAIL, PASS|FBAD); -test_name('John.Smith', FAIL, PASS|BAD, - $pat{ieee}, PASS, +test_name('John.Smith', FAIL, PASS|BAD, + $pat{ieee}, PASS, + $pat{caps}, PASS); +test_name('John.Smith', FAIL, PASS|ABAD, + $pat{ieee}, PASS, $pat{caps}, PASS); -test_name('alice_42', PASS, - '^[a-z][a-z0-9]*$', FAIL, PASS|BAD); -test_name('user$', PASS, - $pat{caps}, FAIL, +test_name('John.Smith', FAIL, PASS|FBAD, + $pat{ieee}, PASS, + $pat{caps}, PASS); +test_name('alice_42', PASS, + '^[a-z][a-z0-9]*$', FAIL, PASS|BAD, PASS|ABAD, PASS|FBAD); +test_name('user$', PASS, + $pat{caps}, FAIL, $pat{ieee}, PASS); -test_name('_', PASS, +test_name('_', PASS, $pat{ieee}, PASS, $pat{min}, PASS); # this test is to see what backslash does # unfortunately unpredictable -test_name("\}", FAIL, FAIL|BAD, PASS|ALL, +test_name("\}", FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); -test_name("\\}", FAIL, FAIL|BAD, PASS|ALL, +test_name("\\}", FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); # windows conventions test_name('machine$', PASS, $pat{ieee}, PASS); -test_name('DOMAIN\user', FAIL, FAIL|BAD, PASS|ALL, +test_name('DOMAIN\user', FAIL, FAIL|BAD, FAIL|FBAD, FAIL|ABAD, PASS|ALL, $pat{min}, PASS); -test_name('user@email.example.com', FAIL, PASS|BAD, PASS|ALL, +test_name('user@email.example.com', FAIL, PASS|BAD, PASS|FBAD, PASS|ABAD, PASS|ALL, $pat{min}, PASS); # test alternate escaping -test_name("'duke'", FAIL, FAIL|BAD, PASS|ALL); +test_name("'duke'", FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL); # the worst username possible -test_name("'c4\$h\\M0n3y\"'==>@", FAIL, FAIL|BAD, PASS|ALL); +test_name("'c4\$h\\M0n3y\"'==>@", FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL); # should always fail any regex my @fails = ('12345', 'root:root', 'test space', "test\nwhite\tspace", 'a' x 33, 'ф' x 17); -test_name($_, FAIL, FAIL|BAD, FAIL|ALL, +test_name($_, FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL, $pat{all}, FAIL, FAIL|ALL) for @fails; # imho this should continue to fail; it may need # special casing in creating home dirs if allowed -test_name("test/slash", FAIL, - $pat{min}, FAIL, FAIL|BAD, FAIL|ALL); +test_name("test/slash", FAIL, + $pat{min}, FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, FAIL|ALL); # some stranger choices -test_name("ÿar", FAIL|BAD, PASS|ALL, $pat{min}, PASS); -test_name('*', FAIL|BAD, PASS|ALL, $pat{min}, PASS); -test_name('3>6', FAIL, FAIL|BAD, PASS|ALL, $pat{min}, PASS); -test_name('.com', FAIL, PASS|BAD, PASS|ALL, $pat{min}, PASS); -test_name('user%', FAIL|BAD, PASS|ALL, $pat{min}, PASS); -test_name('˄ʙɄȘ˳', FAIL|BAD, PASS|ALL, $pat{min}, PASS); +test_name("ÿar", FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); +test_name('*', FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); +test_name('3>6', FAIL, FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); +test_name('.com', FAIL, PASS|BAD, PASS|ABAD, PASS|FBAD, PASS|ALL, $pat{min}, PASS); +test_name('user%', FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); +test_name('˄ʙɄȘ˳', FAIL|BAD, FAIL|ABAD, FAIL|FBAD, PASS|ALL, $pat{min}, PASS); + +# system users with leading underscores +test_name('_foo', PASS); +test_name('_foo-bar', PASS); sub mode_string { my $mode = shift; my $mstr = ''; $mstr .= ($mode & PASS) ? 'P' : '-'; $mstr .= ($mode & FAIL) ? 'F' : '-'; - $mstr .= ($mode & BAD || $mode & FBAD) ? 'B' : '-'; + $mstr .= ($mode & BAD || $mode & FBAD || $mode & ABAD) ? 'B' : '-'; $mstr .= ($mode & ALL) ? 'A' : '-'; return $mstr; } # test_name(username, arg, arg....) # -# arg may be a mode: PASS|FAIL|BAD|ALL -# or it may be a regex: $pat{deb} +# arg may be: +# - mode (FAIL, PASS, BAD, etc.; see constants above) +# - regex (e.g., $pat{deb} or another member of %pat) # -# by default, tests SYS_NAME_REGEX / FAIL +# The mode defaults to FAIL. The regex defaults to the adduser default for +# the SYS_NAME_REGEX setting. sub test_name { my $username = shift; - my $regex = (@_ && $_[0] !~ /^\d+$/) ? shift : $pat{deb_sys}; + my $regex = (@_ && $_[0] !~ /^\d+$/) ? shift : undef; my $username_esc = $username; my $homedir = qq{/home/$username}; my ($mode, $homedir_esc, @cmdargs); @@ -131,19 +145,28 @@ sub test_name { do { $mode = (@_ && $_[0]=~ /^\d+$/) ? shift : FAIL; - #die 'oops' unless $regex; - apply_config('SYS_NAME_REGEX', $regex); + + if (defined($regex)) { + apply_config('SYS_NAME_REGEX', $regex); + } else { + # Regular expression is not provided. Write an empty configuration + # file so that this test compares against the adduser default for the + # SYS_NAME_REGEX setting. + apply_config; + } do { @cmdargs = ('--home', $homedir_esc); push @cmdargs, '--force-badname' if ($mode & FBAD); - push @cmdargs, '--allow-badname' if ($mode & BAD); + push @cmdargs, '--allow-bad-names' if ($mode & BAD); + push @cmdargs, '--allow-badname' if ($mode & ABAD); push @cmdargs, '--allow-all-names' if ($mode & ALL); #print "\n\n".(' }'.('-'x20))."{ $username_esc [ ARGS ".join(' ', @cmdargs)."\n\n"; - # this is a dummy test to identify the following results - my $modestr = mode_string $mode; - ok($regex, "testing [$modestr] $username =~ $regex"); + # This is a dummy test to identify the following results. + my $modestr = mode_string($mode); + my $regexstr = defined($regex) ? $regex : 'SYS_NAME_REGEX'; + ok($regexstr, "testing [$modestr] $username =~ $regexstr"); if ($mode & PASS) { assert_command_success_silent(@cmd, @cmdargs, $username_esc); @@ -159,7 +182,7 @@ sub test_name { } $mode = (@_ && $_[0] =~ /^\d+$/ ) ? shift : undef; } while ($mode); - apply_config(); + $regex = shift || undef; } while (@_ || $regex); } diff -pruN 3.129/debian/tests/lib/AdduserTestsCommon.pm 3.134/debian/tests/lib/AdduserTestsCommon.pm --- 3.129/debian/tests/lib/AdduserTestsCommon.pm 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/debian/tests/lib/AdduserTestsCommon.pm 2023-05-25 15:54:35.000000000 +0000 @@ -302,6 +302,12 @@ sub assert_user_has_home_directory { is((getpwnam($user))[7], $home, "user has home directory: ~$user is $home"); } +sub assert_user_has_comment { + my ($user, $comment) = @_; + $comment .= ',,,'; + is((getpwnam($user))[6], $comment, "user has comment: ~$user is $comment"); +} + sub assert_dir_group_owner { my ($dir, $group) = @_; my $gid=(stat($dir))[5]; diff -pruN 3.129/deluser 3.134/deluser --- 3.129/deluser 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/deluser 2023-05-25 15:54:35.000000000 +0000 @@ -75,7 +75,7 @@ my $action = $0 =~ /delgroup$/ ? "delgro our $verbose = 1; my %pconfig = (); my %config = (); -my $configfile; +my @configfiles; my @defaults; my $no_preserve_root; @@ -84,10 +84,11 @@ unless ( GetOptions ( "quiet|q" => sub {$verbose = 0; }, "debug" => sub {$verbose = 2; }, + "verbose" => sub {$verbose = 2; }, "version|v" => sub { &version(); exit 0; }, "help|h" => sub { &usage(); exit 0;}, "group" => sub { $action = "delgroup";}, - "conf|c=s" => \$configfile, + "conf|c=s" => \@configfiles, "system" => \$pconfig{"system"}, "only-if-empty" => \$pconfig{"only_if_empty"}, "remove-home" => \$pconfig{"remove_home"}, @@ -105,10 +106,10 @@ unless ( # everyone can issue "--help" and "--version", but only root can go on dief (gtx("Only root may remove a user or group from the system.\n")) if ($> != 0); -if (!defined($configfile)) { +if (!@configfiles) { @defaults = ("/etc/adduser.conf", "/etc/deluser.conf"); } else { - @defaults = ($configfile); + @defaults = (@configfiles); } # explicitly set PATH, because super (1) cleans up the path and makes deluser unusable; @@ -212,8 +213,6 @@ if(defined($group)) { if($action eq "deluser") { - &invalidate_nscd(); - my($dummy1,$dummy2,$uid); # Don't allow a non-system user to be deleted when --system is given @@ -360,7 +359,6 @@ if($action eq "deluser") { acquire_lock(); &systemcall('/usr/sbin/userdel', $user); release_lock(); - &invalidate_nscd(); &systemcall('/usr/local/sbin/deluser.local', $user, $pw_uid, $pw_gid, $pw_homedir) if (-x "/usr/local/sbin/deluser.local"); @@ -371,8 +369,6 @@ if($action eq "deluser") { if ($action eq 'delgroup') { - &invalidate_nscd(); - unless (exist_group($group)) { warnf (gtx("The group `%s' does not exist.\n"), $group) if $verbose; exit(0) if $config{'system'}; @@ -393,12 +389,14 @@ if ($action eq 'delgroup') { fail (5, gtx("The group `%s' is not empty!\n"),$group); } + # groupdel will error out if there are users left that + # have $group as primary group. We are not checking this + # ourself since this would mean enumerating all users. s_printf (gtx("Removing group `%s' ...\n"),$group); my $groupdel = &which('groupdel'); acquire_lock(); &systemcall($groupdel,$group); release_lock(); - &invalidate_nscd(); s_print (gtx("Done.\n")); exit 0; } @@ -406,7 +404,6 @@ if ($action eq 'delgroup') { if($action eq 'deluserfromgroup') { - &invalidate_nscd(); unless(exist_user($user)) { fail (2, gtx("The user `%s' does not exist.\n"),$user); } @@ -439,7 +436,6 @@ if($action eq 'deluserfromgroup') acquire_lock(); &systemcall('/usr/bin/gpasswd', '-M', join(',', @members), $group); release_lock(); - &invalidate_nscd(); s_print (gtx("Done.\n")); } @@ -455,14 +451,13 @@ sub fail { sub version { printf (gtx("deluser version %s\n\n"), $version); - printf (gtx("Removes users and groups from the system.\n")); - - printf gtx("Copyright (C) 2000 Roland Bauerschmidt \n\n"); + print gtx("Removes users and groups from the system. - printf gtx("deluser is based on adduser by Guy Maor , Ian Murdock\n". - " and Ted Hajek \n\n"); +For detailed copyright information, please refer to +/usr/share/doc/adduser/copyright. +\n"); - printf gtx("This program is free software; you can redistribute it and/or modify + print gtx("This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -470,40 +465,26 @@ your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License, /usr/share/common-licenses/GPL, for more details.\n"); +General Public License, /usr/share/common-licenses/GPL, for more details. +"); } sub usage { printf gtx( -"deluser USER - remove a normal user from the system - example: deluser mike +"deluser [--system] [--remove-home] [--remove-all-files] [--backup] + [--backup-to dir] [--backup-suffix str] [--conf file] + [--quiet] [--verbose] [--debug] user - --remove-home remove the users home directory and mail spool - --remove-all-files remove all files owned by user - --backup backup files before removing. - --backup-to target directory for the backups. - Default is the current directory. - --system only remove if system user + remove a normal user from the system -delgroup GROUP -deluser --group GROUP +deluser --group [--system] [--only-if-empty] [--conf file] [--quiet] + [--verbose] [--debug] group +delgroup [--system] [--only-if-empty] [--conf file] [--quiet] + [--verbose] [--debug] group remove a group from the system - example: deluser --group students - - --system only remove if system group - --only-if-empty only remove if no members left -deluser USER GROUP - remove the user from a group - example: deluser mike students - -general options: - -q, --quiet don't give process information to stdout - -d, --debug be more verbose - -h, --help usage message - -v, --version version number and copyright - -c FILE, --conf=FILE use FILE as configuration file\n\n"); +deluser [--conf file] [--quiet] [--verbose] [--debug] user group + remove the user from a group\n"); } sub exist_user { diff -pruN 3.129/deluser.conf 3.134/deluser.conf --- 3.129/deluser.conf 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/deluser.conf 2023-05-25 15:54:35.000000000 +0000 @@ -18,18 +18,24 @@ # Default: BACKUP = 0 #BACKUP = 0 -# target directory for the backup file +# Target directory for the backup file # Default: BACKUP_TO = "." #BACKUP_TO = "." -# select compression (from tar --auto-compress) for backups -# Default: BACKUP_SUFFIX = .bz2 -#BACKUP_SUFFIX = .bz2 +# Select compression (from tar --auto-compress) for backups +# Default: BACKUP_SUFFIX = .gz +#BACKUP_SUFFIX = .gz -# delete a group even there are still users in this group +# Space-Separated list of regular expressions. Do not delete files +# matching any of these. +# Default: NO_DEL_PATHS="^/bin\$ ^/boot\$ ^/dev\$ ^/etc\$ ^/initrd ^/lib ^/lost+found\$ ^/media\$ ^/mnt\$ ^/opt\$ ^/proc\$ ^/root\$ ^/run\$ ^/sbin\$ ^/srv\$ ^/sys\$ ^/tmp\$ ^/usr\$ ^/var\$ ^/vmlinu" +#NO_DEL_PATHS="^/bin\$ ^/boot\$ ^/dev\$ ^/etc\$ ^/initrd ^/lib ^/lost+found\$ ^/media\$ ^/mnt\$ ^/opt\$ ^/proc\$ ^/root\$ ^/run\$ ^/sbin\$ ^/srv\$ ^/sys\$ ^/tmp\$ ^/usr\$ ^/var\$ ^/vmlinu" + +# Only delete a group if there are no users belonging to this group. # Default: ONLY_IF_EMPTY = 0 #ONLY_IF_EMPTY = 0 -# exclude these filesystem types when searching for files of a user to backup +# Single regular expression which describes filesystems types which should +# be excluded when looking for files of a user to be deleted. # Default: EXCLUDE_FSTYPES = "(proc|sysfs|usbfs|devpts|tmpfs|afs)" #EXCLUDE_FSTYPES = "(proc|sysfs|usbfs|devpts|tmpfs|afs)" diff -pruN 3.129/doc/adduser.8 3.134/doc/adduser.8 --- 3.129/doc/adduser.8 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/doc/adduser.8 2023-05-25 15:54:35.000000000 +0000 @@ -1,8 +1,16 @@ -.\" Copyright 1997, 1998, 1999 Guy Maor. -.\" Adduser and this manpage are copyright 1995 by Ted Hajek, -.\" With much borrowing from the original adduser copyright 1994 by -.\" Ian Murdock. -.\" +.\" Copyright: 1994 Ian A. Murdock +.\" 1995 Ted Hajek +.\" 1997-1999 Guy Maor +.\" 2000-2003 Roland Bauerschmidt +.\" 2004-2022 Marc Haber +.\" 2011 Justin B Rye +.\" 2016 Afif Elghraoui +.\" 2016 Helge Kreutzmann +.\" 2021-2022 Jason Franklin +.\" 2022 Matt Barry +.\" .\" This is free software; see the GNU General Public License version .\" 2 or later for copying conditions. There is NO warranty. .TH ADDUSER 8 "" "Debian GNU/Linux" @@ -10,329 +18,417 @@ adduser, addgroup \- add or manipulate users or groups .SH SYNOPSIS .SY adduser -.OP [options] -.OP \-\-home dir -.OP \-\-shell shell -.OP \-\-no-create-home -.OP \-\-uid id -.OP \-\-firstuid id -.OP \-\-lastuid id +.OP \-\-add\-extra\-groups +.OP \-\-allow\-all\-names +.OP \-\-allow\-bad\-names +.OP \-\-comment comment +.OP \-\-conf file +.OP \-\-debug +.OP \-\-disabled\-login +.OP \-\-disabled\-password .OP \-\-firstgid id -.OP \-\-lastgid id -.OP \-\-ingroup group +.OP \-\-firstuid id .OP \-\-gid id -.OP \-\-disabled-password -.OP \-\-disabled-login -.OP \-\-gecos gecos -.OP \-\-add-extra-groups -.OP user -.SY adduser -.OP \-\-system -.OP [options] .OP \-\-home dir +.OP \-\-ingroup group +.OP \-\-lastgid id +.OP \-\-lastuid id +.OP \-\-no\-create\-home .OP \-\-shell shell -.OP \-\-no-create-home +.OP \-\-quiet .OP \-\-uid id +.OP \-\-verbose +.B user +.YS +.SY adduser +.B \-\-system +.OP \-\-comment comment +.OP \-\-conf file +.OP \-\-debug +.OP \-\-gid id .OP \-\-group +.OP \-\-home dir .OP \-\-ingroup group -.OP \-\-gid id -.OP \-\-disabled-password -.OP \-\-disabled-login -.OP \-\-gecos gecos -.OP user +.OP \-\-no\-create\-home +.OP \-\-shell shell +.OP \-\-uid id +.OP \-\-quiet +.OP \-\-verbose +.B user +.YS +.SY adduser +.B \-\-group +.OP \-\-conf file +.OP \-\-debug +.OP \-\-firstgid id +.OP \-\-gid ID +.OP \-\-lastgid id +.OP \-\-quiet +.OP \-\-verbose +.B group +.YS .SY addgroup -.OP [options] +.OP \-\-conf file +.OP \-\-debug +.OP \-\-firstgid id .OP \-\-gid ID -.OP group -.SY addgroup -.OP \-\-system -.OP [options] +.OP \-\-lastgid id +.OP \-\-quiet +.OP \-\-verbose +.B group +.YS +.SY addgroup +.B \-\-system .OP \-\-gid id -.OP group +.OP \-\-conf file +.OP \-\-quiet +.OP \-\-verbose +.B group +.YS +.SY adduser +.OP \-\-conf file +.OP \-\-debug +.OP \-\-quiet +.OP \-\-verbose +.B user +.B group +.YS .SY adduser -.OP [options] -.OP user -.OP group" +.B \-\-help +.YS +.SY adduser +.B \-\-version .YS .SH DESCRIPTION -.PP \fBadduser\fP and \fBaddgroup\fP add users and groups to the system -according to command line options and configuration information in -\fI/etc/adduser.conf\fP. -They are friendlier front ends to the low level tools like +according to command line options +and configuration information in \fI/etc/adduser.conf\fP. +They are friendlier front ends to the low level tools like \fBuseradd\fP, \fBgroupadd\fP and \fBusermod\fP programs, -by default choosing Debian policy conformant UID and GID values, -creating a home directory with skeletal configuration, running a custom -script, and other features. -.PP -\fBadduser\fP and \fBaddgroup\fP are intended as a policy layer, making it -easier for package maintainers and local administrators to create local system -accounts in the way Debian expects them to be created, taking the burden to -adapt to the probably changing specifications of Debian policy. \fBadduser ---system\fP takes special attention on just needing a single call in the -package maintainer scripts without any conditional wrappers, error suppression -or other scaffolding. -.PP -\fBadduser\fP honors the distinction between \fIdynamically allocated system -users and groups\fP and \fIdynamically allocated user accounts\fP that is -documented in Debian Policy, Chapter 9.2.2. +by default choosing Debian policy conformant UID and GID values, +creating a home directory with skeletal configuration, +running a custom script, +and other features. +.PP +\fBadduser\fP and \fBaddgroup\fP are intended as a policy layer, +making it easier for package maintainers and local administrators +to create local system accounts +in the way Debian expects them to be created, +taking the burden to adapt to the probably changing specifications +of Debian policy. +\fBadduser \-\-system\fP takes special attention +on just needing a single call in the package maintainer scripts +without any conditional wrappers, +error suppression or other scaffolding. +.PP +\fBadduser\fP honors the distinction between +\fIdynamically allocated system users and groups\fP +and +\fIdynamically allocated user accounts\fP +that is documented in Debian Policy, Chapter 9.2.2. +.PP +For a full list and explanations of all options, +see the OPTIONS section. .PP \fBadduser\fP and \fBaddgroup\fP can be run in one of five modes: .SS "Add a normal user" -If called with one non-option argument and without the -\fB\-\-system\fP or \fB\-\-group\fP options, \fBadduser\fP -will add a normal user, that means a \fIdynamically allocated user -account\fP in the sense of Debian Policy. This is commonly referred to -in \fBadduser\fP as a \fInon-system user.\fP - -\fBadduser\fP will choose the first available UID from the -range specified for normal users in the configuration file. -The UID can be overridden with the \fB\-\-uid\fP option. - -The range specified in the configuration file may be overridden with the +If called with one non-option argument and +without the \fB\-\-system\fP or \fB\-\-group\fP options, +\fBadduser\fP will add a normal user, +that means a +\fIdynamically allocated user account\fP +in the sense of Debian Policy. +This is commonly referred to in \fBadduser\fP as a \fInon-system user.\fP +.PP +\fBadduser\fP will choose the first available UID +from the range specified by +\fBFIRST_UID\fP and \fBLAST_UID\fP +in the configuration file. +The range may be overridden with the \fB\-\-firstuid\fP and \fB\-\-lastuid\fP options. - -By default, each user in Debian GNU/Linux is given a corresponding -group with the same name. -Usergroups allow group writable directories to be easily maintained -by placing the appropriate users in the new group, setting the -set-group-ID bit in the directory (which is on by default), and ensuring -that all users use a umask of 002. -If \fBUSERS_GID\fP or \fBUSERS_GROUP\fP are set, the newly -created user is placed in the referenced group as a supplemental -group. . Setting both \fBUSERS_GID\fP and \fBUSERS_GROUP\fP is an -error even if the settings are consistent. -If \fBUSERGROUPS\fP is \fIno\fP, all users get the group defined -by \fBUSERS_GID\fP or \fBUSERS_GROUP\fP as their primary group. -Users' primary groups can also be overridden from the command -line with the \fB\-\-gid\fP or \fB\-\-ingroup\fP options -to set the group by id or name, respectively. -Also, users can be added to one or more supplemental groups defined in -\fIadduser.conf\fP either by setting \fBADD_EXTRA_GROUPS\fP -to 1 in \fIadduser.conf\fP, or by passing \fB\-\-add\-extra\-groups\fP -on the commandline. - -\fBadduser\fP will create a home directory subject to -\fBDHOME\fP, \fBGROUPHOMES\fP, and \fBLETTERHOMES\fP. -The home directory can be overridden from the command line with the -\fB\-\-home\fP option, and the shell with the \fB\-\-shell\fP -option. -The home directory's set-group-ID bit is set if \fBUSERGROUPS\fP -is \fIyes\fP so that any files created in the user's home -directory will have the correct group. - -\fBadduser\fP will copy files from \fBSKEL\fP -into the home directory and prompt for finger (GECOS) information and -a password. The GECOS field may also be set with the \fB\-\-gecos\fP -option. -With the \fB\-\-disabled-login\fP option, the account will be created -but will be disabled until a password is set. -The \fB\-\-disabled-password\fP option will not set a password, -but login is still possible (for example with SSH keys). - -If the file \fI/usr/local/sbin/adduser.local\fP exists, -it will be executed after the user account has been set -up in order to do any local setup. -.PP -\fBadduser.local\fP is also the place where local administrators -can place their code to interact with directory services, should -they desire to. -.PP -The arguments passed to \fBadduser.local\fP are: -.br -\fIusername uid gid home-directory\fP -.PP -The environment variable \fBVERBOSE\fP is set according -to the following rule: -.TP -0 -if \fB\-\-quiet\fP is specified -.TP -1 -if neither \fB\-\-quiet\fP nor \fB\-\-debug\fP is specified -.TP -2 -if \fB\-\-debug\fP is specified -.PP -(The same applies to the variable \fBDEBUG\fP, but -\fBDEBUG\fP is deprecated and will be removed in a later -version of \fBadduser\fP.) +Finally, the UID can be set fully manually with the \fB\-\-uid\fP option. +.PP +By default, each user is given a corresponding group with the same name. +This is commonly called +\fIUsergroups\fP +and allows group writable directories to be easily maintained +by placing the appropriate users in the new group, +setting the set-group-ID bit in the directory, +and ensuring that all users use a umask of 002. +.PP +For a usergroup, +\fBadduser\fP will choose the first available GID +from the range specified by +\fBFIRST_GID\fP and \fBLAST_GID\fP +in the configuration file. +The range may be overridden with the +\fB\-\-firstgid\fP and \fB\-\-lastgid\fP options. +Finally, the GID can be set fully manually with the \fB\-\-gid\fP option. +.PP +The interaction between +\fBUSERS_GID\fP, \fBUSERS_GROUP\fP, and \fBUSERGROUPS\fP +is explained in detail in +.BR adduser.conf (5). +.PP +Users' primary groups can also be overridden +from the command line +with the \fB\-\-gid\fP or \fB\-\-ingroup\fP options +to set the group by id or name, +respectively. +Also, +users can be added +to one or more supplemental groups +defined as \fBEXTRA_GROUPS\fP in the configuration file +either by setting \fBADD_EXTRA_GROUPS\fP to 1 +in the configuration file, +or by passing \fB\-\-add\-extra\-groups\fP on the command line. +.PP +\fBadduser\fP will copy files from \fI/etc/skel\fP +into the home directory and +prompt for the comment field and a password +if those functions have not been turned off / overridden +from the command line. +.PP +UID, comment, home directory and shell +might be pre-determined with the \fBUID_POOL\fP and \fBGID_POOL\fP option, +documented in +.BR adduser.conf (5). .SS "Add a system user" -If called with one non-option argument and the \fB\-\-system\fP -option, \fBadduser\fP will add a \fIdynamically allocated system -user,\fP often abbreviated as \fIsystem user\fP in the context -of the \fBadduser\fP package. -If a user with the same name already exists in the system uid -range (or, if the uid is specified, if a user with that -uid already exists), \fBadduser\fP will exit with a warning. -This warning can be suppressed by adding \fB\-\-quiet\fP. - -\fBadduser\fP will choose the first available UID from the range -specified for \fIsystem users\fP in the configuration file -(\fBFIRST_SYSTEM_UID\fP and \fBLAST_SYSTEM_UID\fP). -If you want to have a specific UID, you can specify it using the -\fB\-\-uid\fP option. - -By default, system users are placed in the -\fBnogroup\fP group. -To place the new system user in an already existing group, use -the \fB\-\-gid\fP or \fB\-\-ingroup\fP options. -To place the new system user in a new group with the same ID, use -the \fB\-\-group\fP option. - -A home directory should be specified using the \fB\%\-\-home\fP -option. If not specified, the default home directory for a new -system user is \fI\%/nonexistent\fP. This directory should never -exist on any Debian system, and \fB\%adduser\fP will not create it -automatically. - -The new system user will have the shell \fI/usr/sbin/nologin\fP -(unless overridden with the \fB\-\-shell\fP option). -Standard UNIX password logins will be disabled for the new system -user; however, logins by other means (for example, via SSH) are still allowed. +If called with one non-option argument and the \fB\-\-system\fP option, +\fBadduser\fP will add a +\fIdynamically allocated system user,\fP +often abbreviated as +\fIsystem user\fP +in the context of the \fBadduser\fP package. +.PP +\fBadduser\fP will choose the first available UID +from the range specified by +\fBFIRST_SYSTEM_UID\fP and \fBLAST_SYSTEM_UID\fP +in the configuration file. +This can be overridden with the \fB\-\-uid\fP option. +.PP +By default, system users are placed in the \fBnogroup\fP group. +To place the new system user in an already existing group, +use the \fB\-\-gid\fP or \fB\-\-ingroup\fP options. +If the \fB\-\-group\fP is given +and the identically named group does not already exist, +it is created with the same ID. +.PP +If no home directory is specified, +the default home directory for a new system user +is \fI\%/nonexistent\fP. +This directory should never exist on any Debian system, +and \fBadduser\fP will never create it automatically. +.PP +Unless a shell is explicitly set with the \fB\-\-shell\fP option, +the new system user will have the shell set to +\fI/usr/sbin/nologin\fP. +\fBadduser \-\-system\fP does not set a password for the new account. Skeletal configuration files are not copied. -.SS "Add a user group" -If \fBadduser\fP is called with the \fB\-\-group\fP option and -without the \fB\-\-system\fP option, or \fBaddgroup\fP is called -respectively, a user group will be added. - - -A GID will be chosen from the range specified for system GIDs in the -configuration file (\fBFIRST_GID\fP, \fBLAST_GID\fP). -To override that mechanism you can give the GID using the -\fB\-\-gid\fP option. - -The range specified in the configuration file may be overridden with the -\fB\-\-firstgid\fP and \fB\-\-lastgid\fP options. +.PP +Other options will behave as for the creation of a normal user. +The files referenced by \fBUID_POOL\fP and \fBGID_POOL\fP do also work. -The group is created with no users. -.SS "Add a system group" -If \fBaddgroup\fP is called with the \fB\-\-system\fP option, -a \fIdynamically allocated system group,\fP often abbreviated -as \fIsystem group\fP in the context of the \fBadduser\fP package, -will be created. - -A GID will be chosen from the range specified for system GIDs in the -configuration file (\fBFIRST_SYSTEM_GID\fP, \fBLAST_SYSTEM_GID\fP). -To override that mechanism you can give the GID using the -\fB\-\-gid\fP option. -The system group is created with no users. +.SS "Add a group" +If \fBadduser\fP is called with the \fB\-\-group\fP option and +without the \fB\-\-system\fP option, or +\fBaddgroup\fP is called respectively, +a user group will be added. +.PP +A +\fIdynamically allocated system group,\fP +often abbreviated as \fIsystem group\fP +in the context of the \fBadduser\fP package, +will be created +if \fBadduser\fP is called with the \fB\-\-system\fP option. +.PP +A GID will be chosen from the respective range specified for GIDs +in the configuration file +(\fBFIRST_GID\fP, \fBLAST_GID\fP, +\fBFIRST_SYSTEM_GID\fP, \fBLAST_SYSTEM_GID\fP). +To override that mechanism, +you can give the GID using the \fB\-\-gid\fP option. +.PP +For non-system groups, +the range specified in the configuration file may be overridden +with the \fB\-\-firstgid\fP and \fB\-\-lastgid\fP options. +.PP +The group is created with no members. .SS "Add an existing user to an existing group" -If called with two non-option arguments, \fBadduser\fP -will add an existing user to an existing group. +If called with two non-option arguments, +\fBadduser\fP will add an existing user to an existing group. + .SH OPTIONS +Different modes of \fBadduser\fP allow different options. +If no valid modes are listed for a option, +it is accepted in all modes. +.PP +Short versions for certain options may exist for historical reasons. +They are going to stay supported, but are removed from the documentation. +Users are advised to migrate to the long version of options. .TP -.BR "\-c \fIfile", "\-\-conf \fIfile" -Use \fIfile\fP instead of \fI/etc/adduser.conf\fP. +.B \-\-add\-extra\-groups +Add new user to extra groups defined in the configuration files' +\fBEXTRA_GROUPS\fP setting. +The old spelling \fB\-\-add_extra_groups\fP is deprecated and +will be supported in Debian bookworm only. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP -.B \-\-disabled-login -Do not run \fBpasswd\fP to set the password. -The user won't be able to use her account until the password is set. -.TP -.B \-\-disabled-password -Like \fB\-\-disabled-login\fP, but logins are still possible -(for example using SSH keys) but not using password authentication. +.B \-\-allow\-all\-names +Allow any user- and groupname which is supported by the underlying +\fBuseradd\fP(8), including names containing non-ASCII characters. +See VALID NAMES in +.BR adduser.conf (5). +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +\fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP -.B \-\-allow\-badname -By default, user and group names are checked against the configurable -regular expression \fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP specified -in the configuration file. This option forces \fBadduser\fP and -\fBaddgroup\fP to apply only a weak check for validity of the name. -\fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP are described in +.B \-\-allow\-bad\-names +Disable \fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP check of names. +Only a weaker check for validity of the name is applied. +See VALID NAMES in .BR adduser.conf (5). +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +\fBaddgroup\fP, \fBaddgroup \-\-system\fP. +.TP +.BI \-\-comment " comment " +Set the comment field for the new entry generated. +\fBadduser\fP will not ask for the information if this option is given. +This field is also known under the name GECOS field +and contains information that is used by the \fBfinger\fR(1) command. +This used to be the \fB\-\-gecos\fR option, +which is deprecated and will be removed after Debian bookworm. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +.TP +.BI \-\-conf " file " +Use \fIfile\fP instead of \fI/etc/adduser.conf\fP. +Multiple \fB\-\-conf\fR options can be given. +.TP +.BR \-\-debug +Activate debugging code. +.TP +.B \-\-disabled\-login +.TQ +.B \-\-disabled\-password +Do not run \fBpasswd\fP(1) to set a password. +In most situations, logins are still possible though +(for example using SSH keys or through PAM) +for reasons that are beyond \fBadduser\fP's scope. +\fB\-\-disabled\-login\fP will additionally set the shell to +\fI/usr/sbin/nologin\fP. +Valid Mode: \fBadduser\fP. +.TP +.BI \-\-firstuid " ID " +.TQ +.BI \-\-lastuid " ID " +.TQ +.BI \-\-firstgid " ID " +.TQ +.BI \-\-lastgid " ID " +Override the first UID / last UID / first GID / last GID +in the range that the uid is chosen from +(\fBFIRST_UID\fP, \fBLAST_UID\fP, \fBFIRST_GID\fP and \fBLAST_GID\fP, +\fBFIRST_SYSTEM_UID\fP, \fBLAST_SYSTEM_UID\fP, +\fBFIRST_SYSTEM_GID\fP and \fBLAST_SYSTEM_GID\fP +in the configuration file). +If a group is created as a usergroup, +\fB\-\-firstgid\fP and \fB\-\-lastgid\fP +are ignored. +The group gets the same ID as the user. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +for \fP\-\-firstgid\fP and \fB\-\-lastgid\fR also +\fBaddgroup\fP. .TP .B \-\-force\-badname -This is the deprecated form of \-\-allow\-badname. It will be removed +.TQ +.B \-\-allow\-badname +These are the deprecated forms of \fB\-\-allow\-bad\-names\fR. +It will be removed during the release cycle of the Debian release after \fIbookworm\fP. .TP -.B \-\-allow\-all\-names -Bypass the weak name check which is used with \fB\-\-allow-badname\fP. -This will allow any username which is supported by the underlying -\fBuseradd\fP, including names containing non-ASCII characters. The -only restrictions enforced at this level are: cannot start with a dash, -plus sign, or tilde; and cannot contain a colon, comma, slash, or whitespace. -.TP -.BI \-\-gecos " GECOS " -Set the GECOS field for the new entry generated. -\fBadduser\fP will not ask for finger information if this option is given. -.TP .BI \-\-gid " ID " -When creating a group, this option sets the group ID number of the new -group to \fIGID\fP. When creating a user, this option sets the primary -group ID number of the new user to \fIGID\fP. -.TP -.BI \-\-ingroup " GROUP " -When creating a user, this option sets the primary group ID number of the -new user to the GID of the named \fIGROUP\fP. Unlike with the -\fB\-\-gid\fP option, the group is specified here by name rather than by -ID number. The group must already exist. +When creating a group, +this option sets the group ID number of the new group to \fIGID\fP. +When creating a user, +this option sets the primary group ID number of the new user +to \fIGID\fP. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP, +\fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP .B \-\-group -When combined with \fB\-\-system\fP , a group with the same name -and ID as the system user is created. -If not combined with \fB\-\-system\fP , a group with the given name -is created. -This is the default action if the program is invoked as \fBaddgroup\fP. +Using this option in \fBadduser --system\fP +indicates that the new user should get +an identically named group as its primary group. +If that identically named group is not already present, it is created. +If not combined with \fB\-\-system\fP, +a group with the given name is created. +The latter is the default action if +the program is invoked as \fBaddgroup\fP. +Valid Modes: \fBadduser \-\-system\fP, +\fBaddgroup\fP, \fBaddgroup \-\-system\fP. .TP -.BR \-h ", " \-\-help +.BR \-\-help Display brief instructions. .TP .BI \-\-home " dir " -Use \fIdir\fP as the user's home directory, rather than the default -specified by the configuration file. -If the directory does not exist, it is created and skeleton files are copied. +Use \fIdir\fP as the user's home directory, +rather than the default specified by the configuration file +(or \fI/nonexistent\fP if \fBadduser \-\-system\fP is used). +If the directory does not exist, it is created. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP -.BI \-\-shell " shell " -Use \fIshell\fP as the user's login shell, rather than the default specified -by the configuration file. +.BI \-\-ingroup " GROUP " +When creating a user, +this option sets the primary group ID number of the new user +to the GID of the named group. +Unlike with the \fB\-\-gid\fP option, +the group is specified here by name rather than by numeric ID number. +The group must already exist. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP -.B \-\-no-create-home -Do not create a home directory for the new user. Note that the path -name for the new user's home directory will still be entered in the -appropriate field in the \fI\%/etc/passwd\fP file. The use of this -option does not imply that this field should be empty. Rather, it -indicates to \fB\%adduser\fP that some other mechanism will be -responsible for initializing the new user's home directory if it is -to exist. +.BI \-\-lastuid " ID " +.TQ +.BI \-\-lastgid " ID " +Override the last UID / last GID. +See \fB\-\-firstuid\fP. .TP -.BR \-q ", " \-\-quiet +.B \-\-no\-create\-home +Do not create a home directory for the new user. +Note that the pathname for the new user's home directory +will still be entered in the appropriate field +in the \fI\%/etc/passwd\fP file. +The use of this option does not imply that this field should be empty. +Rather, it indicates to \fB\%adduser\fP +that some other mechanism will be responsible +for initializing the new user's home directory. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. +.TP +.BR \-\-quiet Suppress informational messages, only show warnings and errors. .TP -.BR \-d ", " \-\-debug -Be verbose, most useful if you want to nail down a problem -with \fBadduser\fP. +.BI \-\-shell " shell " +Use \fIshell\fP as the user's login shell, +rather than the default specified by the configuration file +(or \fI/usr/sbin/nologin\fP if \fBadduser \-\-system\fP is used). +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP .B \-\-system -Nomally, \fBadduser\fP creates \fIdynamically allocated user accounts and -groups\fP as defined in Debian Policy, Chapter 9.2.2. With this option, -\fBadduser\fP creates a \fIdynamically allocated system user and group.\fP +Nomally, \fBadduser\fP creates +\fIdynamically allocated user accounts and groups\fP +as defined in Debian Policy, Chapter 9.2.2. +With this option, \fBadduser\fP creates a +\fIdynamically allocated system user and group\fP +and changes its mode respectively. +Valid Modes: \fBadduser\fP, \fBaddgroup\fP. .TP .BI \-\-uid " ID " Force the new userid to be the given number. \fBadduser\fP will fail if the userid is already taken. +Valid Modes: \fBadduser\fP, \fBadduser \-\-system\fP. .TP -.BI \-\-firstuid " ID " -Override the first uid in the range that the uid is chosen from (overrides -\fBFIRST_UID\fP specified in the configuration file). -.TP -.BI \-\-lastuid " ID " -Override the last uid in the range that the uid is chosen from -(\fBLAST_UID\fP). -.TP -.BI \-\-firstgid " ID " -Override the first gid in the range that the gid is chosen from (overrides -\fBFIRST_GID\fP specified in the configuration file). -.TP -.BI \-\-lastgid " ID " -Override the last gid in the range that the gid is chosen from -(\fBLAST_GID\fP). -.TP -.B \-\-add\-extra\-groups -Add new user to extra groups defined in the configuration file. Old -spelling \-\-add_extra_groups is deprecated and will be supported in -Debian bookworm only. +.BR \-\-verbose +Be more verbose. .TP .BR \-v " , " \-\-version Display version and copyright information. @@ -340,86 +436,114 @@ Display version and copyright informatio .SH EXIT VALUES .TP -.B 0 +.B 0 Success: The user or group exists as specified. This can have 2 causes: -The user or group was created by this call to -\fBadduser\fP or the user or group was already present on the system before -\fBadduser\fP was invoked. If \fBadduser --system\fP is invoked for a -user already existing as a system user, it will also return 0. +The user or group was created by this call to \fBadduser\fP +or the user or group was already present on the system +as specified before \fBadduser\fP was invoked. +If \fBadduser \-\-system\fP is invoked for a user +already existing as a system user, it will also return 0. .TP .B 1 -Creating the non-system user or group failed because it was already present. -The username or groupname was rejected because of a mismatch with the -configured regular expressions, see +Creating the non-system user or group failed +because it was already present. +The username or groupname was rejected +because of a mismatch with the configured regular expressions, see .BR adduser.conf (5). \fBadduser\fP has been aborted by a signal. -.br -Or for many other yet undocumented reasons which are printed -to console then. -You may then consider to remove \fB\-\-quiet\fP to make -\fBadduser\fP more verbose. +.PP +Or for many other yet undocumented reasons which +are printed to console then. +You may then consider to remove \fB\-\-quiet\fP +to make \fBadduser\fP more verbose. .SH SECURITY -\fBadduser\fP needs root privileges and offers, via the \fB\-\-conf\fP -command line option to use a different configuration file. Do not use -\fBsudo\fP or similar tools to give partial privileges to \fBadduser\fP -with restricted command line parameters. This is easy to circumvent and might -allow users to create arbitrary accounts. If you want this, consider writing -your own wrapper script and giving privileges to execute that script. +\fBadduser\fP needs root privileges and offers, +via the \fB\-\-conf\fP command line option +to use different configuration files. +Do not use \fBsudo\fP(8) or similar tools to +give partial privileges to \fBadduser\fP +with restricted command line parameters. +This is easy to circumvent and might +allow users to create arbitrary accounts. +If you want this, +consider writing your own wrapper script +and giving privileges to execute that script. .SH FILES -.TP +.TP .I /etc/adduser.conf -Default configuration file for \fBadduser\fP and \fBaddgroup\fP +Default configuration file for \fBadduser\fP(8) and \fBaddgroup\fP(8) .TP .I /usr/local/sbin/adduser.local -Optional custom add-ons. +Optional custom add-ons, see +.BR adduser.local (8) +. .SH NOTES -Unfortunately, the term \fIsystem account\fP suffers from double use in Debian. -It both means an account for the actual Debian system, distinguishing itself -from an \fIapplication account\tP which might exist in the user database of -some application running on Debian. A \fPsystem account\fI in this definition -has the potential to log in to the actual system, has a UID, can be member in -system groups, can own files and processes. Debian Policy, au contraire, in its -Chapter 9.2.2, makes a distinguishment of \fIdynamically allocated system users -and groups\fP and \fIdynamially allocated user accounts\fP, meaning in both -cases special instances of \fIsystem accounts\fP. Care must be taken to not -confuse this terminology. Since \fBadduser\fP and \fBdeluser\fP never address -\fBapplication accounts\fP and everything in this package concerns \fBsystem -accounts\fP here, the usage of the terms \fBuser account\fP and \fBsystem -account\fP is actually not ambiguous in the context of this package. For clarity, -this document uses the definition \fIlocal system account or group\fP if -the distinction to \fIapplication accounts\fP or accounts managed in a directory -service is needed. -.PP -\fBadduser\fP used to have the vision to be the universal front end to the -various directory services for creation and deletion of regular and system -accounts in Debian since the 1990ies. This vision has been abandoned as of -2022. The rationale behind this includes: that in practice, a small -server system is not going to have write access to an enterprise-wide directory -service anyway, that locally installed packages are hard to manage with -centrally controlled system accounts, that enterprise directory services have -their own management processes anyway and that the personpower of the -\fBadduser\fP is unlikely to be ever strong enough to write or support the -plethora of directory services that need support. -.PP -\fBadduser\fP will constrict itself to being a policy layer for the management -of local system accounts, using the tools from the \fBpassword\fP package for -the actual work. +Unfortunately, the term +\fIsystem account\fP +suffers from double use in Debian. +It both means an account for the actual Debian system, +distinguishing itself from an \fIapplication account\fP +which might exist in the user database +of some application running on Debian. +A \fIsystem account\fP in this definition has the potential +to log in to the actual system, has a UID, +can be member in system groups, +can own files and processes. +Debian Policy, au contraire, in its Chapter 9.2.2, +makes a distinguishment of +\fIdynamically allocated system users and groups\fP and +\fIdynamically allocated user accounts\fP, +meaning in both cases special instances of \fIsystem accounts\fP. +Care must be taken to not confuse this terminology. +Since \fBadduser\fP and \fBdeluser\fP(8) never address +\fIapplication accounts\fP and +everything in this package concerns \fIsystem accounts\fP here, +the usage of the terms \fIuser account\fP and \fIsystem account\fP +is actually not ambiguous in the context of this package. +For clarity, this document uses the definition +\fIlocal system account or group\fP if the distinction to +\fIapplication accounts\fP or +accounts managed in a directory service is needed. +.PP +\fBadduser\fP used to have the vision to be the universal front end +to the various directory services for +creation and deletion of regular and system accounts in Debian +since the 1990ies. +This vision has been abandoned as of 2022. +The rationale behind this includes: +that in practice, +a small server system is not going to have +write access to an enterprise-wide directory service anyway, +that locally installed packages are hard to manage with +centrally controlled system accounts, +that enterprise directory services have +their own management processes anyway and +that the personpower of the \fBadduser\fP team +is unlikely to be ever strong enough to write and maintain support for +the plethora of directory services that need support. +.PP +\fBadduser\fP will constrict itself to being a policy layer +for the management of local system accounts, +using the tools from the \fBpassword\fP package for the actual work. .SH BUGS -Inconsistent use of terminology around the term \fIsystem account\fP in docs -and code is a bug. Please report this and allow us to improve our docs. +Inconsistent use of terminology around the term \fIsystem account\fP +in docs and code is a bug. +Please report this and allow us to improve our docs. .PP -\fBadduser\fP takes special attention to be directly usable in Debian -maintainer scripts without conditional wrappers, error suppression and other -scaffolding. The only thing that the package maintainer should need to code is a -check for the presence of the executable in the postrm script. The -\fBadduser\fP maintainers consider the need for additional scaffolding a -bug and encourage their fellow Debian package maintainers to file bugs against -the \fBadduser\fP package in this case. +\fBadduser\fP takes special attention to be directly usable in +Debian maintainer scripts without conditional wrappers, +error suppression and other scaffolding. +The only thing that the package maintainer should need to code +is a check for the presence of the executable in the postrm script. +The \fBadduser\fP maintainers consider the need +for additional scaffolding a bug and +encourage their fellow Debian package maintainers +to file bugs against the \fBadduser\fP package in this case. .SH SEE ALSO .BR adduser.conf (5), @@ -428,15 +552,3 @@ the \fBadduser\fP package in this case. .BR useradd (8), .BR usermod (8), Debian Policy 9.2.2. - -.SH COPYRIGHT -Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland -Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen Gran. -.br -Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original -Debian \fBadduser\fP -.br -Copyright (C) 1994 Ian Murdock. -\fBadduser\fP is free software; see the GNU General Public Licence -version 2 or later for copying conditions. -There is \fIno\fP warranty. diff -pruN 3.129/doc/adduser.conf.5 3.134/doc/adduser.conf.5 --- 3.129/doc/adduser.conf.5 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/doc/adduser.conf.5 2023-05-25 15:54:35.000000000 +0000 @@ -1,175 +1,263 @@ -.\" Adduser and this manpage are copyright 1995 by Ted Hajek +.\" Copyright: 1995 Ted Hajek +.\" 2000-2003 Roland Bauerschmidt +.\" 2004-2022 Marc Haber +.\" 2006-2008 Stephen Gran +.\" 2007 Jörg Hoh +.\" 2016 Afif Elghraoui +.\" 2016 Helge Kreutzmann +.\" 2021 Jason Franklin +.\" 2022 Matt Barry .\" -.\" This is free software; see the GNU General Public Lisence version 2 +.\" This is free software; see the GNU General Public License version 2 .\" or later for copying conditions. There is NO warranty. .TH ADDUSER.CONF 5 "" "Debian GNU/Linux" .SH NAME -/etc/adduser.conf \- configuration file for -.BR adduser (8) -and -.BR addgroup (8). +/etc/adduser.conf \- configuration file for +.BR adduser (8) +and +.BR addgroup (8) .SH DESCRIPTION The file \fI/etc/adduser.conf\fP contains defaults for the programs -.BR adduser (8), +.BR adduser (8), .BR addgroup (8), .BR deluser (8) -and +and .BR delgroup (8). Each line holds a single value pair in the form \fIoption\fP = \fIvalue\fP. -Double or single quotes are allowed around the value, as is whitespace -around the equals sign. +Double or single quotes are allowed around the value, +as is whitespace around the equals sign. Comment lines must have a hash sign (#) in the first column. - +.PP The valid configuration options are: .TP -.B DSHELL -The login shell to be used for all new users. -Defaults to \fI/bin/bash\fP. +.B ADD_EXTRA_GROUPS +Setting this to something other than 0 +will cause \fBadduser\fP to add +newly created non-system users +to the list of groups defined by \fBEXTRA_GROUPS\fP (below). +Defaults to \fI0\fP. +.TP +.B DIR_MODE +The permissions mode for home directories of non-system users +that are created by \fBadduser\fP(8). +Defaults to \fI0700\fP. +Note that there are potential configurations +(such as /~user web services, or in-home mail delivery) +which will require changes to the default. +See also \fBSYS_DIR_MODE\fP. .TP .B DHOME The directory in which new home directories should be created. Defaults to \fI/home\fP. .TP -.B GROUPHOMES -If this is set to \fIyes\fP, the home directories will be created as -\fI/home/groupname/user\fP. -Defaults to \fIno\fP. +.B DSHELL +The login shell to be used for all new users. +Defaults to \fI/bin/bash\fP. .TP -.B LETTERHOMES -If this is set to \fIyes\fP, then the home directories created will -have an extra directory inserted which is the first letter -of the loginname. -For example: \fI/home/u/user\fP. -Defaults to \fIno\fP. +.B EXTRA_GROUPS +This is the space-separated list of groups that +new non-system users will be added to. +Defaults to \fIusers\fP. +.TP +.B FIRST_SYSTEM_GID " and " LAST_SYSTEM_GID +specify an inclusive range of GIDs from which GIDs +for system groups can be dynamically allocated. +Defaults to \fI100\fP - \fI999\fP. +.TP +.B FIRST_GID " and " LAST_GID +specify an inclusive range of GIDs from which GIDs +for non-system groups can be dynamically allocated. +Defaults to \fI1000\fP - \fI59999\fP. +.TP +.B FIRST_SYSTEM_UID " and " LAST_SYSTEM_UID +specify an inclusive range of UIDs from which UIDs +for system users can be dynamically allocated. +Defaults to \fI100\fP - \fI999\fP. +Please note that system software, +such as the users allocated by the \fIbase-passwd\fP package, +may assume that UIDs less than 100 are unallocated. +.TP +.B FIRST_UID " and " LAST_UID +specify an inclusive range of UIDs from which UIDs +for non-system users can be dynamically allocated. +Defaults to \fI1000\fP - \fI59999\fP. .TP -.B SKEL -The directory from which skeletal user configuration files should be -copied. Defaults to \fI/etc/skel\fP. +.B GID_POOL +See \fBUID_POOL\fP. .TP -.BR FIRST_SYSTEM_UID " and " LAST_SYSTEM_UID -specify an inclusive range of UIDs from which system UIDs can be -dynamically allocated. -Default to \fI100\fP - \fI999\fP. -Please note that system software, such as the users allocated by the -base-passwd package, may assume that UIDs less than 100 are unallocated. -.TP -.BR FIRST_UID " and " LAST_UID -specify an inclusive range of UIDs from which normal user's UIDs can -be dynamically allocated. -Default to \fI1000\fP - \fI59999\fP. -.TP -.BR FIRST_SYSTEM_GID " and " LAST_SYSTEM_GID -specify an inclusive range of GIDs from which system GIDs can be -dynamically allocated. -Default to \fI100\fP - \fI999\fP. -.TP -.BR FIRST_GID " and " LAST_GID -specify an inclusive range of GIDs from which normal group's GIDs can -be dynamically allocated. -Default to \fI1000\fP - \fI59999\fP. +.B GROUPHOMES +If this is set to \fIyes\fP, +the home directories will be created as \fI/home/groupname/user\fP. +Defaults to \fIno\fP. This option is \fBdeprecated\fP and will be removed. +.TP +.B LAST_GID +.TQ +.B LAST_SYSTEM_GID +.TQ +.B LAST_UID +.TQ +.B LAST_SYSTEM_UID +See the \fBFIRST_\fP variants of the option. .TP -.B USERGROUPS -If this is set to \fIyes\fP, then each created non-system user will -be given their own group to use. -The default is \fIyes\fP. -.TP -.B USERS_GID -.B USERS_GROUP -Defines the group name or GID of the group all newly-created non-system users -are placed into. If \fBUSERGROUPS\fP is \fIyes,\fP the group will be added as -a supplementary group; if \fBUSERGROUPS\fP is \fIno,\fP, it will be the -primary group. If you don't want all your users to be in one group, set -\fBUSERGROUPS\fP is \fIyes\fP, leave \fBUSERS_GROUP\fP empty and set -\fBUSERS_GID\fP to "-1". -The default value of USERS_GROUP is \fIusers\fP, which has GID 100 on -all Debian systems since it's defined statically by the \fIbase-passwd\fP -package. +.B LETTERHOMES +If this is set to \fIyes\fP, +then the home directories created will have an extra directory +inserted which is the first letter of the loginname. +For example: \fI/home/u/user\fP. +Defaults to \fIno\fP. This option is \fBdeprecated\fP and will be removed. .TP -.B DIR_MODE -If set to a valid value (e.g. 0755 or 755), directories created will have -the specified permissions mode. Otherwise 2700 is used as default. -(See SYS_DIR_MODE for system users.) Note that there are potential -configurations (such as /~user web services, or in-home mail delivery) -which will require changes to the default. +.B NAME_REGEX +Non-system user- and groupnames are checked against this regular expression. +If the name doesn't match this regexp, +user and group creation in \fBadduser\fR(8) is refused +unless \fB\-\-allow\-bad\-names\fR is set. +With \fB\-\-allow\-bad\-names\fR set, +weaker checks are performed. +Defaults to the most conservative \fI^[a\-z][\-a\-z0\-9_]*$\fP. +See \fBSYS_NAME_REGXEX\fP and \fBValid names\fP, +below, for more information. .TP -\.B SYS_DIR_MODE -If set to a valid value (e.g. 0755 or 755), directories created for -system users will have the specified permissions mode. Otherwise -0755 is used as default. Note that changing the default permissions -for system users may cause some packages to behave unreliably, if -the program relies on the default setting. +.B QUOTAUSER +If set to a nonempty value, +new users will have quotas copied from that user using +\fIedquota -p QUOTAUSER newuser\fP. +Defaults to \fIthe empty string\fP. .TP .B SETGID_HOME -If this is set to \fIyes\fP, then home directories for users with -their own group (\fBUSERGROUPS\fP = yes) will have the setgid bit set. -This is the default setting for normal -user accounts. If you set this to "no", you should also change the -value of DIR_MODE, as the default (2700) sets this bit regardless. Note -that this feature is \fBdeprecated\fP and will be removed in a future -version of \fBadduser\fP. +If this is set to \fIyes\fP, +then home directories for users with +their own group (\fBUSERGROUPS\fP = yes) +will have the set-group-ID bit set. +Note that this feature is \fBdeprecated\fP and +will be removed in a future version of \fBadduser\fP(8). Please use \fBDIR_MODE\fP instead. +Defaults to \fIno\fP. .TP -.B QUOTAUSER -If set to a nonempty value, new users will have quotas copied from -that user. -The default is empty. -.TP -.B NAME_REGEX -User and group names are checked against this regular expression. If the name -doesn't match this regexp, user and group creation in adduser is refused unless ---allow-badname is set. With --allow-badname set, only weak checks are -performed. The default is the most conservative ^[a-z][-a-z0-9_]*$. See -\fBValid names\fP, below, for more information. -.TP -.B SYS_NAME_REGEX -System user and group names are checked against this regular expression. If -this variable is not set, it falls back to the default value. -If the name doesn't match this regexp, system -user and group creation in adduser is refused unless --allow-badname is -set. With --allow-badname set, only weak checks are performed. The default -is the most conservative ^[a-z_][-a-z0-9_]*$. See -\fBValid names\fP, below, for more information. +.B SKEL +The directory from which +skeletal user configuration files will be copied. +Defaults to \fI/etc/skel\fP. .TP .B SKEL_IGNORE_REGEX -Files in \fI/etc/skel/\fP are checked against this regex, and not -copied to the newly created home directory if they match. -This is by default set to the regular expression matching files left over -from unmerged config files (dpkg-(old|new|dist)). +When populating the newly created home directory of a non-system user, +files in SKEL matching this regex are not copied. +Defaults to to +\fI(.(dpkg|ucf)\-(old|new|dist)$)\fP, +the regular expression matching files left over from unmerged config files. +.TP +.B SYS_DIR_MODE +The permissions mode for home directories of system users +that are created by \fBadduser\fP(8). +Defaults to \fI0755\fP. +Note that changing the default permissions for system users +may cause some packages to behave unreliably, +if the program relies on the default setting. +See also \fBDIR_MODE\fP. .TP -.B ADD_EXTRA_GROUPS -Setting this to something other than 0 (the default) will cause -\fBadduser\fP to add newly created non-system users to the list of -groups defined by \fBEXTRA_GROUPS\fP (below). +.B SYS_NAME_REGEX +System user- and groupnames are checked against this regular expression. +If the name doesn't match this regexp, +system user and group creation in adduser is refused +unless \fB\-\-allow\-bad\-names\fP is set. +With \fB\-\-allow\-bad\-names\fP set, +weaker checks are performed. +Defaults to the most conservative \fI^[a\-z_][\-a\-z0\-9_]*$\fP. +See \fBNAME_REGEX\fP, above, and \fBValid names\fP, +below, for more information. +.TP +.B UID_POOL " and " GID_POOL +specify a file or a directory containing UID and GID pool files. +See UID and GID POOLS in the NOTES section. +Both default to \fIempty\fP. .TP -.B EXTRA_GROUPS -This is the space-separated list of groups that new non-system users -will be added to. +.B USERGROUPS +Specify whether each created non-system user will be +given their own group to use. +Defaults to \fIyes\fP. +.TP +.B USERS_GID " and " USERS_GROUP +Defines the groupname or GID of the group +all newly-created non-system users are placed into. +If \fBUSERGROUPS\fP is \fIyes,\fP +the group will be added as a supplementary group; +if \fBUSERGROUPS\fP is \fIno,\fP, +it will be the primary group. +If you don't want all your users to be in one group, +set \fBUSERGROUPS\fP=\fIyes\fP, +leave \fBUSERS_GROUP\fP empty and set \fBUSERS_GID\fP to "\-1". +\fBUSERS_GROUP\fP defaults to \fIusers\fP, +which has GID 100 on all Debian systems since +it's defined statically by the \fIbase-passwd\fP package. +It is a configuration error to define both variables +even if the values are consistent. .SH NOTES -.TP -.B VALID NAMES -.TP -Historically, \fBadduser\fP and \fBaddgroup\fP enforced conformity -to IEEE Std 1003.1-2001, which allows only the following characters -to appear in group and user names: letters, digits, underscores, -periods, at signs (@) and dashes. +.SS VALID NAMES +Historically, +\fBadduser\fP(8) and \fBaddgroup\fP(8) enforced +conformity to IEEE Std 1003.1-2001, +which allows only the following characters to appear +in group- and usernames: +letters, digits, underscores, periods, at signs (@) and dashes. The name may not start with a dash or @. -The "$" sign is allowed at the end of usernames (to conform to samba). -.TP -The default settings for \fBNAME_REGEX\P and \fBSYS_NAME_REGEX\fP -allow usernames to contain lowercase letters and numbers, plus dash (-) -and underscore (_); the name must begin with a letter (or an underscore -for system users). -.TP -The least restrictive policy, available by using the \fB\-\-allow-all-names\fP -option, simply makes the same checks as \fBuseradd\fP: cannot start with a dash, -plus sign, or tilde; and cannot contain a colon, comma, slash, or whitespace. -.TP -This option can be used to create confusing or misleading names; use -it with caution. -.TP -Please note that regardless of the regular expressions used to evaluate -the username, it may be a maximum of 32 bytes; this may be less than 32 -visual characters when using Unicode glyphs in the username. +The "$" sign is allowed at the end of usernames +to allow typical Samba machine accounts. +.PP +The default settings for \fBNAME_REGEX\fP and \fBSYS_NAME_REGEX\fP +allow usernames to contain lowercase letters and numbers, +plus dash (\-) and underscore (_); +the name must begin with a letter +(or an underscore for system users). +.PP +The least restrictive policy, +available by using the \fB\-\-allow-all-names\fP option, +simply makes the same checks as \fBuseradd\fP(8): +cannot start with a dash, plus sign, or tilde; +and cannot contain a colon, comma, slash, or whitespace. +.PP +This option can be used to create confusing or misleading names; +use it with caution. +.PP +Please note that regardless of +the regular expressions used to evaluate the username, +it may be a maximum of 32 bytes; +this may be less than 32 visual characters +when using Unicode glyphs in the username. +.SS UID AND GID POOLS +Some installations desire that a non-system account +gets preconfigured properties when it is generated. +Commonly, the local admin wants to make sure +that even without using a directory service, +an account or a group with a certain name +has the same numeric UID/GID on all systems +where it exists. +.PP +To enable this feature, +define configuration variables \fBUID_POOL\fP (for user accounts) +and/or \fBGID_POOL\fP (for groups) in \fI/etc/adduser.conf\fP and +install the respective files in the configured places. +The value is either a file or a directory. +In the latter case all files named \fI*.conf\fP +in that directory are considered. +.PP +The file format is similar to \fI/etc/passwd\fP: +Text lines, fields separated by a colon. +The values are +username/groupname (mandatory), +UID/GID (mandatory), +comment field (optional, useful for user IDs only), +home directory (ditto), +shell (ditto). +.PP +It is possible to use the same file/directory for +\fBUID_POOL\fP and \fBGID_POOL\fP. +.PP +If an account / group is created, +\fBadduser\fP(8) searches in all UID/GID pool files +for a line matching the name +of the newly created account and +uses the data found there to initialize the new account +instead of using the defaults. +Settings may be overridden from the command line. .SH FILES .I /etc/adduser.conf diff -pruN 3.129/doc/adduser.local.8 3.134/doc/adduser.local.8 --- 3.129/doc/adduser.local.8 1970-01-01 00:00:00.000000000 +0000 +++ 3.134/doc/adduser.local.8 2023-05-25 15:54:35.000000000 +0000 @@ -0,0 +1,53 @@ +.\" Copyright 2022 Marc Haber +.\" +.\" This is free software; see the GNU General Public License version +.\" 2 or later for copying conditions. There is NO warranty. +.TH ADDUSER 8 "" "Debian GNU/Linux" +.SH NAME +adduser.local, deluser.local \- +hook for local actions in adduser and deluser +.SH SYNOPSIS +.SY adduser.local +.OP username +.OP uid +.OP gid +.OP home-directory +.SY deluser.local +.OP username +.OP uid +.OP gid +.OP home-directory +.YS +.SH DESCRIPTION +\fBadduser.local\fP and \fBdeluser.local\fP +can be placed by the local admin into +\fI/usr/local/sbin\fP +and will be called by +\fBadduser\fP and \fBdeluser\fP +respectively in order to do locally relevant setup +and cleanup actions. +.PP +The hooks are called while the adduser/deluser lock is active. +They must therefore not call back to adduser/deluser themselves. +.SH RETURN VALUE +Return values from the hooks are ignored. + +.SH ENVIRONMENT +.B VERBOSE +.IP 0 +if --quiet is specified +.IP 1 +if neither --quiet nor --debug is specified +.IP 2 +if --debug is specified + +.SH SEE ALSO +.BR adduser.conf (5), +.BR deluser.conf (5), +.BR adduser (8), +.BR deluser (8), +.BR groupadd (8), +.BR useradd (8), +.BR usermod (8), +Debian Policy 9.2.2. + diff -pruN 3.129/doc/deluser.8 3.134/doc/deluser.8 --- 3.129/doc/deluser.8 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/doc/deluser.8 2023-05-25 15:54:35.000000000 +0000 @@ -1,8 +1,13 @@ -.\" Copyright 1997, 1998, 1999 Guy Maor. -.\" Adduser and this manpage are copyright 1995 by Ted Hajek, -.\" With much borrowing from the original adduser copyright 1994 by -.\" Ian Murdock. -.\" +.\" Copyright: 1994 Ian A. Murdock +.\" 1995 Ted Hajek +.\" 1997-1999 Guy Maor +.\" 2000-2003 Roland Bauerschmidt +.\" 2004-2022 Marc Haber +.\" 2006-2009 Jörg Hoh +.\" 2011 Justin B Rye +.\" 2016 Helge Kreutzmann +.\" 2021-2022 Jason Franklin +.\" .\" This is free software; see the GNU General Public License version .\" 2 or later for copying conditions. There is NO warranty. .TH DELUSER 8 "" "Debian GNU/Linux" @@ -10,134 +15,209 @@ deluser, delgroup \- remove a user or group from the system .SH SYNOPSIS .SY deluser -.OP [options] -.OP \-\-no-preserve-root -.OP \-\-remove-home -.OP \-\-remove-all-files .OP \-\-backup -.OP \-\-backup-to dir -.OP user +.OP \-\-backup\-suffix str +.OP \-\-backup\-to dir +.OP \-\-conf file +.OP \-\-debug +.OP \-\-remove\-all\-files +.OP \-\-remove\-home +.OP \-\-quiet +.OP \-\-verbose +.B user +.YS +.SY deluser +.OP \-\-system +.OP \-\-backup +.OP \-\-backup\-suffix str +.OP \-\-backup\-to dir +.OP \-\-conf file +.OP \-\-debug +.OP \-\-remove\-all\-files +.OP \-\-remove\-home +.OP \-\-quiet +.OP \-\-verbose +.B user +.YS .SY deluser -.OP \-\-group -.OP [options] -.OP group +.B \-\-group +.OP \-\-conf file +.OP \-\-debug +.OP \-\-only\-if\-empty +.OP \-\-quiet +.OP \-\-verbose +.B group .SY delgroup -.OP [options] -.OP \-\-only-if-empty -.OP group -.SY deluser -.OP [options] -.OP user -.OP group +.OP \-\-system +.OP \-\-conf file +.OP \-\-debug +.OP \-\-only\-if\-empty +.OP \-\-quiet +.OP \-\-verbose +.B group +.YS +.SY deluser +.OP \-\-conf file +.OP \-\-debug +.OP \-\-quiet +.OP \-\-verbose +.B user +.B group +.YS +.SY deluser +.B \-\-help +.YS +.SY deluser +.B \-\-version .YS .SH DESCRIPTION -.PP -\fBdeluser\fP and \fBdelgroup\fP remove users and groups from the system -according to command line options and configuration information in +\fBdeluser\fP and \fBdelgroup\fP remove users and groups +from the system according to command line options +and configuration information in \fI/etc/deluser.conf\fP and \fI/etc/adduser.conf\fP. -They are friendlier front ends to the \fBuserdel\fP and \fBgroupdel\fP -programs, removing the home directory as option or even all files on the system -owned by the user to be removed, running a custom script, and other features. +.PP +They are friendlier front ends to the +\fBuserdel\fP and \fBgroupdel\fP programs, +removing the home directory as option +or even all files on the system owned by the user to be removed, +running a custom script, +and other features. +.PP +For a full list and explanations of all options, +see the OPTIONS section. +.PP \fBdeluser\fP and \fBdelgroup\fP can be run in one of three modes: -.SS "Remove a normal user" -If called with one non-option argument and without the \fB\-\-group\fP option, -\fBdeluser\fP will remove a normal user. - -By default, \fBdeluser\fP will remove the user without removing the home -directory, the mail spool or any other files on the system owned by the user. -Removing the home directory and mail spool can be achieved using the -\fB\-\-remove-home\fP option. - -The \fB\-\-remove-all-files\fP option removes all files on the system -owned by the user. -Note that if you activate both options \fB\-\-remove-home\fP will have -no effect because all files including the home directory and mail -spool are already covered by the \fB\-\-remove-all-files\fP option. - -If you want to backup all files before deleting them you can activate the -\fB\-\-backup\fP option which will create a file \fIusername.tar(.gz|.bz2)\fP -in the directory specified by the \fB\-\-backup-to\fP option -(defaulting to the current working directory). - By default, the backup archive is compressed with gzip. To change this, -the \fB\-\-backup-suffix\fP option can be set to any suffix supported by -\fBtar --auto-compress\fP (e.g. .gz, .bz2, .xz). - -The remove, suffix, and backup options can also be activated by -default in the configuration file \fIetc/deluser.conf\fP. See -.BR deluser.conf(5) -for details. - -If you want to remove the root account (uid 0), then use the -\fB\-\-no-preserve-root\fP parameter; this may prevent to remove the root -user by accident. - -If the file \fI/usr/local/sbin/deluser.local\fP exists, -it will be executed after the user account has been removed -in order to do any local cleanup. -The arguments passed to \fBdeluser.local\fP are: -.br -.I "username uid gid home-directory" +.SS "Remove a user" +If called with one non-option argument and +without the \fB\-\-group\fP option, +\fBdeluser\fP will remove a non-system user. +.PP +By default, +\fBdeluser\fP will remove the user +without removing the home directory, +the mail spool or +any other files on the system owned by the user. +Removing the home directory and mail spool +can be achieved using the \fB\-\-remove\-home\fP option. +.PP +The \fB\-\-remove\-all\-files\fP option +removes all files on the system owned by the user. +Note that if you activate both options +\fB\-\-remove\-home\fP will have no additional effect +because all files including +the home directory and mail spool +are already covered by the \fB\-\-remove\-all\-files\fP option. +.PP +If you want to backup all files before deleting them +you can activate the \fB\-\-backup\fP option +which will create a file \fIusername.tar(.gz|.bz2)\fP +in the directory specified by the \fB\-\-backup\-to\fP option. +.PP +By default, +the backup archive is compressed with \fBgzip\fP(1). +To change this, +the \fB\-\-backup\-suffix\fP option can be set +to any suffix supported by \fBtar \-\-auto\-compress\fP (e.g. .gz, .bz2, .xz). +.PP +\fBdeluser\fP will refuse to remove the root account. +.PP +If the \fB\-\-system\fP option is given on the command line, the +delete operation is actually executed only if the user is a system user. +This avoids accidentally deleting non-system users. +Additionally, +if the user does not exist, +no error value is returned. +Debian package maintainer scripts +may use this flag +to remove system users or groups +while ignoring the case where the removal already occurred. .SS "Remove a group" -If \fBdeluser\fP is called with the \fB\-\-group\fP option, or -\fBdelgroup\fP is called, a group will be removed. - -Warning: The primary group of an existing user cannot be removed. - -If the option \fB\-\-only-if-empty\fP is given, the group -won't be removed if it has any members left. +If \fBdeluser\fP is called with the \fB\-\-group\fP option, +or \fBdelgroup\fP is called, +a group will be removed. +The primary group of an existing user cannot be removed. +If the option \fB\-\-only\-if\-empty\fP is given, +the group won't be removed if it has any members left. +.PP +The \fB\-\-system\fP option adds the same functionality as for users, +respectively. .SS "Remove a user from a specific group" -If called with two non-option arguments, \fBdeluser\fP -will remove a user from a specific group. +If called with two non-option arguments, +\fBdeluser\fP will remove a user from a specific group. + .SH OPTIONS +Different modes of \fBdeluser\fP allow different options. +If no valid modes are listed for a option, +it is accepted in all modes. +.PP +Short versions for certain options may exist for historical reasons. +They are going to stay supported, but are removed from the documentation. +Users are advised to migrate to the long version of options. .TP -.BR "\-\-conf \fIfile", "\-c \fIfile\fP" -Use \fIfile\fP instead of the default files \fI/etc/deluser.conf\fP -and \fI/etc/adduser.conf\fP. +.B \-\-backup +Backup all files contained in the userhome and the mailspool file +to a file named \fIusername.tar.bz2\fP or \fIusername.tar.gz\fP. +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, .TP -.B \-\-group -Remove a group. This is the default action if the program is invoked -as \fIdelgroup\fP. +.BR "\-\-backup\-suffix "str +Select compression algorithm for a home directory backup. +Can be set to any suffix recognized by \fBtar \-\-auto\-compress\fP. +Defaults to \fI.gz\fP. +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, .TP -.BR \-\-help ", "\-h -Display brief instructions. +.BI "\-\-backup\-to "dir +Place the backup files not in the current directory but in \fIdir\fP. +This implicitly sets \fB\-\-backup\fP also. +(defaulting to the current working directory). +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, .TP -.B \-\-quiet, \-q -Suppress progress messages. +.BR "\-\-conf \fIfile\fP" +Use \fIfile\fP instead of the default files +\fI/etc/deluser.conf\fP and \fI/etc/adduser.conf\fP. +Multiple \-\-conf options may be given. .TP -.B \-\-debug -Be verbose, most useful if you want to nail down a problem. +.BR \-\-debug +Activate debugging code. .TP -.B \-\-system -Only delete if user/group is a system user/group. This avoids -accidentally deleting non-system users/groups. Additionally, if the -user does not exist, no error value is returned. Debian package maintainer -scripts may use this flag to remove system users or groups while ignoring the -case where the removal already occurred. +.B \-\-group +Remove a group. +This is the default action if the program is +invoked as \fIdelgroup\fP. +Valid Mode: \fBdeluser\fP. .TP -.B \-\-only-if-empty +.B \-\-help +Display brief instructions. +.TP +.B \-\-only\-if\-empty Only remove if no members are left. +Valid Modes: \fBdeluser --group\fP, \fBdelgroup\fP, .TP -.B \-\-backup -Backup all files contained in the userhome and the mailspool file -to a file named \fIusername.tar.bz2\fP or \fIusername.tar.gz\fP. +.B \-\-quiet +Suppress informational messages, only show warnings and errors. .TP -.BI "\-\-backup-to "dir -Place the backup files not in the current directory but in \fIdir\fP. -This implicitly sets \fB\-\-backup\fP also. +.B \-\-remove\-all\-files +Remove all files from the system owned by this user. +Note: \-\-remove\-home does not have an effect any more. +If \fB\-\-backup\fP is specified, +the files are deleted after having performed the backup. +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, .TP -.B \-\-remove-home +.B \-\-remove\-home Remove the home directory of the user and its mailspool. -If \fB\-\-backup\fP is specified, the files are deleted after -having performed the backup. +If \fB\-\-backup\fP is specified, +the files are deleted after having performed the backup. +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, .TP -.B \-\-remove-all-files -Remove all files from the system owned by this user. -Note: \-\-remove-home does not have an effect any more. -If \fB\-\-backup\fP is specified, the files are deleted after -having performed the backup. +.B \-\-system +Only delete if user/group is a system user/group. +If the user does not exist, no error value is returned. +Valid Modes: \fBdeluser\fP, \fBdeluser \-\-system\fP, +.TP +.B \-\-verbose +Be more verbose. .TP .B \-\-version Display version and copyright information. @@ -175,47 +255,39 @@ You cannot remove a user from its primar No action was performed. .TP .B 8 -The required perl 'perl' is not installed. +The suggested package 'perl' is not installed. This package is required to perform the requested actions. No action was performed. .TP .B 9 -For removing the root account the parameter \fB--no-preserve-root\fP -is required. -No action was performed. +The root account cannot be deleted. No action was performed. .SH SECURITY -\fBdeluser\fP needs root privileges and offers, via the \fB\-\-conf\fP -command line option to use a different configuration file. Do not use -\fBsudo\fP or similar tools to give partial privileges to \fBdeluser\fP -with restricted command line parameters. This is easy to circumvent and might -allow users to create arbitrary accounts. If you want this, consider writing -your own wrapper script and giving privileges to execute that script. +\fBdeluser\fP needs root privileges and offers, +via the \fB\-\-conf\fP command line option +to use different configuration files. +Do not use \fBsudo\fP(8) or similar tools to +give partial privileges to \fBdeluser\fP +with restricted command line parameters. +This is easy to circumvent and might +allow users to create arbitrary accounts. +If you want this, +consider writing your own wrapper script +and giving privileges to execute that script. .SH FILES .IR /etc/deluser.conf -Default configuration file for \fBdeluser\fP and \fBdelgroup\fP +Default configuration file for \fBdeluser\fP(8) and \fBdelgroup\fP(8) .TP .IR /usr/local/sbin/deluser.local -Optional custom add-ons. +Optional custom add-ons, see +.BR deluser.local (8) +. .SH "SEE ALSO" .BR adduser (8), .BR deluser.conf (5), +.BR deluser.local.conf (8), .BR groupdel (8), .BR userdel (8) - -.SH COPYRIGHT -Copyright (C) 2000 Roland Bauerschmidt. Modifications (C) 2004 -Marc Haber and Joerg Hoh. -This manpage and the \fBdeluser\fP program are based on \fBadduser\fP which is: -.br -Copyright (C) 1997, 1998, 1999 Guy Maor. -.br -Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original -Debian \fBadduser\fP -.br -Copyright (C) 1994 Ian Murdock. -\fBdeluser\fP is free software; see the GNU General Public Licence -version 2 or later for copying conditions. There is \fIno\fP warranty. diff -pruN 3.129/doc/deluser.conf.5 3.134/doc/deluser.conf.5 --- 3.129/doc/deluser.conf.5 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/doc/deluser.conf.5 2023-05-25 15:54:35.000000000 +0000 @@ -1,74 +1,87 @@ -.\" Adduser and this manpage are copyright 1995 by Ted Hajek +.\" Copyright: 1995 Ted Hajek +.\" 2000-2003 Roland Bauerschmidt +.\" 2004-2022 Marc Haber +.\" 2006-2007 Jörg Hoh +.\" 2011 Stephen Gran +.\" 2016 Helge Kreutzmann +.\" 2021 Jason Franklin +.\" 2022 Matt Barry .\" .\" This is free software; see the GNU General Public Lisence version 2 .\" or later for copying conditions. There is NO warranty. .TH DELUSER.CONF 5 "" "Debian GNU/Linux" .SH NAME -/etc/deluser.conf \- configuration file for \fBdeluser\fR(8) -and \fBdelgroup\fR(8). +/etc/deluser.conf \- configuration file for +\fBdeluser\fR(8) and \fBdelgroup\fR(8). .SH DESCRIPTION The file \fI/etc/deluser.conf\fR contains defaults for the programs -\fBdeluser\fR(8) and \fBdelgroup\fR(8). -Each option takes the form \fIoption\fR = \fIvalue\fR. -Double or single quotes are allowed around the value. Comment lines -must have a hash sign (#) at the beginning of the line. - -\fBdeluser\fR(8) and \fBdelgroup\fR(8) also read \fI/etc/adduser.conf\fR, -see \fBadduser.conf\fR(5); -settings in \fIdeluser.conf\fR may overwrite settings made in -\fIadduser.conf\fR. - +.B deluser\fR(8) +and +.B \fBdelgroup\fR(8). +Each line holds a single value pair in the form \fIoption\fP = \fIvalue\fP. +Double or single quotes are allowed around the value, +as is whitespace around the equals sign. +Comment lines must have a hash sign (#) in the first column. +.PP +\fBdeluser\fR(8) and \fBdelgroup\fR(8) +also read \fI/etc/adduser.conf\fR, see +.BR adduser.conf (5); +settings in \fIdeluser.conf\fR may overwrite settings made in +\fIadduser.conf\fP. +.PP The valid configuration options are: .TP -.B REMOVE_HOME -Removes the home directory and mail spool of the user to be removed. -Value may be 0 (don't delete) or 1 (do delete). -.TP -.B REMOVE_ALL_FILES -Removes all files on the system owned by the user to be removed. -If this option is activated \fBREMOVE_HOME\fR has no effect. -Values may be 0 or 1. -.TP .B BACKUP If \fBREMOVE_HOME\fR or \fBREMOVE_ALL_FILES\fR is activated, all files are backed up before they are removed. The backup file that is created defaults to \fIusername.tar(.gz|.bz2)\fR in the directory specified by the \fBBACKUP_TO\fR option. The compression method is chosen to the best that is available. -Values may be 0 or 1. +Values may be 0 or 1. Defaults to \fI0\fP. +.TP +.B BACKUP_SUFFIX +Select compression algorithm for a home directory backup. +Can be set to any suffix recognized by \fBtar \-\-auto\-compress\fP. +Defaults to \fI.gz\fP. .TP -\fBBACKUP_TO\fP +.B BACKUP_TO If .B BACKUP is activated, -.B BACKUP_TO -If \fBBACKUP\fR is activated, \fBBACKUP_TO\fR specifies the -directory the backup is written to. -Default is the current directory. +\fBBACKUP_TO\fR specifies the directory the backup is written to. +Defaults to the current directory. +.TP +.B EXCLUDE_FSTYPES +A regular expression which describes all filesystem types which should +be excluded when looking for files of a user to be deleted. Defaults +to "(proc|sysfs|usbfs|devtmpfs|devpts|afs)". .TP .B NO_DEL_PATHS A list of regular expressions, space separated. All files to be deleted in course of deleting the home directory or -user-owned files elsewhere are checked against each of these regular -expressions. +user-owned files elsewhere are checked against +each of these regular expressions. If a match is detected, the file is not deleted. -Default to a list of system directories, leaving only \fI/home\fR. +Defaults to a list of system directories, leaving only \fI/home\fR. Therefore only files below \fI/home\fR belonging to that specific user are going to be deleted. - .TP .B ONLY_IF_EMPTY Only delete a group if there are no users belonging to this group. Defaults to 0. .TP -\fBEXCLUDE_FSTYPES\fP -A regular expression which describes all file systems which should -be excluded when looking for files of a user to be deleted. Defaults -to "(proc|sysfs|usbfs|devtmpfs|devpts|afs)". +.B REMOVE_ALL_FILES +Removes all files on the system owned by the user to be removed. +If this option is activated \fBREMOVE_HOME\fR has no effect. +Values may be 0 or 1. Defaults to \fI0\fP. +.TP +.B REMOVE_HOME +Removes the home directory and mail spool of the user to be removed. +Value may be 0 (don't delete) or 1 (do delete). Defaults to \fI0\fP. .SH FILES .I /etc/deluser.conf .SH SEE ALSO -.BR adduser.conf (5), -.BR delgroup (8), +.BR adduser.conf (5), +.BR delgroup (8), .BR deluser (8) diff -pruN 3.129/doc/po4a/po/adduser.pot 3.134/doc/po4a/po/adduser.pot --- 3.129/doc/po4a/po/adduser.pot 2022-09-05 19:57:58.000000000 +0000 +++ 3.134/doc/po4a/po/adduser.pot 2023-05-25 15:54:35.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-09-06 07:52+0200\n" +"POT-Creation-Date: 2023-05-25 19:13+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,210 +17,277 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: TH -#: ../adduser.8:8 +#: ../adduser.8:16 #, no-wrap msgid "ADDUSER" msgstr "" #. type: TH -#: ../adduser.8:8 ../adduser.conf.5:5 ../deluser.8:8 ../deluser.conf.5:5 +#: ../adduser.8:16 ../adduser.conf.5:13 ../deluser.8:13 ../deluser.conf.5:12 #, no-wrap msgid "Debian GNU/Linux" msgstr "" #. type: SH -#: ../adduser.8:9 ../adduser.conf.5:6 ../deluser.8:9 ../deluser.conf.5:6 +#: ../adduser.8:17 ../adduser.conf.5:14 ../deluser.8:14 ../deluser.conf.5:13 #, no-wrap msgid "NAME" msgstr "" #. type: Plain text -#: ../adduser.8:11 +#: ../adduser.8:19 msgid "adduser, addgroup - add or manipulate users or groups" msgstr "" #. type: SH -#: ../adduser.8:11 ../deluser.8:11 +#: ../adduser.8:19 ../deluser.8:16 #, no-wrap msgid "SYNOPSIS" msgstr "" #. type: SY -#: ../adduser.8:12 ../adduser.8:29 ../adduser.8:52 +#: ../adduser.8:20 ../adduser.8:43 ../adduser.8:59 ../adduser.8:88 +#: ../adduser.8:96 ../adduser.8:99 #, no-wrap msgid "adduser" msgstr "" #. type: OP -#: ../adduser.8:13 ../adduser.8:31 ../adduser.8:44 ../adduser.8:49 -#: ../adduser.8:53 ../deluser.8:13 ../deluser.8:22 ../deluser.8:25 -#: ../deluser.8:29 +#: ../adduser.8:21 #, no-wrap -msgid "[options]" +msgid "--add-extra-groups" msgstr "" #. type: OP -#: ../adduser.8:14 ../adduser.8:32 +#: ../adduser.8:22 #, no-wrap -msgid "--home" +msgid "--allow-all-names" msgstr "" #. type: OP -#: ../adduser.8:14 ../adduser.8:32 ../deluser.8:18 +#: ../adduser.8:23 #, no-wrap -msgid "dir" +msgid "--allow-bad-names" msgstr "" #. type: OP -#: ../adduser.8:15 ../adduser.8:33 +#: ../adduser.8:24 ../adduser.8:45 #, no-wrap -msgid "--shell" +msgid "--comment" msgstr "" #. type: OP -#: ../adduser.8:15 ../adduser.8:33 +#: ../adduser.8:24 ../adduser.8:45 #, no-wrap -msgid "shell" +msgid "comment" msgstr "" #. type: OP -#: ../adduser.8:16 ../adduser.8:34 +#: ../adduser.8:25 ../adduser.8:46 ../adduser.8:61 ../adduser.8:71 +#: ../adduser.8:83 ../adduser.8:89 ../deluser.8:21 ../deluser.8:34 +#: ../deluser.8:44 ../deluser.8:52 ../deluser.8:60 #, no-wrap -msgid "--no-create-home" +msgid "--conf" msgstr "" #. type: OP -#: ../adduser.8:17 ../adduser.8:35 +#: ../adduser.8:25 ../adduser.8:46 ../adduser.8:61 ../adduser.8:71 +#: ../adduser.8:83 ../adduser.8:89 ../deluser.8:21 ../deluser.8:34 +#: ../deluser.8:44 ../deluser.8:52 ../deluser.8:60 #, no-wrap -msgid "--uid" +msgid "file" msgstr "" #. type: OP -#: ../adduser.8:17 ../adduser.8:18 ../adduser.8:19 ../adduser.8:20 -#: ../adduser.8:21 ../adduser.8:23 ../adduser.8:35 ../adduser.8:38 -#: ../adduser.8:50 +#: ../adduser.8:26 ../adduser.8:47 ../adduser.8:62 ../adduser.8:72 +#: ../adduser.8:90 ../deluser.8:22 ../deluser.8:35 ../deluser.8:45 +#: ../deluser.8:53 ../deluser.8:61 +#, no-wrap +msgid "--debug" +msgstr "" + +#. type: OP +#: ../adduser.8:27 +#, no-wrap +msgid "--disabled-login" +msgstr "" + +#. type: OP +#: ../adduser.8:28 +#, no-wrap +msgid "--disabled-password" +msgstr "" + +#. type: OP +#: ../adduser.8:29 ../adduser.8:63 ../adduser.8:73 +#, no-wrap +msgid "--firstgid" +msgstr "" + +#. type: OP +#: ../adduser.8:29 ../adduser.8:30 ../adduser.8:31 ../adduser.8:34 +#: ../adduser.8:35 ../adduser.8:39 ../adduser.8:48 ../adduser.8:54 +#: ../adduser.8:63 ../adduser.8:65 ../adduser.8:73 ../adduser.8:75 +#: ../adduser.8:82 #, no-wrap msgid "id" msgstr "" #. type: OP -#: ../adduser.8:18 +#: ../adduser.8:30 #, no-wrap msgid "--firstuid" msgstr "" #. type: OP -#: ../adduser.8:19 +#: ../adduser.8:31 ../adduser.8:48 ../adduser.8:64 ../adduser.8:74 +#: ../adduser.8:82 #, no-wrap -msgid "--lastuid" +msgid "--gid" msgstr "" #. type: OP -#: ../adduser.8:20 +#: ../adduser.8:32 ../adduser.8:50 #, no-wrap -msgid "--firstgid" +msgid "--home" msgstr "" #. type: OP -#: ../adduser.8:21 +#: ../adduser.8:32 ../adduser.8:50 ../deluser.8:20 ../deluser.8:33 #, no-wrap -msgid "--lastgid" +msgid "dir" msgstr "" #. type: OP -#: ../adduser.8:22 ../adduser.8:37 +#: ../adduser.8:33 ../adduser.8:51 #, no-wrap msgid "--ingroup" msgstr "" #. type: OP -#: ../adduser.8:22 ../adduser.8:37 ../adduser.8:46 ../adduser.8:51 -#: ../deluser.8:23 ../deluser.8:27 ../deluser.8:31 +#: ../adduser.8:33 ../adduser.8:51 #, no-wrap msgid "group" msgstr "" #. type: OP -#: ../adduser.8:23 ../adduser.8:38 ../adduser.8:45 ../adduser.8:50 +#: ../adduser.8:34 ../adduser.8:65 ../adduser.8:75 #, no-wrap -msgid "--gid" +msgid "--lastgid" msgstr "" #. type: OP -#: ../adduser.8:24 ../adduser.8:39 +#: ../adduser.8:35 #, no-wrap -msgid "--disabled-password" +msgid "--lastuid" msgstr "" #. type: OP -#: ../adduser.8:25 ../adduser.8:40 +#: ../adduser.8:36 ../adduser.8:52 #, no-wrap -msgid "--disabled-login" +msgid "--no-create-home" msgstr "" #. type: OP -#: ../adduser.8:26 ../adduser.8:41 +#: ../adduser.8:37 ../adduser.8:53 #, no-wrap -msgid "--gecos" +msgid "--shell" msgstr "" #. type: OP -#: ../adduser.8:26 ../adduser.8:41 +#: ../adduser.8:37 ../adduser.8:53 #, no-wrap -msgid "gecos" +msgid "shell" msgstr "" #. type: OP -#: ../adduser.8:27 +#: ../adduser.8:38 ../adduser.8:55 ../adduser.8:66 ../adduser.8:76 +#: ../adduser.8:84 ../adduser.8:91 ../deluser.8:25 ../deluser.8:38 +#: ../deluser.8:47 ../deluser.8:55 ../deluser.8:62 #, no-wrap -msgid "--add-extra-groups" +msgid "--quiet" msgstr "" #. type: OP -#: ../adduser.8:28 ../adduser.8:42 ../adduser.8:54 ../deluser.8:19 -#: ../deluser.8:30 +#: ../adduser.8:39 ../adduser.8:54 #, no-wrap -msgid "user" +msgid "--uid" msgstr "" #. type: OP -#: ../adduser.8:30 ../adduser.8:48 +#: ../adduser.8:40 ../adduser.8:56 ../adduser.8:67 ../adduser.8:77 +#: ../adduser.8:85 ../adduser.8:92 ../deluser.8:26 ../deluser.8:39 +#: ../deluser.8:48 ../deluser.8:56 ../deluser.8:63 #, no-wrap -msgid "--system" +msgid "--verbose" +msgstr "" + +#. type: Plain text +#: ../adduser.8:42 ../adduser.8:58 ../deluser.8:28 ../deluser.8:41 +msgid "B" +msgstr "" + +#. type: TP +#: ../adduser.8:45 ../adduser.8:82 ../adduser.8:415 ../deluser.8:213 +#, no-wrap +msgid "B<--system>" msgstr "" #. type: OP -#: ../adduser.8:36 ../deluser.8:21 +#: ../adduser.8:49 #, no-wrap msgid "--group" msgstr "" -#. type: SY -#: ../adduser.8:43 ../adduser.8:47 +#. type: TP +#: ../adduser.8:61 ../adduser.8:358 ../deluser.8:44 ../deluser.8:184 #, no-wrap -msgid "addgroup" +msgid "B<--group>" msgstr "" #. type: OP -#: ../adduser.8:45 +#: ../adduser.8:64 ../adduser.8:74 #, no-wrap msgid "ID" msgstr "" -#. type: OP -#: ../adduser.8:55 +#. type: Plain text +#: ../adduser.8:69 ../adduser.8:79 ../adduser.8:87 ../deluser.8:50 +#: ../deluser.8:58 +msgid "B" +msgstr "" + +#. type: SY +#: ../adduser.8:70 ../adduser.8:80 #, no-wrap -msgid "group\"" +msgid "addgroup" +msgstr "" + +#. type: Plain text +#: ../adduser.8:95 ../deluser.8:66 +msgid "B B" +msgstr "" + +#. type: TP +#: ../adduser.8:98 ../adduser.8:370 ../deluser.8:69 ../deluser.8:190 +#, no-wrap +msgid "B<--help>" +msgstr "" + +#. type: TP +#: ../adduser.8:101 ../deluser.8:72 ../deluser.8:221 +#, no-wrap +msgid "B<--version>" msgstr "" #. type: SH -#: ../adduser.8:57 ../adduser.conf.5:11 ../deluser.8:33 ../deluser.conf.5:9 +#: ../adduser.8:102 ../adduser.conf.5:19 ../deluser.8:73 ../deluser.conf.5:16 #, no-wrap msgid "DESCRIPTION" msgstr "" #. type: Plain text -#: ../adduser.8:67 +#: ../adduser.8:112 msgid "" "B and B add users and groups to the system according to " "command line options and configuration information in I. " @@ -231,19 +298,19 @@ msgid "" msgstr "" #. type: Plain text -#: ../adduser.8:75 +#: ../adduser.8:123 msgid "" "B and B are intended as a policy layer, making it easier " "for package maintainers and local administrators to create local system " "accounts in the way Debian expects them to be created, taking the burden to " -"adapt to the probably changing specifications of Debian policy. B takes special attention on just needing a single call in the " "package maintainer scripts without any conditional wrappers, error " "suppression or other scaffolding." msgstr "" #. type: Plain text -#: ../adduser.8:79 +#: ../adduser.8:129 msgid "" "B honors the distinction between I and I that is " @@ -251,213 +318,155 @@ msgid "" msgstr "" #. type: Plain text -#: ../adduser.8:81 +#: ../adduser.8:132 ../deluser.8:88 +msgid "For a full list and explanations of all options, see the OPTIONS section." +msgstr "" + +#. type: Plain text +#: ../adduser.8:134 msgid "B and B can be run in one of five modes:" msgstr "" #. type: SS -#: ../adduser.8:81 +#: ../adduser.8:134 #, no-wrap msgid "Add a normal user" msgstr "" #. type: Plain text -#: ../adduser.8:87 +#: ../adduser.8:142 msgid "" "If called with one non-option argument and without the B<--system> or " "B<--group> options, B will add a normal user, that means a " -"I in the sense of Debian Policy. This is " -"commonly referred to in B as a I" +"I in the sense of Debian Policy. This " +"is commonly referred to in B as a I" msgstr "" #. type: Plain text -#: ../adduser.8:91 +#: ../adduser.8:150 msgid "" -"B will choose the first available UID from the range specified for " -"normal users in the configuration file. The UID can be overridden with the " -"B<--uid> option." +"B will choose the first available UID from the range specified by " +"B and B in the configuration file. The range may be " +"overridden with the B<--firstuid> and B<--lastuid> options. Finally, the " +"UID can be set fully manually with the B<--uid> option." msgstr "" #. type: Plain text -#: ../adduser.8:94 +#: ../adduser.8:158 msgid "" -"The range specified in the configuration file may be overridden with the " -"B<--firstuid> and B<--lastuid> options." +"By default, each user is given a corresponding group with the same name. " +"This is commonly called I and allows group writable directories " +"to be easily maintained by placing the appropriate users in the new group, " +"setting the set-group-ID bit in the directory, and ensuring that all users " +"use a umask of 002." msgstr "" #. type: Plain text -#: ../adduser.8:114 +#: ../adduser.8:167 msgid "" -"By default, each user in Debian GNU/Linux is given a corresponding group " -"with the same name. Usergroups allow group writable directories to be " -"easily maintained by placing the appropriate users in the new group, setting " -"the set-group-ID bit in the directory (which is on by default), and ensuring " -"that all users use a umask of 002. If B or B are " -"set, the newly created user is placed in the referenced group as a " -"supplemental group. . Setting both B and B is an " -"error even if the settings are consistent. If B is I, all " -"users get the group defined by B or B as their " -"primary group. Users' primary groups can also be overridden from the " -"command line with the B<--gid> or B<--ingroup> options to set the group by " -"id or name, respectively. Also, users can be added to one or more " -"supplemental groups defined in I either by setting " -"B to 1 in I, or by passing " -"B<--add-extra-groups> on the commandline." +"For a usergroup, B will choose the first available GID from the " +"range specified by B and B in the configuration file. " +"The range may be overridden with the B<--firstgid> and B<--lastgid> " +"options. Finally, the GID can be set fully manually with the B<--gid> " +"option." msgstr "" #. type: Plain text -#: ../adduser.8:123 +#: ../adduser.8:172 msgid "" -"B will create a home directory subject to B, B, " -"and B. The home directory can be overridden from the command " -"line with the B<--home> option, and the shell with the B<--shell> option. " -"The home directory's set-group-ID bit is set if B is I so " -"that any files created in the user's home directory will have the correct " -"group." +"The interaction between B, B, and B is " +"explained in detail in B(5)." msgstr "" #. type: Plain text -#: ../adduser.8:132 +#: ../adduser.8:185 msgid "" -"B will copy files from B into the home directory and prompt " -"for finger (GECOS) information and a password. The GECOS field may also be " -"set with the B<--gecos> option. With the B<--disabled-login> option, the " -"account will be created but will be disabled until a password is set. The " -"B<--disabled-password> option will not set a password, but login is still " -"possible (for example with SSH keys)." +"Users' primary groups can also be overridden from the command line with the " +"B<--gid> or B<--ingroup> options to set the group by id or name, " +"respectively. Also, users can be added to one or more supplemental groups " +"defined as B in the configuration file either by setting " +"B to 1 in the configuration file, or by passing " +"B<--add-extra-groups> on the command line." msgstr "" #. type: Plain text -#: ../adduser.8:136 +#: ../adduser.8:191 msgid "" -"If the file I exists, it will be executed " -"after the user account has been set up in order to do any local setup." +"B will copy files from I into the home directory and " +"prompt for the comment field and a password if those functions have not been " +"turned off / overridden from the command line." msgstr "" #. type: Plain text -#: ../adduser.8:140 +#: ../adduser.8:196 msgid "" -"B is also the place where local administrators can place " -"their code to interact with directory services, should they desire to." -msgstr "" - -#. type: Plain text -#: ../adduser.8:142 -msgid "The arguments passed to B are:" -msgstr "" - -#. type: Plain text -#: ../adduser.8:144 ../deluser.8:81 -msgid "I" -msgstr "" - -#. type: Plain text -#: ../adduser.8:147 -msgid "The environment variable B is set according to the following rule:" -msgstr "" - -#. type: TP -#: ../adduser.8:147 -#, no-wrap -msgid "0" -msgstr "" - -#. type: Plain text -#: ../adduser.8:150 -msgid "if B<--quiet> is specified" -msgstr "" - -#. type: TP -#: ../adduser.8:150 -#, no-wrap -msgid "1" -msgstr "" - -#. type: Plain text -#: ../adduser.8:153 -msgid "if neither B<--quiet> nor B<--debug> is specified" -msgstr "" - -#. type: TP -#: ../adduser.8:153 -#, no-wrap -msgid "2" -msgstr "" - -#. type: Plain text -#: ../adduser.8:156 -msgid "if B<--debug> is specified" -msgstr "" - -#. type: Plain text -#: ../adduser.8:160 -msgid "" -"(The same applies to the variable B, but B is deprecated and " -"will be removed in a later version of B.)" +"UID, comment, home directory and shell might be pre-determined with the " +"B and B option, documented in B(5)." msgstr "" #. type: SS -#: ../adduser.8:161 +#: ../adduser.8:197 #, no-wrap msgid "Add a system user" msgstr "" #. type: Plain text -#: ../adduser.8:170 +#: ../adduser.8:204 msgid "" "If called with one non-option argument and the B<--system> option, " "B will add a I often " -"abbreviated as I in the context of the B package. If " -"a user with the same name already exists in the system uid range (or, if the " -"uid is specified, if a user with that uid already exists), B will " -"exit with a warning. This warning can be suppressed by adding B<--quiet>." +"abbreviated as I in the context of the B package." msgstr "" #. type: Plain text -#: ../adduser.8:176 +#: ../adduser.8:210 msgid "" -"B will choose the first available UID from the range specified for " -"I in the configuration file (B and " -"B). If you want to have a specific UID, you can specify it " -"using the B<--uid> option." +"B will choose the first available UID from the range specified by " +"B and B in the configuration file. This " +"can be overridden with the B<--uid> option." msgstr "" #. type: Plain text -#: ../adduser.8:183 +#: ../adduser.8:217 msgid "" "By default, system users are placed in the B group. To place the " "new system user in an already existing group, use the B<--gid> or " -"B<--ingroup> options. To place the new system user in a new group with the " -"same ID, use the B<--group> option." +"B<--ingroup> options. If the B<--group> is given and the identically named " +"group does not already exist, it is created with the same ID." msgstr "" #. type: Plain text -#: ../adduser.8:189 +#: ../adduser.8:223 msgid "" -"A home directory should be specified using the B<\\%--home> option. If not " -"specified, the default home directory for a new system user is " -"I<\\%/nonexistent>. This directory should never exist on any Debian system, " -"and B<\\%adduser> will not create it automatically." +"If no home directory is specified, the default home directory for a new " +"system user is I<\\%/nonexistent>. This directory should never exist on any " +"Debian system, and B will never create it automatically." msgstr "" #. type: Plain text -#: ../adduser.8:195 +#: ../adduser.8:229 msgid "" -"The new system user will have the shell I (unless " -"overridden with the B<--shell> option). Standard UNIX password logins will " -"be disabled for the new system user; however, logins by other means (for " -"example, via SSH) are still allowed. Skeletal configuration files are not " -"copied." +"Unless a shell is explicitly set with the B<--shell> option, the new system " +"user will have the shell set to I. B " +"does not set a password for the new account. Skeletal configuration files " +"are not copied." +msgstr "" + +#. type: Plain text +#: ../adduser.8:232 +msgid "" +"Other options will behave as for the creation of a normal user. The files " +"referenced by B and B do also work." msgstr "" #. type: SS -#: ../adduser.8:195 +#: ../adduser.8:233 #, no-wrap -msgid "Add a user group" +msgid "Add a group" msgstr "" #. type: Plain text -#: ../adduser.8:199 +#: ../adduser.8:238 msgid "" "If B is called with the B<--group> option and without the " "B<--system> option, or B is called respectively, a user group will " @@ -465,417 +474,412 @@ msgid "" msgstr "" #. type: Plain text -#: ../adduser.8:205 +#: ../adduser.8:245 msgid "" -"A GID will be chosen from the range specified for system GIDs in the " -"configuration file (B, B). To override that mechanism " -"you can give the GID using the B<--gid> option." +"A I often abbreviated as I in the context of the B package, will be created if " +"B is called with the B<--system> option." msgstr "" #. type: Plain text -#: ../adduser.8:208 +#: ../adduser.8:252 msgid "" -"The range specified in the configuration file may be overridden with the " -"B<--firstgid> and B<--lastgid> options." -msgstr "" - -#. type: Plain text -#: ../adduser.8:210 -msgid "The group is created with no users." -msgstr "" - -#. type: SS -#: ../adduser.8:210 -#, no-wrap -msgid "Add a system group" +"A GID will be chosen from the respective range specified for GIDs in the " +"configuration file (B, B, B, " +"B). To override that mechanism, you can give the GID using " +"the B<--gid> option." msgstr "" #. type: Plain text -#: ../adduser.8:215 +#: ../adduser.8:256 msgid "" -"If B is called with the B<--system> option, a I often abbreviated as I in the context " -"of the B package, will be created." +"For non-system groups, the range specified in the configuration file may be " +"overridden with the B<--firstgid> and B<--lastgid> options." msgstr "" #. type: Plain text -#: ../adduser.8:221 -msgid "" -"A GID will be chosen from the range specified for system GIDs in the " -"configuration file (B, B). To override " -"that mechanism you can give the GID using the B<--gid> option. The system " -"group is created with no users." +#: ../adduser.8:258 +msgid "The group is created with no members." msgstr "" #. type: SS -#: ../adduser.8:222 +#: ../adduser.8:259 #, no-wrap msgid "Add an existing user to an existing group" msgstr "" #. type: Plain text -#: ../adduser.8:225 +#: ../adduser.8:262 msgid "" "If called with two non-option arguments, B will add an existing " "user to an existing group." msgstr "" #. type: SH -#: ../adduser.8:225 ../deluser.8:94 +#: ../adduser.8:263 ../deluser.8:151 #, no-wrap msgid "OPTIONS" msgstr "" -#. type: TP -#: ../adduser.8:226 -#, no-wrap -msgid "B<-c >I,B<--conf >I" +#. type: Plain text +#: ../adduser.8:267 +msgid "" +"Different modes of B allow different options. If no valid modes " +"are listed for a option, it is accepted in all modes." msgstr "" #. type: Plain text -#: ../adduser.8:229 -msgid "Use I instead of I." +#: ../adduser.8:271 ../deluser.8:159 +msgid "" +"Short versions for certain options may exist for historical reasons. They " +"are going to stay supported, but are removed from the documentation. Users " +"are advised to migrate to the long version of options." msgstr "" #. type: TP -#: ../adduser.8:229 +#: ../adduser.8:271 #, no-wrap -msgid "B<--disabled-login>" +msgid "B<--add-extra-groups>" msgstr "" #. type: Plain text -#: ../adduser.8:233 +#: ../adduser.8:278 msgid "" -"Do not run B to set the password. The user won't be able to use her " -"account until the password is set." +"Add new user to extra groups defined in the configuration files' " +"B setting. The old spelling B<--add_extra_groups> is " +"deprecated and will be supported in Debian bookworm only. Valid Modes: " +"B, B." msgstr "" #. type: TP -#: ../adduser.8:233 +#: ../adduser.8:278 #, no-wrap -msgid "B<--disabled-password>" +msgid "B<--allow-all-names>" msgstr "" #. type: Plain text -#: ../adduser.8:237 +#: ../adduser.8:286 msgid "" -"Like B<--disabled-login>, but logins are still possible (for example using " -"SSH keys) but not using password authentication." +"Allow any user- and groupname which is supported by the underlying " +"B(8), including names containing non-ASCII characters. See VALID " +"NAMES in B(5). Valid Modes: B, B, " +"B, B." msgstr "" #. type: TP -#: ../adduser.8:237 +#: ../adduser.8:286 #, no-wrap -msgid "B<--allow-badname>" +msgid "B<--allow-bad-names>" msgstr "" #. type: Plain text -#: ../adduser.8:245 +#: ../adduser.8:294 msgid "" -"By default, user and group names are checked against the configurable " -"regular expression B and B specified in the " -"configuration file. This option forces B and B to apply " -"only a weak check for validity of the name. B and " -"B are described in B(5)." +"Disable B and B check of names. Only a weaker " +"check for validity of the name is applied. See VALID NAMES in " +"B(5). Valid Modes: B, B, " +"B, B." msgstr "" #. type: TP -#: ../adduser.8:245 +#: ../adduser.8:294 #, no-wrap -msgid "B<--force-badname>" +msgid "B<--comment>I< comment >" msgstr "" #. type: Plain text -#: ../adduser.8:249 +#: ../adduser.8:303 msgid "" -"This is the deprecated form of --allow-badname. It will be removed during " -"the release cycle of the Debian release after I." +"Set the comment field for the new entry generated. B will not ask " +"for the information if this option is given. This field is also known under " +"the name GECOS field and contains information that is used by the " +"B(1) command. This used to be the B<--gecos> option, which is " +"deprecated and will be removed after Debian bookworm. Valid Modes: " +"B, B." msgstr "" #. type: TP -#: ../adduser.8:249 +#: ../adduser.8:303 #, no-wrap -msgid "B<--allow-all-names>" +msgid "B<--conf>I< file >" msgstr "" #. type: Plain text -#: ../adduser.8:256 +#: ../adduser.8:307 msgid "" -"Bypass the weak name check which is used with B<--allow-badname>. This will " -"allow any username which is supported by the underlying B, " -"including names containing non-ASCII characters. The only restrictions " -"enforced at this level are: cannot start with a dash, plus sign, or tilde; " -"and cannot contain a colon, comma, slash, or whitespace." +"Use I instead of I. Multiple B<--conf> options can " +"be given." msgstr "" #. type: TP -#: ../adduser.8:256 +#: ../adduser.8:307 ../deluser.8:181 #, no-wrap -msgid "B<--gecos>I< GECOS >" +msgid "B<--debug>" msgstr "" #. type: Plain text -#: ../adduser.8:260 -msgid "" -"Set the GECOS field for the new entry generated. B will not ask " -"for finger information if this option is given." +#: ../adduser.8:310 ../deluser.8:184 +msgid "Activate debugging code." msgstr "" #. type: TP -#: ../adduser.8:260 +#: ../adduser.8:310 #, no-wrap -msgid "B<--gid>I< ID >" -msgstr "" - -#. type: Plain text -#: ../adduser.8:265 -msgid "" -"When creating a group, this option sets the group ID number of the new group " -"to I. When creating a user, this option sets the primary group ID " -"number of the new user to I." +msgid "B<--disabled-login>" msgstr "" -#. type: TP -#: ../adduser.8:265 +#. type: TQ +#: ../adduser.8:312 #, no-wrap -msgid "B<--ingroup>I< GROUP >" +msgid "B<--disabled-password>" msgstr "" #. type: Plain text -#: ../adduser.8:271 +#: ../adduser.8:321 msgid "" -"When creating a user, this option sets the primary group ID number of the " -"new user to the GID of the named I. Unlike with the B<--gid> option, " -"the group is specified here by name rather than by ID number. The group must " -"already exist." +"Do not run B(1) to set a password. In most situations, logins are " +"still possible though (for example using SSH keys or through PAM) for " +"reasons that are beyond B's scope. B<--disabled-login> will " +"additionally set the shell to I. Valid Mode: B." msgstr "" #. type: TP -#: ../adduser.8:271 ../deluser.8:99 +#: ../adduser.8:321 #, no-wrap -msgid "B<--group>" -msgstr "" - -#. type: Plain text -#: ../adduser.8:278 -msgid "" -"When combined with B<--system> , a group with the same name and ID as the " -"system user is created. If not combined with B<--system> , a group with the " -"given name is created. This is the default action if the program is invoked " -"as B." +msgid "B<--firstuid>I< ID >" msgstr "" #. type: TP -#: ../adduser.8:278 +#: ../adduser.8:323 ../adduser.8:389 #, no-wrap -msgid "B<-h>, B<--help>" +msgid "B<--lastuid>I< ID >" msgstr "" -#. type: Plain text -#: ../adduser.8:281 ../deluser.8:106 -msgid "Display brief instructions." +#. type: TQ +#: ../adduser.8:325 +#, no-wrap +msgid "B<--firstgid>I< ID >" msgstr "" -#. type: TP -#: ../adduser.8:281 +#. type: TQ +#: ../adduser.8:327 ../adduser.8:391 #, no-wrap -msgid "B<--home>I< dir >" +msgid "B<--lastgid>I< ID >" msgstr "" #. type: Plain text -#: ../adduser.8:286 +#: ../adduser.8:342 msgid "" -"Use I as the user's home directory, rather than the default specified " -"by the configuration file. If the directory does not exist, it is created " -"and skeleton files are copied." +"Override the first UID / last UID / first GID / last GID in the range that " +"the uid is chosen from (B, B, B and " +"B, B, B, B " +"and B in the configuration file). If a group is created as " +"a usergroup, B<--firstgid> and B<--lastgid> are ignored. The group gets the " +"same ID as the user. Valid Modes: B, B, for " +"B<--firstgid> and B<--lastgid> also B." msgstr "" #. type: TP -#: ../adduser.8:286 +#: ../adduser.8:342 #, no-wrap -msgid "B<--shell>I< shell >" +msgid "B<--force-badname>" +msgstr "" + +#. type: TQ +#: ../adduser.8:344 +#, no-wrap +msgid "B<--allow-badname>" msgstr "" #. type: Plain text -#: ../adduser.8:290 +#: ../adduser.8:349 msgid "" -"Use I as the user's login shell, rather than the default specified by " -"the configuration file." +"These are the deprecated forms of B<--allow-bad-names>. It will be removed " +"during the release cycle of the Debian release after I." msgstr "" #. type: TP -#: ../adduser.8:290 +#: ../adduser.8:349 #, no-wrap -msgid "B<--no-create-home>" +msgid "B<--gid>I< ID >" msgstr "" #. type: Plain text -#: ../adduser.8:299 +#: ../adduser.8:358 msgid "" -"Do not create a home directory for the new user. Note that the path name for " -"the new user's home directory will still be entered in the appropriate field " -"in the I<\\%/etc/passwd> file. The use of this option does not imply that " -"this field should be empty. Rather, it indicates to B<\\%adduser> that some " -"other mechanism will be responsible for initializing the new user's home " -"directory if it is to exist." +"When creating a group, this option sets the group ID number of the new group " +"to I. When creating a user, this option sets the primary group ID " +"number of the new user to I. Valid Modes: B, B, B, B." msgstr "" -#. type: TP -#: ../adduser.8:299 -#, no-wrap -msgid "B<-q>, B<--quiet>" +#. type: Plain text +#: ../adduser.8:370 +msgid "" +"Using this option in B indicates that the new user should " +"get an identically named group as its primary group. If that identically " +"named group is not already present, it is created. If not combined with " +"B<--system>, a group with the given name is created. The latter is the " +"default action if the program is invoked as B. Valid Modes: " +"B, B, B." msgstr "" #. type: Plain text -#: ../adduser.8:302 -msgid "Suppress informational messages, only show warnings and errors." +#: ../adduser.8:373 ../deluser.8:193 +msgid "Display brief instructions." msgstr "" #. type: TP -#: ../adduser.8:302 +#: ../adduser.8:373 #, no-wrap -msgid "B<-d>, B<--debug>" +msgid "B<--home>I< dir >" msgstr "" #. type: Plain text -#: ../adduser.8:306 -msgid "Be verbose, most useful if you want to nail down a problem with B." +#: ../adduser.8:380 +msgid "" +"Use I as the user's home directory, rather than the default specified " +"by the configuration file (or I if B is " +"used). If the directory does not exist, it is created. Valid Modes: " +"B, B." msgstr "" #. type: TP -#: ../adduser.8:306 ../deluser.8:112 +#: ../adduser.8:380 #, no-wrap -msgid "B<--system>" +msgid "B<--ingroup>I< GROUP >" msgstr "" #. type: Plain text -#: ../adduser.8:311 +#: ../adduser.8:389 msgid "" -"Nomally, B creates I as defined in Debian Policy, Chapter 9.2.2. With this option, " -"B creates a I" +"When creating a user, this option sets the primary group ID number of the " +"new user to the GID of the named group. Unlike with the B<--gid> option, " +"the group is specified here by name rather than by numeric ID number. The " +"group must already exist. Valid Modes: B, B." +msgstr "" + +#. type: Plain text +#: ../adduser.8:395 +msgid "Override the last UID / last GID. See B<--firstuid>." msgstr "" #. type: TP -#: ../adduser.8:311 +#: ../adduser.8:395 #, no-wrap -msgid "B<--uid>I< ID >" +msgid "B<--no-create-home>" msgstr "" #. type: Plain text -#: ../adduser.8:315 +#: ../adduser.8:406 msgid "" -"Force the new userid to be the given number. B will fail if the " -"userid is already taken." +"Do not create a home directory for the new user. Note that the pathname for " +"the new user's home directory will still be entered in the appropriate field " +"in the I<\\%/etc/passwd> file. The use of this option does not imply that " +"this field should be empty. Rather, it indicates to B<\\%adduser> that some " +"other mechanism will be responsible for initializing the new user's home " +"directory. Valid Modes: B, B." msgstr "" #. type: TP -#: ../adduser.8:315 +#: ../adduser.8:406 ../deluser.8:197 #, no-wrap -msgid "B<--firstuid>I< ID >" +msgid "B<--quiet>" msgstr "" #. type: Plain text -#: ../adduser.8:319 -msgid "" -"Override the first uid in the range that the uid is chosen from (overrides " -"B specified in the configuration file)." +#: ../adduser.8:409 ../deluser.8:200 +msgid "Suppress informational messages, only show warnings and errors." msgstr "" #. type: TP -#: ../adduser.8:319 +#: ../adduser.8:409 #, no-wrap -msgid "B<--lastuid>I< ID >" +msgid "B<--shell>I< shell >" msgstr "" #. type: Plain text -#: ../adduser.8:323 +#: ../adduser.8:415 msgid "" -"Override the last uid in the range that the uid is chosen from " -"(B)." -msgstr "" - -#. type: TP -#: ../adduser.8:323 -#, no-wrap -msgid "B<--firstgid>I< ID >" +"Use I as the user's login shell, rather than the default specified by " +"the configuration file (or I if B is " +"used). Valid Modes: B, B." msgstr "" #. type: Plain text -#: ../adduser.8:327 +#: ../adduser.8:424 msgid "" -"Override the first gid in the range that the gid is chosen from (overrides " -"B specified in the configuration file)." +"Nomally, B creates I as defined in Debian Policy, Chapter 9.2.2. With this option, " +"B creates a I and " +"changes its mode respectively. Valid Modes: B, B." msgstr "" #. type: TP -#: ../adduser.8:327 +#: ../adduser.8:424 #, no-wrap -msgid "B<--lastgid>I< ID >" +msgid "B<--uid>I< ID >" msgstr "" #. type: Plain text -#: ../adduser.8:331 +#: ../adduser.8:429 msgid "" -"Override the last gid in the range that the gid is chosen from " -"(B)." +"Force the new userid to be the given number. B will fail if the " +"userid is already taken. Valid Modes: B, B." msgstr "" #. type: TP -#: ../adduser.8:331 +#: ../adduser.8:429 ../deluser.8:218 #, no-wrap -msgid "B<--add-extra-groups>" +msgid "B<--verbose>" msgstr "" #. type: Plain text -#: ../adduser.8:336 -msgid "" -"Add new user to extra groups defined in the configuration file. Old spelling " -"--add_extra_groups is deprecated and will be supported in Debian bookworm " -"only." +#: ../adduser.8:432 ../deluser.8:221 +msgid "Be more verbose." msgstr "" #. type: TP -#: ../adduser.8:336 +#: ../adduser.8:432 #, no-wrap msgid "B<-v> , B<--version>" msgstr "" #. type: Plain text -#: ../adduser.8:339 ../deluser.8:144 +#: ../adduser.8:435 ../deluser.8:224 msgid "Display version and copyright information." msgstr "" #. type: SH -#: ../adduser.8:340 +#: ../adduser.8:436 #, no-wrap msgid "EXIT VALUES" msgstr "" #. type: TP -#: ../adduser.8:342 ../deluser.8:145 +#: ../adduser.8:438 ../deluser.8:225 #, no-wrap msgid "B<0>" msgstr "" #. type: Plain text -#: ../adduser.8:350 +#: ../adduser.8:447 msgid "" "Success: The user or group exists as specified. This can have 2 causes: The " "user or group was created by this call to B or the user or group " -"was already present on the system before B was invoked. If " -"B is invoked for a user already existing as a system user, " -"it will also return 0." +"was already present on the system as specified before B was " +"invoked. If B is invoked for a user already existing as a " +"system user, it will also return 0." msgstr "" #. type: TP -#: ../adduser.8:350 ../deluser.8:148 +#: ../adduser.8:447 ../deluser.8:228 #, no-wrap msgid "B<1>" msgstr "" #. type: Plain text -#: ../adduser.8:357 +#: ../adduser.8:455 msgid "" "Creating the non-system user or group failed because it was already " "present. The username or groupname was rejected because of a mismatch with " @@ -884,7 +888,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../adduser.8:362 +#: ../adduser.8:460 msgid "" "Or for many other yet undocumented reasons which are printed to console " "then. You may then consider to remove B<--quiet> to make B more " @@ -892,94 +896,95 @@ msgid "" msgstr "" #. type: SH -#: ../adduser.8:363 ../deluser.8:188 +#: ../adduser.8:461 ../deluser.8:266 #, no-wrap msgid "SECURITY" msgstr "" #. type: Plain text -#: ../adduser.8:370 +#: ../adduser.8:473 msgid "" "B needs root privileges and offers, via the B<--conf> command line " -"option to use a different configuration file. Do not use B or similar " -"tools to give partial privileges to B with restricted command line " -"parameters. This is easy to circumvent and might allow users to create " -"arbitrary accounts. If you want this, consider writing your own wrapper " -"script and giving privileges to execute that script." +"option to use different configuration files. Do not use B(8) or " +"similar tools to give partial privileges to B with restricted " +"command line parameters. This is easy to circumvent and might allow users " +"to create arbitrary accounts. If you want this, consider writing your own " +"wrapper script and giving privileges to execute that script." msgstr "" #. type: SH -#: ../adduser.8:371 ../adduser.conf.5:174 ../deluser.8:196 ../deluser.conf.5:69 +#: ../adduser.8:474 ../adduser.conf.5:262 ../deluser.8:279 ../deluser.conf.5:82 #, no-wrap msgid "FILES" msgstr "" #. type: Plain text -#: ../adduser.8:372 ../adduser.conf.5:176 +#: ../adduser.8:475 ../adduser.conf.5:264 #, no-wrap msgid "I" msgstr "" #. type: Plain text -#: ../adduser.8:375 -msgid "Default configuration file for B and B" +#: ../adduser.8:478 +msgid "Default configuration file for B(8) and B(8)" msgstr "" #. type: TP -#: ../adduser.8:375 +#: ../adduser.8:478 #, no-wrap msgid "I" msgstr "" #. type: Plain text -#: ../adduser.8:378 ../deluser.8:202 -msgid "Optional custom add-ons." +#: ../adduser.8:482 +msgid "Optional custom add-ons, see B(8)" msgstr "" #. type: SH -#: ../adduser.8:379 ../adduser.conf.5:147 +#: ../adduser.8:484 ../adduser.conf.5:193 #, no-wrap msgid "NOTES" msgstr "" #. type: Plain text -#: ../adduser.8:396 +#: ../adduser.8:511 msgid "" "Unfortunately, the term I suffers from double use in " "Debian. It both means an account for the actual Debian system, " -"distinguishing itself from an Isystem accountI< " -"in this definition has the potential to log in to the actual system, has a " -"UID, can be member in system groups, can own files and processes. Debian " -"Policy, au contraire, in its Chapter 9.2.2, makes a distinguishment of " -"dynamically allocated system users and groups and dynamially allocated user " -"accounts, meaning in both cases special instances of system accounts. Care " -"must be taken to not confuse this terminology. Since >BI< and " -">BI< never address >BI< and everything in " -"this package concerns >BI< here, the usage of the terms " -">BI< and >BI< is actually not ambiguous in the " -"context of this package. For clarity, this document uses the definition " -"local system account or group if the distinction to application accounts or " -"accounts managed in a directory service is needed.>" +"distinguishing itself from an I which might exist in " +"the user database of some application running on Debian. A I in this definition has the potential to log in to the actual " +"system, has a UID, can be member in system groups, can own files and " +"processes. Debian Policy, au contraire, in its Chapter 9.2.2, makes a " +"distinguishment of I and " +"I, meaning in both cases special " +"instances of I. Care must be taken to not confuse this " +"terminology. Since B and B(8) never address I and everything in this package concerns I here, " +"the usage of the terms I and I is actually not " +"ambiguous in the context of this package. For clarity, this document uses " +"the definition I if the distinction to " +"I or accounts managed in a directory service is " +"needed." msgstr "" #. type: Plain text -#: ../adduser.8:407 +#: ../adduser.8:528 msgid "" "B used to have the vision to be the universal front end to the " "various directory services for creation and deletion of regular and system " -"accounts in Debian since the 1990ies. This vision has been abandoned as of " -"2022. The rationale behind this includes: that in practice, a small server " +"accounts in Debian since the 1990ies. This vision has been abandoned as of " +"2022. The rationale behind this includes: that in practice, a small server " "system is not going to have write access to an enterprise-wide directory " "service anyway, that locally installed packages are hard to manage with " "centrally controlled system accounts, that enterprise directory services " "have their own management processes anyway and that the personpower of the " -"B is unlikely to be ever strong enough to write or support the " -"plethora of directory services that need support." +"B team is unlikely to be ever strong enough to write and maintain " +"support for the plethora of directory services that need support." msgstr "" #. type: Plain text -#: ../adduser.8:411 +#: ../adduser.8:532 msgid "" "B will constrict itself to being a policy layer for the management " "of local system accounts, using the tools from the B package for " @@ -987,87 +992,56 @@ msgid "" msgstr "" #. type: SH -#: ../adduser.8:412 +#: ../adduser.8:533 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../adduser.8:415 +#: ../adduser.8:537 msgid "" "Inconsistent use of terminology around the term I in docs " -"and code is a bug. Please report this and allow us to improve our docs." +"and code is a bug. Please report this and allow us to improve our docs." msgstr "" #. type: Plain text -#: ../adduser.8:423 +#: ../adduser.8:547 msgid "" "B takes special attention to be directly usable in Debian " "maintainer scripts without conditional wrappers, error suppression and other " -"scaffolding. The only thing that the package maintainer should need to code " -"is a check for the presence of the executable in the postrm script. The " +"scaffolding. The only thing that the package maintainer should need to code " +"is a check for the presence of the executable in the postrm script. The " "B maintainers consider the need for additional scaffolding a bug " "and encourage their fellow Debian package maintainers to file bugs against " "the B package in this case." msgstr "" #. type: SH -#: ../adduser.8:424 ../adduser.conf.5:176 ../deluser.8:203 ../deluser.conf.5:71 +#: ../adduser.8:548 ../adduser.conf.5:264 ../deluser.8:288 ../deluser.conf.5:84 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../adduser.8:431 +#: ../adduser.8:554 msgid "" "B(5), B(8), B(8), B(8), " "B(8), Debian Policy 9.2.2." msgstr "" -#. type: SH -#: ../adduser.8:432 ../deluser.8:209 -#, no-wrap -msgid "COPYRIGHT" -msgstr "" - -#. type: Plain text -#: ../adduser.8:435 -msgid "" -"Copyright (C) 1997, 1998, 1999 Guy Maor. Modifications by Roland " -"Bauerschmidt and Marc Haber. Additional patches by Joerg Hoh and Stephen " -"Gran." -msgstr "" - -#. type: Plain text -#: ../adduser.8:438 ../deluser.8:218 -msgid "" -"Copyright (C) 1995 Ted Hajek, with a great deal borrowed from the original " -"Debian B" -msgstr "" - -#. type: Plain text -#: ../adduser.8:442 -msgid "" -"Copyright (C) 1994 Ian Murdock. B is free software; see the GNU " -"General Public Licence version 2 or later for copying conditions. There is " -"I warranty." -msgstr "" - #. type: TH -#: ../adduser.conf.5:5 +#: ../adduser.conf.5:13 #, no-wrap msgid "ADDUSER.CONF" msgstr "" #. type: Plain text -#: ../adduser.conf.5:11 -msgid "" -"/etc/adduser.conf - configuration file for B(8) and " -"B(8)." +#: ../adduser.conf.5:19 +msgid "/etc/adduser.conf - configuration file for B(8) and B(8)" msgstr "" #. type: Plain text -#: ../adduser.conf.5:22 +#: ../adduser.conf.5:30 msgid "" "The file I contains defaults for the programs " "B(8), B(8), B(8) and B(8). Each line " @@ -1077,463 +1051,564 @@ msgid "" msgstr "" #. type: Plain text -#: ../adduser.conf.5:24 ../deluser.conf.5:22 +#: ../adduser.conf.5:32 ../deluser.conf.5:33 msgid "The valid configuration options are:" msgstr "" #. type: TP -#: ../adduser.conf.5:24 +#: ../adduser.conf.5:32 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:28 -msgid "The login shell to be used for all new users. Defaults to I." +#: ../adduser.conf.5:39 +msgid "" +"Setting this to something other than 0 will cause B to add newly " +"created non-system users to the list of groups defined by B " +"(below). Defaults to I<0>." msgstr "" #. type: TP -#: ../adduser.conf.5:28 +#: ../adduser.conf.5:39 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:32 +#: ../adduser.conf.5:48 msgid "" -"The directory in which new home directories should be created. Defaults to " -"I." +"The permissions mode for home directories of non-system users that are " +"created by B(8). Defaults to I<0700>. Note that there are " +"potential configurations (such as /~user web services, or in-home mail " +"delivery) which will require changes to the default. See also " +"B." msgstr "" #. type: TP -#: ../adduser.conf.5:32 +#: ../adduser.conf.5:48 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:37 +#: ../adduser.conf.5:52 msgid "" -"If this is set to I, the home directories will be created as " -"I. Defaults to I." +"The directory in which new home directories should be created. Defaults to " +"I." msgstr "" #. type: TP -#: ../adduser.conf.5:37 +#: ../adduser.conf.5:52 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:44 -msgid "" -"If this is set to I, then the home directories created will have an " -"extra directory inserted which is the first letter of the loginname. For " -"example: I. Defaults to I." +#: ../adduser.conf.5:56 +msgid "The login shell to be used for all new users. Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:44 +#: ../adduser.conf.5:56 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:48 +#: ../adduser.conf.5:61 msgid "" -"The directory from which skeletal user configuration files should be " -"copied. Defaults to I." +"This is the space-separated list of groups that new non-system users will be " +"added to. Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:48 +#: ../adduser.conf.5:61 #, no-wrap -msgid "B and B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:55 +#: ../adduser.conf.5:66 msgid "" -"specify an inclusive range of UIDs from which system UIDs can be dynamically " -"allocated. Default to I<100> - I<999>. Please note that system software, " -"such as the users allocated by the base-passwd package, may assume that UIDs " -"less than 100 are unallocated." +"specify an inclusive range of GIDs from which GIDs for system groups can be " +"dynamically allocated. Defaults to I<100> - I<999>." msgstr "" #. type: TP -#: ../adduser.conf.5:55 +#: ../adduser.conf.5:66 #, no-wrap -msgid "B and B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:60 +#: ../adduser.conf.5:71 msgid "" -"specify an inclusive range of UIDs from which normal user's UIDs can be " -"dynamically allocated. Default to I<1000> - I<59999>." +"specify an inclusive range of GIDs from which GIDs for non-system groups can " +"be dynamically allocated. Defaults to I<1000> - I<59999>." msgstr "" #. type: TP -#: ../adduser.conf.5:60 +#: ../adduser.conf.5:71 #, no-wrap -msgid "B and B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:65 +#: ../adduser.conf.5:79 msgid "" -"specify an inclusive range of GIDs from which system GIDs can be dynamically " -"allocated. Default to I<100> - I<999>." +"specify an inclusive range of UIDs from which UIDs for system users can be " +"dynamically allocated. Defaults to I<100> - I<999>. Please note that " +"system software, such as the users allocated by the I package, " +"may assume that UIDs less than 100 are unallocated." msgstr "" #. type: TP -#: ../adduser.conf.5:65 +#: ../adduser.conf.5:79 #, no-wrap -msgid "B and B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:70 +#: ../adduser.conf.5:84 msgid "" -"specify an inclusive range of GIDs from which normal group's GIDs can be " -"dynamically allocated. Default to I<1000> - I<59999>." +"specify an inclusive range of UIDs from which UIDs for non-system users can " +"be dynamically allocated. Defaults to I<1000> - I<59999>." msgstr "" #. type: TP -#: ../adduser.conf.5:70 +#: ../adduser.conf.5:84 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:75 -msgid "" -"If this is set to I, then each created non-system user will be given " -"their own group to use. The default is I." +#: ../adduser.conf.5:87 +msgid "See B." msgstr "" #. type: TP -#: ../adduser.conf.5:75 +#: ../adduser.conf.5:87 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:87 +#: ../adduser.conf.5:92 msgid "" -"B Defines the group name or GID of the group all newly-created " -"non-system users are placed into. If B is I the group will " -"be added as a supplementary group; if B is I, it will be " -"the primary group. If you don't want all your users to be in one group, set " -"B is I, leave B empty and set B to " -"\"-1\". The default value of USERS_GROUP is I, which has GID 100 on " -"all Debian systems since it's defined statically by the I " -"package." +"If this is set to I, the home directories will be created as " +"I. Defaults to I. This option is B " +"and will be removed." msgstr "" #. type: TP -#: ../adduser.conf.5:87 +#: ../adduser.conf.5:92 #, no-wrap -msgid "B" +msgid "B" msgstr "" -#. type: Plain text +#. type: TQ #: ../adduser.conf.5:94 -msgid "" -"If set to a valid value (e.g. 0755 or 755), directories created will have " -"the specified permissions mode. Otherwise 2700 is used as default. (See " -"SYS_DIR_MODE for system users.) Note that there are potential " -"configurations (such as /~user web services, or in-home mail delivery) " -"which will require changes to the default." +#, no-wrap +msgid "B" msgstr "" -#. type: TP -#: ../adduser.conf.5:94 +#. type: TQ +#: ../adduser.conf.5:96 #, no-wrap -msgid "B" +msgid "B" +msgstr "" + +#. type: TQ +#: ../adduser.conf.5:98 +#, no-wrap +msgid "B" msgstr "" #. type: Plain text #: ../adduser.conf.5:101 -msgid "" -"If set to a valid value (e.g. 0755 or 755), directories created for system " -"users will have the specified permissions mode. Otherwise 0755 is used as " -"default. Note that changing the default permissions for system users may " -"cause some packages to behave unreliably, if the program relies on the " -"default setting." +msgid "See the B variants of the option." msgstr "" #. type: TP #: ../adduser.conf.5:101 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:111 +#: ../adduser.conf.5:108 msgid "" -"If this is set to I, then home directories for users with their own " -"group (B = yes) will have the setgid bit set. This is the " -"default setting for normal user accounts. If you set this to \"no\", you " -"should also change the value of DIR_MODE, as the default (2700) sets this " -"bit regardless. Note that this feature is B and will be removed " -"in a future version of B. Please use B instead." +"If this is set to I, then the home directories created will have an " +"extra directory inserted which is the first letter of the loginname. For " +"example: I. Defaults to I. This option is B " +"and will be removed." msgstr "" #. type: TP -#: ../adduser.conf.5:111 +#: ../adduser.conf.5:108 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:119 +msgid "" +"Non-system user- and groupnames are checked against this regular " +"expression. If the name doesn't match this regexp, user and group creation " +"in B(8) is refused unless B<--allow-bad-names> is set. With " +"B<--allow-bad-names> set, weaker checks are performed. Defaults to the most " +"conservative I<^[a-z][-a-z0-9_]*$>. See B and B, below, for more information." +msgstr "" + +#. type: TP +#: ../adduser.conf.5:119 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:116 +#: ../adduser.conf.5:125 msgid "" -"If set to a nonempty value, new users will have quotas copied from that " -"user. The default is empty." +"If set to a nonempty value, new users will have quotas copied from that user " +"using I. Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:116 +#: ../adduser.conf.5:125 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:123 +#: ../adduser.conf.5:135 msgid "" -"User and group names are checked against this regular expression. If the " -"name doesn't match this regexp, user and group creation in adduser is " -"refused unless --allow-badname is set. With --allow-badname set, only weak " -"checks are performed. The default is the most conservative " -"^[a-z][-a-z0-9_]*$. See B, below, for more information." +"If this is set to I, then home directories for users with their own " +"group (B = yes) will have the set-group-ID bit set. Note that " +"this feature is B and will be removed in a future version of " +"B(8). Please use B instead. Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:123 +#: ../adduser.conf.5:135 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:132 +#: ../adduser.conf.5:140 msgid "" -"System user and group names are checked against this regular expression. If " -"this variable is not set, it falls back to the default value. If the name " -"doesn't match this regexp, system user and group creation in adduser is " -"refused unless --allow-badname is set. With --allow-badname set, only weak " -"checks are performed. The default is the most conservative " -"^[a-z_][-a-z0-9_]*$. See B, below, for more information." +"The directory from which skeletal user configuration files will be copied. " +"Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:132 +#: ../adduser.conf.5:140 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:138 +#: ../adduser.conf.5:147 msgid "" -"Files in I are checked against this regex, and not copied to the " -"newly created home directory if they match. This is by default set to the " -"regular expression matching files left over from unmerged config files " -"(dpkg-(old|new|dist))." +"When populating the newly created home directory of a non-system user, files " +"in SKEL matching this regex are not copied. Defaults to to " +"I<(.(dpkg|ucf)-(old|new|dist)$)>, the regular expression matching files left " +"over from unmerged config files." msgstr "" #. type: TP -#: ../adduser.conf.5:138 +#: ../adduser.conf.5:147 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:143 +#: ../adduser.conf.5:156 msgid "" -"Setting this to something other than 0 (the default) will cause B " -"to add newly created non-system users to the list of groups defined by " -"B (below)." +"The permissions mode for home directories of system users that are created " +"by B(8). Defaults to I<0755>. Note that changing the default " +"permissions for system users may cause some packages to behave unreliably, " +"if the program relies on the default setting. See also B." msgstr "" #. type: TP -#: ../adduser.conf.5:143 +#: ../adduser.conf.5:156 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:147 +#: ../adduser.conf.5:167 msgid "" -"This is the space-separated list of groups that new non-system users will be " -"added to." +"System user- and groupnames are checked against this regular expression. If " +"the name doesn't match this regexp, system user and group creation in " +"adduser is refused unless B<--allow-bad-names> is set. With " +"B<--allow-bad-names> set, weaker checks are performed. Defaults to the most " +"conservative I<^[a-z_][-a-z0-9_]*$>. See B, above, and B, below, for more information." msgstr "" #. type: TP -#: ../adduser.conf.5:148 +#: ../adduser.conf.5:167 #, no-wrap -msgid "B" +msgid "B" +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:172 +msgid "" +"specify a file or a directory containing UID and GID pool files. See UID " +"and GID POOLS in the NOTES section. Both default to I." msgstr "" #. type: TP -#: ../adduser.conf.5:150 +#: ../adduser.conf.5:172 #, no-wrap -msgid "Historically, B and B enforced conformity" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:157 +#: ../adduser.conf.5:177 msgid "" -"to IEEE Std 1003.1-2001, which allows only the following characters to " -"appear in group and user names: letters, digits, underscores, periods, at " -"signs (@) and dashes. The name may not start with a dash or @. The \"$\" " -"sign is allowed at the end of usernames (to conform to samba)." +"Specify whether each created non-system user will be given their own group " +"to use. Defaults to I." msgstr "" #. type: TP -#: ../adduser.conf.5:157 +#: ../adduser.conf.5:177 #, no-wrap -msgid "The default settings for B" +msgid "B" msgstr "" #. type: Plain text -#: ../adduser.conf.5:162 +#: ../adduser.conf.5:193 msgid "" -"allow usernames to contain lowercase letters and numbers, plus dash (-) and " -"underscore (_); the name must begin with a letter (or an underscore for " -"system users)." +"Defines the groupname or GID of the group all newly-created non-system users " +"are placed into. If B is I the group will be added as a " +"supplementary group; if B is I, it will be the primary " +"group. If you don't want all your users to be in one group, set " +"B=I, leave B empty and set B to " +"\"-1\". B defaults to I, which has GID 100 on all " +"Debian systems since it's defined statically by the I package. " +"It is a configuration error to define both variables even if the values are " +"consistent." msgstr "" -#. type: TP -#: ../adduser.conf.5:162 +#. type: SS +#: ../adduser.conf.5:194 #, no-wrap -msgid "The least restrictive policy, available by using the B<--allow-all-names>" +msgid "VALID NAMES" +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:204 +msgid "" +"Historically, B(8) and B(8) enforced conformity to IEEE " +"Std 1003.1-2001, which allows only the following characters to appear in " +"group- and usernames: letters, digits, underscores, periods, at signs (@) " +"and dashes. The name may not start with a dash or @. The \"$\" sign is " +"allowed at the end of usernames to allow typical Samba machine accounts." msgstr "" #. type: Plain text -#: ../adduser.conf.5:166 +#: ../adduser.conf.5:210 msgid "" -"option, simply makes the same checks as B: cannot start with a " +"The default settings for B and B allow usernames " +"to contain lowercase letters and numbers, plus dash (-) and underscore (_); " +"the name must begin with a letter (or an underscore for system users)." +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:216 +msgid "" +"The least restrictive policy, available by using the B<--allow-all-names> " +"option, simply makes the same checks as B(8): cannot start with a " "dash, plus sign, or tilde; and cannot contain a colon, comma, slash, or " "whitespace." msgstr "" -#. type: TP -#: ../adduser.conf.5:166 -#, no-wrap -msgid "This option can be used to create confusing or misleading names; use" +#. type: Plain text +#: ../adduser.conf.5:219 +msgid "" +"This option can be used to create confusing or misleading names; use it with " +"caution." msgstr "" #. type: Plain text -#: ../adduser.conf.5:169 -msgid "it with caution." +#: ../adduser.conf.5:225 +msgid "" +"Please note that regardless of the regular expressions used to evaluate the " +"username, it may be a maximum of 32 bytes; this may be less than 32 visual " +"characters when using Unicode glyphs in the username." msgstr "" -#. type: TP -#: ../adduser.conf.5:169 +#. type: SS +#: ../adduser.conf.5:225 #, no-wrap -msgid "Please note that regardless of the regular expressions used to evaluate" +msgid "UID AND GID POOLS" msgstr "" #. type: Plain text -#: ../adduser.conf.5:173 +#: ../adduser.conf.5:233 msgid "" -"the username, it may be a maximum of 32 bytes; this may be less than 32 " -"visual characters when using Unicode glyphs in the username." +"Some installations desire that a non-system account gets preconfigured " +"properties when it is generated. Commonly, the local admin wants to make " +"sure that even without using a directory service, an account or a group with " +"a certain name has the same numeric UID/GID on all systems where it exists." msgstr "" #. type: Plain text -#: ../adduser.conf.5:181 +#: ../adduser.conf.5:241 +msgid "" +"To enable this feature, define configuration variables B (for user " +"accounts) and/or B (for groups) in I and " +"install the respective files in the configured places. The value is either " +"a file or a directory. In the latter case all files named I<*.conf> in that " +"directory are considered." +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:250 +msgid "" +"The file format is similar to I: Text lines, fields separated " +"by a colon. The values are username/groupname (mandatory), UID/GID " +"(mandatory), comment field (optional, useful for user IDs only), home " +"directory (ditto), shell (ditto)." +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:253 +msgid "" +"It is possible to use the same file/directory for B and " +"B." +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:261 +msgid "" +"If an account / group is created, B(8) searches in all UID/GID pool " +"files for a line matching the name of the newly created account and uses the " +"data found there to initialize the new account instead of using the " +"defaults. Settings may be overridden from the command line." +msgstr "" + +#. type: Plain text +#: ../adduser.conf.5:269 msgid "" "B(5), B(8), B(8), B(8), " "B(8)" msgstr "" #. type: TH -#: ../deluser.8:8 +#: ../deluser.8:13 #, no-wrap msgid "DELUSER" msgstr "" #. type: Plain text -#: ../deluser.8:11 +#: ../deluser.8:16 msgid "deluser, delgroup - remove a user or group from the system" msgstr "" #. type: SY -#: ../deluser.8:12 ../deluser.8:20 ../deluser.8:28 +#: ../deluser.8:17 ../deluser.8:29 ../deluser.8:42 ../deluser.8:59 +#: ../deluser.8:67 ../deluser.8:70 #, no-wrap msgid "deluser" msgstr "" #. type: OP -#: ../deluser.8:14 +#: ../deluser.8:18 ../deluser.8:31 #, no-wrap -msgid "--no-preserve-root" +msgid "--backup" msgstr "" #. type: OP -#: ../deluser.8:15 +#: ../deluser.8:19 ../deluser.8:32 #, no-wrap -msgid "--remove-home" +msgid "--backup-suffix" msgstr "" #. type: OP -#: ../deluser.8:16 +#: ../deluser.8:19 ../deluser.8:32 #, no-wrap -msgid "--remove-all-files" +msgid "str" msgstr "" #. type: OP -#: ../deluser.8:17 +#: ../deluser.8:20 ../deluser.8:33 #, no-wrap -msgid "--backup" +msgid "--backup-to" msgstr "" #. type: OP -#: ../deluser.8:18 +#: ../deluser.8:23 ../deluser.8:36 #, no-wrap -msgid "--backup-to" +msgid "--remove-all-files" msgstr "" -#. type: SY -#: ../deluser.8:24 +#. type: OP +#: ../deluser.8:24 ../deluser.8:37 #, no-wrap -msgid "delgroup" +msgid "--remove-home" +msgstr "" + +#. type: OP +#: ../deluser.8:30 ../deluser.8:51 +#, no-wrap +msgid "--system" msgstr "" #. type: OP -#: ../deluser.8:26 +#: ../deluser.8:46 ../deluser.8:54 #, no-wrap msgid "--only-if-empty" msgstr "" +#. type: SY +#: ../deluser.8:50 +#, no-wrap +msgid "delgroup" +msgstr "" + #. type: Plain text -#: ../deluser.8:42 +#: ../deluser.8:78 msgid "" "B and B remove users and groups from the system according " "to command line options and configuration information in " -"I and I. They are friendlier front " -"ends to the B and B programs, removing the home directory " -"as option or even all files on the system owned by the user to be removed, " -"running a custom script, and other features. B and B can " -"be run in one of three modes:" +"I and I." +msgstr "" + +#. type: Plain text +#: ../deluser.8:85 +msgid "" +"They are friendlier front ends to the B and B programs, " +"removing the home directory as option or even all files on the system owned " +"by the user to be removed, running a custom script, and other features." +msgstr "" + +#. type: Plain text +#: ../deluser.8:90 +msgid "B and B can be run in one of three modes:" msgstr "" #. type: SS -#: ../deluser.8:42 +#: ../deluser.8:91 #, no-wrap -msgid "Remove a normal user" +msgid "Remove a user" msgstr "" #. type: Plain text -#: ../deluser.8:45 +#: ../deluser.8:95 msgid "" "If called with one non-option argument and without the B<--group> option, " -"B will remove a normal user." +"B will remove a non-system user." msgstr "" #. type: Plain text -#: ../deluser.8:50 +#: ../deluser.8:103 msgid "" "By default, B will remove the user without removing the home " "directory, the mail spool or any other files on the system owned by the " @@ -1542,516 +1617,490 @@ msgid "" msgstr "" #. type: Plain text -#: ../deluser.8:56 +#: ../deluser.8:111 msgid "" "The B<--remove-all-files> option removes all files on the system owned by " "the user. Note that if you activate both options B<--remove-home> will have " -"no effect because all files including the home directory and mail spool are " -"already covered by the B<--remove-all-files> option." +"no additional effect because all files including the home directory and mail " +"spool are already covered by the B<--remove-all-files> option." msgstr "" #. type: Plain text -#: ../deluser.8:61 +#: ../deluser.8:116 msgid "" "If you want to backup all files before deleting them you can activate the " "B<--backup> option which will create a file I in the " -"directory specified by the B<--backup-to> option (defaulting to the current " -"working directory)." -msgstr "" - -#. type: Plain text -#: ../deluser.8:65 -#, no-wrap -msgid "" -" By default, the backup archive is compressed with gzip. To change this,\n" -"the B<--backup-suffix> option can be set to any suffix supported by\n" -"B (e.g. .gz, .bz2, .xz).\n" +"directory specified by the B<--backup-to> option." msgstr "" #. type: Plain text -#: ../deluser.8:70 +#: ../deluser.8:122 msgid "" -"The remove, suffix, and backup options can also be activated by default in " -"the configuration file I. See B for " -"details." +"By default, the backup archive is compressed with B(1). To change " +"this, the B<--backup-suffix> option can be set to any suffix supported by " +"B (e.g. .gz, .bz2, .xz)." msgstr "" #. type: Plain text -#: ../deluser.8:74 -msgid "" -"If you want to remove the root account (uid 0), then use the " -"B<--no-preserve-root> parameter; this may prevent to remove the root user by " -"accident." +#: ../deluser.8:124 +msgid "B will refuse to remove the root account." msgstr "" #. type: Plain text -#: ../deluser.8:79 +#: ../deluser.8:135 msgid "" -"If the file I exists, it will be executed " -"after the user account has been removed in order to do any local cleanup. " -"The arguments passed to B are:" +"If the B<--system> option is given on the command line, the delete operation " +"is actually executed only if the user is a system user. This avoids " +"accidentally deleting non-system users. Additionally, if the user does not " +"exist, no error value is returned. Debian package maintainer scripts may " +"use this flag to remove system users or groups while ignoring the case where " +"the removal already occurred." msgstr "" #. type: SS -#: ../deluser.8:82 +#: ../deluser.8:136 #, no-wrap msgid "Remove a group" msgstr "" #. type: Plain text -#: ../deluser.8:85 +#: ../deluser.8:143 msgid "" "If B is called with the B<--group> option, or B is " -"called, a group will be removed." -msgstr "" - -#. type: Plain text -#: ../deluser.8:87 -msgid "Warning: The primary group of an existing user cannot be removed." +"called, a group will be removed. The primary group of an existing user " +"cannot be removed. If the option B<--only-if-empty> is given, the group " +"won't be removed if it has any members left." msgstr "" #. type: Plain text -#: ../deluser.8:90 +#: ../deluser.8:146 msgid "" -"If the option B<--only-if-empty> is given, the group won't be removed if it " -"has any members left." +"The B<--system> option adds the same functionality as for users, " +"respectively." msgstr "" #. type: SS -#: ../deluser.8:91 +#: ../deluser.8:147 #, no-wrap msgid "Remove a user from a specific group" msgstr "" #. type: Plain text -#: ../deluser.8:94 +#: ../deluser.8:150 msgid "" "If called with two non-option arguments, B will remove a user from " "a specific group." msgstr "" -#. type: TP -#: ../deluser.8:95 -#, no-wrap -msgid "B<--conf >I,B<-c >I" -msgstr "" - #. type: Plain text -#: ../deluser.8:99 +#: ../deluser.8:155 msgid "" -"Use I instead of the default files I and " -"I." -msgstr "" - -#. type: Plain text -#: ../deluser.8:103 -msgid "" -"Remove a group. This is the default action if the program is invoked as " -"I." -msgstr "" - -#. type: TP -#: ../deluser.8:103 -#, no-wrap -msgid "B<--help>, B<-h>" +"Different modes of B allow different options. If no valid modes " +"are listed for a option, it is accepted in all modes." msgstr "" #. type: TP -#: ../deluser.8:106 +#: ../deluser.8:159 #, no-wrap -msgid "B<--quiet, -q>" +msgid "B<--backup>" msgstr "" #. type: Plain text -#: ../deluser.8:109 -msgid "Suppress progress messages." +#: ../deluser.8:164 +msgid "" +"Backup all files contained in the userhome and the mailspool file to a file " +"named I or I. Valid Modes: B, " +"B," msgstr "" #. type: TP -#: ../deluser.8:109 +#: ../deluser.8:164 #, no-wrap -msgid "B<--debug>" -msgstr "" - -#. type: Plain text -#: ../deluser.8:112 -msgid "Be verbose, most useful if you want to nail down a problem." +msgid "B<--backup-suffix >str" msgstr "" #. type: Plain text -#: ../deluser.8:119 +#: ../deluser.8:170 msgid "" -"Only delete if user/group is a system user/group. This avoids accidentally " -"deleting non-system users/groups. Additionally, if the user does not exist, " -"no error value is returned. Debian package maintainer scripts may use this " -"flag to remove system users or groups while ignoring the case where the " -"removal already occurred." +"Select compression algorithm for a home directory backup. Can be set to any " +"suffix recognized by B. Defaults to I<.gz>. Valid " +"Modes: B, B," msgstr "" #. type: TP -#: ../deluser.8:119 +#: ../deluser.8:170 #, no-wrap -msgid "B<--only-if-empty>" +msgid "B<--backup-to >I" msgstr "" #. type: Plain text -#: ../deluser.8:122 -msgid "Only remove if no members are left." +#: ../deluser.8:176 +msgid "" +"Place the backup files not in the current directory but in I. This " +"implicitly sets B<--backup> also. (defaulting to the current working " +"directory). Valid Modes: B, B," msgstr "" #. type: TP -#: ../deluser.8:122 +#: ../deluser.8:176 #, no-wrap -msgid "B<--backup>" +msgid "B<--conf >I" msgstr "" #. type: Plain text -#: ../deluser.8:126 +#: ../deluser.8:181 msgid "" -"Backup all files contained in the userhome and the mailspool file to a file " -"named I or I." -msgstr "" - -#. type: TP -#: ../deluser.8:126 -#, no-wrap -msgid "B<--backup-to >I" +"Use I instead of the default files I and " +"I. Multiple --conf options may be given." msgstr "" #. type: Plain text -#: ../deluser.8:130 +#: ../deluser.8:190 msgid "" -"Place the backup files not in the current directory but in I. This " -"implicitly sets B<--backup> also." +"Remove a group. This is the default action if the program is invoked as " +"I. Valid Mode: B." msgstr "" #. type: TP -#: ../deluser.8:130 +#: ../deluser.8:193 #, no-wrap -msgid "B<--remove-home>" +msgid "B<--only-if-empty>" msgstr "" #. type: Plain text -#: ../deluser.8:135 +#: ../deluser.8:197 msgid "" -"Remove the home directory of the user and its mailspool. If B<--backup> is " -"specified, the files are deleted after having performed the backup." +"Only remove if no members are left. Valid Modes: B, " +"B," msgstr "" #. type: TP -#: ../deluser.8:135 +#: ../deluser.8:200 #, no-wrap msgid "B<--remove-all-files>" msgstr "" #. type: Plain text -#: ../deluser.8:141 +#: ../deluser.8:207 msgid "" "Remove all files from the system owned by this user. Note: --remove-home " "does not have an effect any more. If B<--backup> is specified, the files " -"are deleted after having performed the backup." +"are deleted after having performed the backup. Valid Modes: B, " +"B," msgstr "" #. type: TP -#: ../deluser.8:141 +#: ../deluser.8:207 #, no-wrap -msgid "B<--version>" +msgid "B<--remove-home>" +msgstr "" + +#. type: Plain text +#: ../deluser.8:213 +msgid "" +"Remove the home directory of the user and its mailspool. If B<--backup> is " +"specified, the files are deleted after having performed the backup. Valid " +"Modes: B, B," +msgstr "" + +#. type: Plain text +#: ../deluser.8:218 +msgid "" +"Only delete if user/group is a system user/group. If the user does not " +"exist, no error value is returned. Valid Modes: B, B," msgstr "" #. type: SH -#: ../deluser.8:144 +#: ../deluser.8:224 #, no-wrap msgid "RETURN VALUE" msgstr "" #. type: Plain text -#: ../deluser.8:148 +#: ../deluser.8:228 msgid "Success: The action was successfully executed." msgstr "" #. type: Plain text -#: ../deluser.8:152 +#: ../deluser.8:232 msgid "The user to delete was not a system account. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:152 +#: ../deluser.8:232 #, no-wrap msgid "B<2>" msgstr "" #. type: Plain text -#: ../deluser.8:156 +#: ../deluser.8:236 msgid "There is no such user. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:156 +#: ../deluser.8:236 #, no-wrap msgid "B<3>" msgstr "" #. type: Plain text -#: ../deluser.8:160 +#: ../deluser.8:240 msgid "There is no such group. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:160 +#: ../deluser.8:240 #, no-wrap msgid "B<4>" msgstr "" #. type: Plain text -#: ../deluser.8:164 +#: ../deluser.8:244 msgid "Internal error. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:164 +#: ../deluser.8:244 #, no-wrap msgid "B<5>" msgstr "" #. type: Plain text -#: ../deluser.8:168 +#: ../deluser.8:248 msgid "The group to delete is not empty. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:168 +#: ../deluser.8:248 #, no-wrap msgid "B<6>" msgstr "" #. type: Plain text -#: ../deluser.8:172 +#: ../deluser.8:252 msgid "The user does not belong to the specified group. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:172 +#: ../deluser.8:252 #, no-wrap msgid "B<7>" msgstr "" #. type: Plain text -#: ../deluser.8:176 +#: ../deluser.8:256 msgid "You cannot remove a user from its primary group. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:176 +#: ../deluser.8:256 #, no-wrap msgid "B<8>" msgstr "" #. type: Plain text -#: ../deluser.8:181 +#: ../deluser.8:261 msgid "" -"The required perl 'perl' is not installed. This package is required to " +"The suggested package 'perl' is not installed. This package is required to " "perform the requested actions. No action was performed." msgstr "" #. type: TP -#: ../deluser.8:181 +#: ../deluser.8:261 #, no-wrap msgid "B<9>" msgstr "" #. type: Plain text -#: ../deluser.8:186 -msgid "" -"For removing the root account the parameter B<--no-preserve-root> is " -"required. No action was performed." +#: ../deluser.8:264 +msgid "The root account cannot be deleted. No action was performed." msgstr "" #. type: Plain text -#: ../deluser.8:195 +#: ../deluser.8:278 msgid "" "B needs root privileges and offers, via the B<--conf> command line " -"option to use a different configuration file. Do not use B or similar " -"tools to give partial privileges to B with restricted command line " -"parameters. This is easy to circumvent and might allow users to create " -"arbitrary accounts. If you want this, consider writing your own wrapper " -"script and giving privileges to execute that script." +"option to use different configuration files. Do not use B(8) or " +"similar tools to give partial privileges to B with restricted " +"command line parameters. This is easy to circumvent and might allow users " +"to create arbitrary accounts. If you want this, consider writing your own " +"wrapper script and giving privileges to execute that script." msgstr "" #. type: Plain text -#: ../deluser.8:199 +#: ../deluser.8:282 msgid "" -"I Default configuration file for B and " -"B" +"I Default configuration file for B(8) and " +"B(8)" msgstr "" #. type: TP -#: ../deluser.8:199 +#: ../deluser.8:282 #, no-wrap msgid "I" msgstr "" #. type: Plain text -#: ../deluser.8:208 -msgid "B(8), B(5), B(8), B(8)" +#: ../deluser.8:286 +msgid "Optional custom add-ons, see B(8)" msgstr "" #. type: Plain text -#: ../deluser.8:213 +#: ../deluser.8:293 msgid "" -"Copyright (C) 2000 Roland Bauerschmidt. Modifications (C) 2004 Marc Haber " -"and Joerg Hoh. This manpage and the B program are based on " -"B which is:" -msgstr "" - -#. type: Plain text -#: ../deluser.8:215 -msgid "Copyright (C) 1997, 1998, 1999 Guy Maor." -msgstr "" - -#. type: Plain text -#: ../deluser.8:221 -msgid "" -"Copyright (C) 1994 Ian Murdock. B is free software; see the GNU " -"General Public Licence version 2 or later for copying conditions. There is " -"I warranty." +"B(8), B(5), B(8), B(8), " +"B(8)" msgstr "" #. type: TH -#: ../deluser.conf.5:5 +#: ../deluser.conf.5:12 #, no-wrap msgid "DELUSER.CONF" msgstr "" #. type: Plain text -#: ../deluser.conf.5:9 -msgid "" -"/etc/deluser.conf - configuration file for B(8) and " -"B(8)." +#: ../deluser.conf.5:16 +msgid "/etc/deluser.conf - configuration file for B(8) and B(8)." msgstr "" #. type: Plain text -#: ../deluser.conf.5:15 +#: ../deluser.conf.5:25 msgid "" "The file I contains defaults for the programs " -"B(8) and B(8). Each option takes the form I