- jmc@cvs.openbsd.org 2006/05/29 16:13:23

     [ssh.1]
     add GSSAPI to the list of authentication methods supported;

diff --git a/ChangeLog b/ChangeLog
index e4a97a589251f5456515c7f9ab4f79db927857a7..2d5c2ec58469f04260765ea9970a6d850e22b173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,13 @@
    - jmc@cvs.openbsd.org 2006/05/29 16:10:03
      [ssh_config.5]
      oops - previous was too long; split the list of auths up
+   - mk@cvs.openbsd.org 2006/05/30 11:46:38
+     [ssh-add.c]
+     Sync usage() with man page and reality.
+     ok deraadt dtucker
+   - jmc@cvs.openbsd.org 2006/05/29 16:13:23
+     [ssh.1]
+     add GSSAPI to the list of authentication methods supported;
 
 20060521
  - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor

diff --git a/ssh.1 b/ssh.1
index dab09c84e3f336230c9b5d63d35d1b025d15c4c5..874a5d2fe89f638c85f796793dfd25d41c2a2716 100644 (file)
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.259 2006/03/22 21:16:24 jakob Exp $
+.\" $OpenBSD: ssh.1,v 1.260 2006/05/29 16:13:23 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -666,6 +666,7 @@ Protocol 1 lacks a strong mechanism for ensuring the
 integrity of the connection.
 .Pp
 The methods available for authentication are:
+GSSAPI-based authentication,
 host-based authentication,
 public key authentication,
 challenge-response authentication,