Merge tag '0.6.1' into debian

release 0.6.1

1 files changed, 22 insertions, 5 deletions

diff --git a/update-openssh-known-hosts b/update-openssh-known-hosts
index d9ef613..82c56c4 100755
--- a/update-openssh-known-hosts
+++ b/update-openssh-known-hosts
@@ -1,12 +1,29 @@
 #!/bin/bash
 
+# Copyright (C) 2009-2014 Timo Weingärtner <timo@tiwe.de>
+#
+# This file is part of openssh-known-hosts.
+#
+# openssh-known-hosts is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# openssh-known-hosts is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with openssh-known-hosts. If not, see <http://www.gnu.org/licenses/>.
+
 set -euC
 
-CONFDIR=/etc/openssh-known-hosts
-PLUGIN_PATH=/usr/local/share/openssh-known-hosts/plugins:/usr/share/openssh-known-hosts/plugins
-CACHEDIR=/var/cache/openssh-known-hosts
-LOCK=/var/lock/openssh-known-hosts
-OUTFILE=/var/lib/openssh-known-hosts/ssh_known_hosts
+CONFDIR=${CONFDIR:-/etc/openssh-known-hosts}
+PLUGIN_PATH=${PLUGIN_PATH:-/usr/local/share/openssh-known-hosts/plugins:/usr/share/openssh-known-hosts/plugins}
+CACHEDIR=${CACHEDIR:-/var/cache/openssh-known-hosts}
+LOCK=${LOCK:-/var/lock/openssh-known-hosts}
+OUTFILE=${OUTFILE:-/var/lib/openssh-known-hosts/ssh_known_hosts}
 
 path_search () {
 	search="$1"