use hostname -f || hostname consistently

diff --git a/build-scripts/set-version-auth b/build-scripts/set-version-auth
index 4c21836344a76aa6dbdd866b130ad219f9d6b264..5355fe15a6aeace400ef09a53c2a202984b435b3 100755 (executable)
--- 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 e0e00c78c0696993ea1d2ed444d5071ac402fdb1..3bb5bbe2c03f200dcf78b71df3177bb9d917ef3a 100755 (executable)
--- 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 5095d59ad1ac5ecc8a352a5646f3bde29bfa7d4d..98747621f5e5054167687e005bb10ff84b30f8ef 100644 (file)
--- 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 e5f7fbd49da6ee00898775347d58fa79e782d214..abe66be4565f22d48b9efd99db9155d6dcf2b2aa 100644 (file)
--- 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 e7d58719c8dca57f0a8d10c1ee30e00201142b32..380b0c06da921b6e831f5ab5b17027de9aa67026 100755 (executable)
--- 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 e342dad903dc7c9e21d921494de111a1ad055c5d..4cd08e20690604fe693bbbc803e20e089a5ffb19 100755 (executable)
--- 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 \