From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 10 May 2013 18:42:48 +0000 (+0200)
Subject: make dist_recursor happy on a system without git and a resolvable hostname
X-Git-Tag: auth-3.3-rc1~70^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5255946196a0ed6c04a8cfb59d495ab8041e955;p=pdns

make dist_recursor happy on a system without git and a resolvable hostname
---

diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index 8222263bd..403aea601 100755
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -10,13 +10,13 @@ DIST_HOST=""
 ## End patch area.
 
 if [ -z "$VERSION" ]; then
-  VERSION=$(git describe --always --dirty=+ 2>/dev/null)
+  VERSION=$(git describe --always --dirty=+ 2>/dev/null || true)
   if [ -z "$VERSION" ]; then
     VERSION="UNKNOWN"
   else
     VERSION="git-"$VERSION
   fi
-  DIST_HOST="$(id -u -n)@$(hostname -f)"
+  DIST_HOST="$(id -u -n)@$(hostname -f || hostname)"
 fi
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \