[debian-edu-commits] debian-edu/ 26/31: Change empty-domain.dpatch to fetch mail domain from DNS domain and not NIS domain (Closes: #656297).
Alexander Alemayhu
ccscanf-guest at moszumanska.debian.org
Tue Jun 10 23:27:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
ccscanf-guest pushed a commit to branch master
in repository killer.
commit 41ec1a28893b2b2aff61b4343a120523547d2321
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Wed Jan 18 08:53:09 2012 +0000
Change empty-domain.dpatch to fetch mail domain from DNS domain and
not NIS domain (Closes: #656297).
---
debian/changelog | 7 +++++++
debian/patches/empty-domain.dpatch | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a0d26c7..3520004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+killer (0.90-8~svn75522) UNRELEASED; urgency=low
+
+ * Change empty-domain.dpatch to fetch mail domain from DNS domain and
+ not NIS domain (Closes: #656297).
+
+ -- Petter Reinholdtsen <pere at debian.org> Wed, 18 Jan 2012 09:52:24 +0100
+
killer (0.90-7~lenny1) stable; urgency=low
* Upload to stable.
diff --git a/debian/patches/empty-domain.dpatch b/debian/patches/empty-domain.dpatch
index d5739d2..61a0808 100644
--- a/debian/patches/empty-domain.dpatch
+++ b/debian/patches/empty-domain.dpatch
@@ -1,6 +1,8 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-Use 'localhost' as domain if it is currently unset.
+Use 'localhost' as domain if it is currently unset. Use DNS domain
+and not NIS domain when figuring out what to use after @ in email
+addresses.
@DPATCH@
diff -u killer-0.90/killer killer-0.90/killer
@@ -10,8 +12,8 @@ diff -u killer-0.90/killer killer-0.90/killer
# Configuration options:
# ########
-+my $domainname = `domainname 2>/dev/null || true`;
-my $domainname = `domainname`;
++my $domainname = `dnsdomainname 2>/dev/null || true`;
chop $domainname;
+$domainname = "localhost" unless ($domainname);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/killer.git
More information about the debian-edu-commits
mailing list