From: Florian Obser <florian@narrans.de>
Date: Thu, 7 May 2015 14:16:10 +0000 (+0200)
Subject: use hostname -f || hostname consistently
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~55^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2507%2Fhead;p=thirdparty%2Fpdns.git

use hostname -f || hostname consistently
---

diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth
index 4c21836344..5355fe15a6 100755
--- a/build-scripts/set-version-auth
+++ b/build-scripts/set-version-auth
@@ -4,7 +4,7 @@ DEB_VERSION=$2
 RPM_VERSION=$3
 [ -z "$VERSION" -o -z "$DEB_VERSION" -o -z "$RPM_VERSION" ] && exit 1
 
-DIST_HOST="$(id -u -n)@$(hostname -f)"
+DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 
 sed -r "s/Version: (.*)/Version: $RPM_VERSION/" -i pdns.spec
 sed -r "s/AC_INIT\(\[pdns\],(.*)/AC_INIT([pdns], [$VERSION])/" -i configure.ac
diff --git a/build-scripts/set-version-recursor b/build-scripts/set-version-recursor
index e0e00c78c0..3bb5bbe2c0 100755
--- a/build-scripts/set-version-recursor
+++ b/build-scripts/set-version-recursor
@@ -7,7 +7,7 @@ DEB_VERSION=$2
 RPM_VERSION=$3
 [ -z "$VERSION" -o -z "$DEB_VERSION" -o -z "$RPM_VERSION" ] && exit 1
 
-DIST_HOST="$(id -u -n)@$(hostname -f)"
+DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 
 sed -r "s/^VERSION=(.*)/VERSION=$VERSION/" -i pdns/dist-recursor
 sed -r "s/^DIST_HOST=(.*)/DIST_HOST=$DIST_HOST/" -i pdns/dist-recursor
diff --git a/pdns/Makefile-recursor b/pdns/Makefile-recursor
index 5095d59ad1..98747621f5 100644
--- a/pdns/Makefile-recursor
+++ b/pdns/Makefile-recursor
@@ -71,7 +71,7 @@ dnslabeltext.cc: dnslabeltext.rl
 
 # Version
 build_date := $(shell LC_TIME=C date '+%Y%m%d%H%M%S')
-build_host := $(shell id -u -n)@$(shell hostname -f)
+build_host := $(shell id -u -n)@$(shell hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)
 
 .PHONY: version_generated.h
 version_generated.h:
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e5f7fbd49d..abe66be456 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1092,7 +1092,7 @@ bind-dnssec.schema.sqlite3.sql.h: bind-dnssec.schema.sqlite3.sql
 	cp $< $@
 
 build_date := $(shell LC_TIME=C date '+%Y%m%d%H%M%S')
-build_host := $(shell id -u -n)@$(shell hostname -f)
+build_host := $(shell id -u -n)@$(shell hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)
 git_version := $(shell git describe --always --dirty=+ 2>/dev/null)
 # Do the test in shell, so we don't confuse automake with ifeq/ifneq.
 pdns_version := $(shell test -z "$(git_version)" && echo UNKNOWN || echo "git-$(git_version)")
diff --git a/pdns/build-recursor b/pdns/build-recursor
index e7d58719c8..380b0c06da 100755
--- a/pdns/build-recursor
+++ b/pdns/build-recursor
@@ -9,7 +9,7 @@ if [ -z "$1" ]; then
   else
     VERSION="git-"$VERSION
   fi
-  DIST_HOST="$(id -u -n)@$(hostname -f || hostname)"
+  DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 else
   VERSION=$1
 fi
diff --git a/pdns/dist-recursor b/pdns/dist-recursor
index e342dad903..4cd08e2069 100755
--- a/pdns/dist-recursor
+++ b/pdns/dist-recursor
@@ -20,7 +20,7 @@ if [ -z "$VERSION" ]; then
   else
     VERSION="git-"$VERSION
   fi
-  DIST_HOST="$(id -u -n)@$(hostname -f || hostname)"
+  DIST_HOST="$(id -u -n)@$(hostname -f 2>/dev/null || hostname 2>/dev/null || echo localhost)"
 fi
 
 INCLUDES="iputils.hh arguments.hh base64.hh zoneparser-tng.hh \