Compatibility SSH_COPY_ID_LEGACY for ssh-copy-id

This commit is contained in:
Jakub Jelen 2015-12-18 14:33:17 +01:00
parent 86f52d4e69
commit c9e7e79685

View File

@ -490,3 +490,43 @@ index 994194e..afde8b1 100755
1.9.1 1.9.1
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index afde8b1..cd52764 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -170,6 +170,8 @@ do
usage
;;
esac
+
+ [ "x$SSH_COPY_ID_LEGACY" != "x" ] && FORCED=1
done
eval set -- "$SAVEARGS"
diff --git a/contrib/ssh-copy-id.1 b/contrib/ssh-copy-id.1
index 8850cce..62f112d 100644
--- a/contrib/ssh-copy-id.1
+++ b/contrib/ssh-copy-id.1
@@ -185,6 +185,22 @@ should prove enlightening (N.B. the modern approach is to use the
.Fl W
option, rather than
.Xr nc 1 ) .
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.Pp
+.It Pa SSH_COPY_ID_LEGACY
+If the
+.Cm SSH_COPY_ID_LEGACY
+environment variable is set, the
+.Nm
+is run in a legacy mode. In this mode, the
+.Nm
+doesn't check an existence of a private key and doesn't do remote checks
+of the remote server versions or if public keys are already installed
+(equivalent to
+.Fl f
+switch).
+.El
.Sh "SEE ALSO"
.Xr ssh 1 ,
.Xr ssh-agent 1 ,