Commit fd395e2e authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Error when unable to determine an SSH version

parent 81da77e1

.shell/lib/ssh.sh

+4 −2
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ fi 


ssh_version() {

	eval `${SSH_BIN} -V 2>&1 | sed -n \

		's/OpenSSH_\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/SSH_MAJOR="\1" SSH_MINOR="\2"/p'`

		's/OpenSSH_\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/SSH_MAJOR="\1" SSH_MINOR="\2"; return 0/p'`

	echo >&2 "Failed to get SSH version"

	return 1

}



config_sed() {
@@ -45,7 +47,7 @@ runtime() { 
make_config() {

	[ -z "${SSH_CONFIG-}" ] || return 0



	ssh_version && runtime && config_sed

	ssh_version && runtime && config_sed || return 1



	PLATFORM_UNIQ="$PLATFORM:$KERNEL:`hostname -f 2>/dev/null || hostname`:$SSH_MAJOR.$SSH_MINOR"

	PLATFORM_ID=`echo "$PLATFORM_UNIQ" | md5sum | cut -f1 -d' '`