[Pkg-openldap-devel] [openldap] 10/29: r1550 at pulsar: torsten | 2005-03-21 23:06:01 +0100 * debian/slapd.config: Don't fail if hostname is unset (pulled from Ubuntu, thanks to Jeff Bailey).

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to annotated tag 2.2.23-0.pre6
in repository openldap.

commit 0d2d75761b5c20a1035d077373added6c62dc91a
Author: Torsten Landschoff <torsten at debian.org>
Date:   Mon Mar 21 22:00:48 2005 +0000

     r1550 at pulsar:  torsten | 2005-03-21 23:06:01 +0100
      * debian/slapd.config: Don't fail if hostname is unset (pulled from
        Ubuntu, thanks to Jeff Bailey).
---
 debian/changelog    |    2 ++
 debian/slapd.config |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 69eb85a..dc69fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ openldap2.2 (2.2.23-0.pre6) experimental; urgency=low
     is included (closes: #300212).
     + debian/control: Add Replaces: slapd << 2.2.23-0.pre6 to ldap-utils.
     + debian/move_files: Move slappasswd manpage into ldap-utils.
+  * debian/slapd.config: Don't fail if hostname is unset (pulled from 
+    Ubuntu, thanks to Jeff Bailey). 
 
  -- 
 
diff --git a/debian/slapd.config b/debian/slapd.config
index 5ebf294..1b13f68 100644
--- a/debian/slapd.config
+++ b/debian/slapd.config
@@ -12,7 +12,7 @@ set -e
 
 # Set up the defaults for our templates
 set_defaults_for_unseen_entries() {
-  DOMAIN=`hostname -d`
+  DOMAIN=`hostname -d` || true
   if [ -z "$DOMAIN" ]; then DOMAIN='nodomain'; fi
 
   db_fget slapd/domain seen

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git