[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Remove unused overrides (dependency-is-not-multi-archified lib{nss,pam}-winbind…

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
77730e4a by Mathieu Parent at 2018-04-08T21:05:26+02:00
Remove unused overrides (dependency-is-not-multi-archified lib{nss,pam}-winbind depends on winbind (multi-arch: no))

- - - - -
f175f540 by Mathieu Parent at 2018-04-08T21:33:42+02:00
Ignore nmbd start errors when there is no non-loopback interface (Closes: #893762)

- - - - -


3 changed files:

- debian/rules
- debian/samba.postinst
- − debian/source/lintian-overrides


Changes:

=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -181,7 +181,7 @@ override_dh_installchangelogs:
 override_dh_installinit:
 ifneq (,$(filter samba, $(shell dh_listpackages)))
 	dh_installinit -psamba --name smbd
-	dh_installinit -psamba --name nmbd
+	dh_installinit -psamba --name nmbd --error-handler nmbd_error_handler
 	dh_installinit -psamba --name samba-ad-dc
 endif
 ifneq (,$(filter winbind, $(shell dh_listpackages)))


=====================================
debian/samba.postinst
=====================================
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -2,6 +2,17 @@
 
 set -e
 
+nmbd_error_handler() {
+    if [ -d /sys/class/net/lo ] && ls /sys/class/net/lo | grep -qv ^lo$; then
+        # https://bugs.debian.org/893762
+        echo 'WARNING: nmbd failed to start as there is no non-loopback interface.'
+        echo 'Either add an interface or set "disable netbios = yes" in smb.conf and run "systemctl mask nmbd"'
+        return 0
+    else
+        return 1 # caught by set -e
+    fi
+}
+
 mask_services() {
     local reason="$1"
     shift


=====================================
debian/source/lintian-overrides deleted
=====================================
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# winbind talks over a unix domain socket, so non-arch specific dependencies are fine.
-samba source: dependency-is-not-multi-archified libnss-winbind depends on winbind (multi-arch: no)
-samba source: dependency-is-not-multi-archified libpam-winbind depends on winbind (multi-arch: no)



View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/e9a8e36633c73587618ebab518d2866e20691a48...f175f540fb26aa1f9193322874e2e28120d38ba6

---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/e9a8e36633c73587618ebab518d2866e20691a48...f175f540fb26aa1f9193322874e2e28120d38ba6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20180408/1a68f525/attachment-0001.html>