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

[Paride Legovini]

Bionic 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
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)]

I can look at this one.

[Paride Legovini (paride)]

Thanks! Note that there are similar MPs for the other supported releases.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Paride.

I tested it locally and it solves the bug. I reviewed this same change on Debian, so I'm comfortable with it.

Uploaded:

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

review: Approve

[Sergio Durigan Junior (sergiodj)]

Ah, just a small comment about the autopkgtest: as you notice, some of the tests haven't been performed because you need to run autopkgtest using qemu as its driver. This is something worth doing for next time, IMO. Thanks.

[Paride Legovini (paride)]

Thanks! For completeness:

autopkgtest [11:31:28]: @@@@@@@@@@@@@@@@@@@@ summary
cifs-share-access PASS
python-smoke PASS
smbclient-anonymous-share-list PASS
smbclient-authenticated-share-list PASS
smbclient-share-access PASS

[Christian Ehrhardt  (paelzer)]

 samba | 2:4.7.6+dfsg~ubuntu-0ubuntu2.27 | bionic-updates | source, amd64, arm64, armhf, i386, ppc64el, s390x

https://launchpad.net/ubuntu/+source/samba/2:4.7.6+dfsg~ubuntu-0ubuntu2.27
Is later but includes the former
https://launchpad.net/ubuntu/+source/samba/2:4.7.6+dfsg~ubuntu-0ubuntu2.24

Completed, please set the MR to merged (plenty of pings today as I can't do that anymore nowadays :-/ )

diff --git a/debian/changelog b/debian/changelog
index 20dfe5a..da36c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.7.6+dfsg~ubuntu-0ubuntu2.24) bionic; urgency=medium
+
+  * samba.postinst: do not populate sambashare from the Ubuntu admin group
+    (LP: #1942195)
+
+ -- Paride Legovini <[e-mail]>  Wed, 10 Nov 2021 15:29:48 +0100
+
 samba (2:4.7.6+dfsg~ubuntu-0ubuntu2.23) bionic-security; urgency=medium
 
   * SECURITY UPDATE: wrong group entries via negative idmap cache entries
diff --git a/debian/samba.postinst b/debian/samba.postinst
index 4749ce0..0f39464 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -14,20 +14,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 ]