Merge ~paride/ubuntu/+source/samba:lp1942195-focal into ubuntu/+source/samba:ubuntu/focal-devel

[Paride Legovini]

Focal SRU for LP: #1942195, see the SRU template for more info testing instructions.
Test PPA: Test PPA: https://launchpad.net/~paride/+archive/ubuntu/samba-lp1942195

Autopkgtest:

@@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access SKIP Test requires machine-level isolation but testbed does not provide that
reinstall-samba-common-bin SKIP Test requires machine-level isolation but testbed does not provide that
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS

Please review & sponsor. Thanks!

[Sergio Durigan Junior (sergiodj)]

Thanks.

Tested locally. LGTM, +1.

Uploaded:

$ dput samba_4.11.6+dfsg-0ubuntu1.11_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/samba/samba_4.11.6+dfsg-0ubuntu1.11_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/samba/samba_4.11.6+dfsg-0ubuntu1.11.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.11.6+dfsg-0ubuntu1.11.dsc: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1.11.debian.tar.xz: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1.11_source.buildinfo: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1.11_source.changes: done.
Successfully uploaded packages.

review: Approve

[Paride Legovini (paride)]

Thanks for uploading! For completeness:

autopkgtest [12:01:47]: @@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access PASS
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS
reinstall-samba-common-bin PASS

[Paride Legovini (paride)]

@Sergio I rebased this on 2:4.13.14+dfsg-0ubuntu0.20.04.1, we need to upload it again.

[Paride Legovini (paride)]

New autopkgtest results:

autopkgtest [16:17:07]: @@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access PASS
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS
reinstall-samba-common-bin PASS

[Sergio Durigan Junior (sergiodj)]

Thanks, Paride.

LGTM.

Uploaded:

$ dput samba_4.13.14+dfsg-0ubuntu0.20.04.2_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/samba/samba_4.13.14+dfsg-0ubuntu0.20.04.2_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/samba/samba_4.13.14+dfsg-0ubuntu0.20.04.2.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.13.14+dfsg-0ubuntu0.20.04.2.dsc: done.
  Uploading samba_4.13.14+dfsg-0ubuntu0.20.04.2.debian.tar.xz: done.
  Uploading samba_4.13.14+dfsg-0ubuntu0.20.04.2_source.buildinfo: done.
  Uploading samba_4.13.14+dfsg-0ubuntu0.20.04.2_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3637b2c..08be40e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.13.14+dfsg-0ubuntu0.20.04.2) focal; urgency=medium
+
+  * samba.postinst: do not populate sambashare from the Ubuntu admin group
+    (LP: #1942195)
+
+ -- Paride Legovini <[e-mail]>  Fri, 12 Nov 2021 14:42:02 +0100
+
 samba (2:4.13.14+dfsg-0ubuntu0.20.04.1) focal-security; urgency=medium
 
   * Update to 4.13.14 as a security update (LP: #1950363)
diff --git a/debian/samba.postinst b/debian/samba.postinst
index 79e688a..eb327a2 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -59,20 +59,6 @@ umask 022
 if ! getent group sambashare > /dev/null 2>&1
 then
 	addgroup --system sambashare
-	# Only on Ubuntu, use the "admin" group as a template for the
-	# initial users for this group; Debian has no equivalent group,
-	# so leaving the sambashare group empty is the more secure default
-	if [ -x "`which lsb_release 2>/dev/null`" ] \
-	   && [ "`lsb_release -s -i`" = "Ubuntu" ]
-	then
-		OLDIFS="$IFS"
-		IFS=","
-		for USER in `getent group admin | cut -f4 -d:`; do
-			adduser "$USER" sambashare \
-			|| ! getent passwd "$USER" >/dev/null
-		done
-		IFS="$OLDIFS"
-	fi
 fi
 
 if [ ! -e /var/lib/samba/usershares ]