[Pkg-shadow-devel] [Git][debian/adduser][debian/latest] 4 commits: remove GROUPHOMES and LETTERHOMES configuration options
Marc Haber (@zugschlus)
gitlab at salsa.debian.org
Sat Jan 24 16:59:11 GMT 2026
Marc Haber pushed to branch debian/latest at Debian / adduser
Commits:
7a108334 by Marc Haber at 2026-01-24T08:31:44+01:00
remove GROUPHOMES and LETTERHOMES configuration options
- - - - -
9b223f9b by Marc Haber at 2026-01-24T08:31:44+01:00
remove SETGID_HOME configuration option
- - - - -
e120eb0b by Marc Haber at 2026-01-24T08:31:44+01:00
remove deprecated QUOTAUSER configuration option
- - - - -
f4307089 by Marc Haber at 2026-01-24T08:31:44+01:00
document option removals
Git-Dch: ignore
- - - - -
6 changed files:
- AdduserCommon.pm
- adduser
- adduser.conf
- debian/NEWS
- debian/README
- doc/adduser.conf.5
Changes:
=====================================
AdduserCommon.pm
=====================================
@@ -512,12 +512,8 @@ sub preseed_config {
usergroups => "yes",
users_gid => undef,
users_group => undef,
- grouphomes => "no",
- letterhomes => "no",
- quotauser => "",
dir_mode => "0700",
sys_dir_mode => "0755",
- 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 => def_name_regex,
sys_name_regex => def_sys_name_regex,
=====================================
adduser
=====================================
@@ -1020,12 +1020,6 @@ if ($action eq "adduser") {
}
- if ($config{"quotauser"}) {
- log_info( mtx("Setting quota for user `%s' to values of user `%s' ..."), $new_name, $config{quotauser} );
- my $edquota = &which('edquota');
- systemcall($edquota, '-p', $config{quotauser}, $new_name);
- }
-
systemcall('/usr/local/sbin/adduser.local', $new_name, $new_uid,
$primary_gid, $home_dir) if (-x "/usr/local/sbin/adduser.local");
release_lock(0);
@@ -1050,8 +1044,6 @@ if ($action eq "unlockuser") {
# calculate home directory
sub homedir {
my $dir = $config{"dhome"};
- $dir .= '/' . $_[1] if ($config{"grouphomes"} =~ /yes/i);
- $dir .= '/' . substr($_[0],0,1) if ($config{"letterhomes"} =~ /yes/i);
$dir .= '/' . $_[0];
return $dir;
}
@@ -1113,7 +1105,7 @@ sub create_homedir {
my $src = sanitize_string($_, pathre );
log_trace("copy_to_dir(%s, %s, %s, %s, %s)", $config{"skel"}, $src, $home_dir, $new_uid, $primary_gid );
©_to_dir($config{"skel"}, $src, $home_dir, $new_uid,
- $primary_gid, ($config{"setgid_home"} =~ /yes/i));
+ $primary_gid);
}
close ($findpipe);
}
@@ -1217,11 +1209,10 @@ sub check_user_group {
# todir
# newi
# newg
-# sgiddir
# return values:
# none
sub copy_to_dir {
- my($fromdir, $file, $todir, $newu, $newg, $sgiddir) = @_;
+ my($fromdir, $file, $todir, $newu, $newg) = @_;
log_trace("copy_to_dir fromdir: %s", $fromdir);
log_trace("copy_to_dir file: %s", $file);
@@ -1281,9 +1272,6 @@ sub copy_to_dir {
&cleanup();
}
$perm = (stat("$fromdir/$file"))[2] & oct(7777);
- if (-d "$fromdir/$file" && ($perm & oct(10)) && $sgiddir) {
- $perm |= oct(2000);
- }
if( !chmod($perm, "$todir/$file") ) {
log_err( "chmod %s/%s: %s", $todir, $file, $!);
&cleanup();
@@ -1671,7 +1659,6 @@ sub usage_error {
# a valid octal mode
sub get_dir_mode
{
- my $setgid = $config{"setgid_home"} =~ /yes/i;
my $mode = $found_sys_opt
? $config{"sys_dir_mode"}
: $config{"dir_mode"};
@@ -1680,10 +1667,6 @@ sub get_dir_mode
$mode = ($found_sys_opt) ? "755" : "0700";
}
- if($setgid && (length($mode) == 3 || $mode =~ /^[0-1|4-5][0-7]{3}$/)) {
- $mode += 2000;
- }
-
return oct($mode);
}
=====================================
adduser.conf
=====================================
@@ -76,11 +76,6 @@
# Default: SYS_DIR_MODE=0755
#SYS_DIR_MODE=0755
-# If set to a nonempty value, new users will have quotas copied
-# from that user with `edquota -p QUOTAUSER newuser'
-# Default: QUOTAUSER=""
-#QUOTAUSER=""
-
# Non-system user- and groupnames are checked against this regular
# expression. RFC8265 would allow all codepoints U+0021 through U+007E
# meaning: !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~ plus digits, lower case and
=====================================
debian/NEWS
=====================================
@@ -1,3 +1,10 @@
+adduser (3.155) UNRELEASED; urgency=medium
+
+ The GROUPHOMES, LETTERHOMES, SGID_HOME and QUOTAUSER options were
+ depreated for a while and got removed in this release.
+
+ -- Marc Haber <mh+debian-packages at zugschlus.de> Mon, 19 Jan 2026 09:23:49 +0100
+
adduser (3.138) unstable; urgency=medium
Some dysfunctionalities in adduser's logging have been fixed, so the
=====================================
debian/README
=====================================
@@ -36,12 +36,10 @@ Information that is in the manual pages is probably not going to be
repeated in this README file.
-
Deprecation warnings
--------------------
The following features, options, and other things are deprecated and
might vanish in the next release:
-- the GROUPHOMES, LETTERHOMES, SETGID_HOME configuration options
- the --add_extra_groups spelling of the --add-extra-groups option
- the --gecos alias for the --comment option
- the --debug alias for the --stdoutmsglevel=debug option
@@ -59,6 +57,7 @@ the last releases:
- interactivity
- debconf
- support for directory services such as NIS and LDAP
+- the GROUPHOMES, LETTERHOMES, SETGID_HOME configuration options
=====================================
doc/adduser.conf.5
=====================================
@@ -91,11 +91,6 @@ Defaults to \fI1000\fP - \fI59999\fP.
.B GID_POOL
See \fBUID_POOL\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. This option is \fBdeprecated\fP and will be removed.
-.TP
.B LAST_SYSTEM_GID
.TQ
.B LAST_GID
@@ -105,13 +100,6 @@ Defaults to \fIno\fP. This option is \fBdeprecated\fP and will be removed.
.B LAST_UID
See the \fBFIRST_\fP variants of the option.
.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. This option is \fBdeprecated\fP and will be removed.
-.TP
.B NAME_REGEX
Non-system user- and groupnames are checked against this regular expression.
If the name doesn't match this regexp,
@@ -123,28 +111,12 @@ Defaults to the most conservative \fI^[a\-zA\-Z][a\-zA\-Z0\-9_\-]*\\$?$\fP.
See \fBSYS_NAME_REGEX\fP and \fBValid names\fP,
below, for more information.
.TP
-.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 RESERVE_UID_POOL " and " RESERVE_GID_POOL
Controls whether the UID and GID values that are listed in the pool
files are truly reserved.
See UID AND GID POOLS in the NOTES section.
Defaults to \fIyes\fR.
.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 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 SKEL
The directory from which
skeletal user configuration files will be copied.
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/58261a74839f831a5eea5fdc765aa75293d139e1...f4307089d3034760340449f2ede498359d2b7716
--
View it on GitLab: https://salsa.debian.org/debian/adduser/-/compare/58261a74839f831a5eea5fdc765aa75293d139e1...f4307089d3034760340449f2ede498359d2b7716
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-shadow-devel/attachments/20260124/fae9ff5d/attachment-0001.htm>
More information about the Pkg-shadow-devel
mailing list