whitespace

diff --git a/openssh/gss-genr.c b/openssh/gss-genr.c
index 8af17ca16ad8d7cb9d3faa75266888ecbced88cf..4a7bd4783a928611a8c4467def114591e3522d23 100644 (file)
--- a/openssh/gss-genr.c
+++ b/openssh/gss-genr.c
@@ -105,7 +105,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
                xfree(gss_enc2oid);
        }
 
-       gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping)*
+       gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
            (gss_supported->count + 1));
 
        buffer_init(&buf);
@@ -114,6 +114,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
        for (i = 0; i < gss_supported->count; i++) {
                if (gss_supported->elements[i].length < 128 &&
                    (*check)(NULL, &(gss_supported->elements[i]), data)) {
+
                        deroid[0] = SSH_GSS_OIDTYPE;
                        deroid[1] = gss_supported->elements[i].length;
 

diff --git a/openssh/servconf.h b/openssh/servconf.h
index 6fffff4dcf802d59991eccf07fcef4f396958b78..cfac80082861e0bc90e90423714c7b214ebaf177 100644 (file)
--- a/openssh/servconf.h
+++ b/openssh/servconf.h
@@ -94,8 +94,8 @@ typedef struct {
        int     gss_authentication;     /* If true, permit GSSAPI authentication */
        int     gss_keyex;              /* If true, permit GSSAPI key exchange */
        int     gss_cleanup_creds;      /* If true, destroy cred cache on logout */
-       char*   gss_creds_path; /* If true, destroy cred cache on logout */
        int     gss_strict_acceptor;    /* If true, restrict the GSSAPI acceptor name */
+       char*   gss_creds_path; /* If true, destroy cred cache on logout */
        int     gsi_allow_limited_proxy;        /* If true, accept limited proxies */
        int     password_authentication;        /* If true, permit password
                                                 * authentication. */

diff --git a/openssh/ssh_config.5 b/openssh/ssh_config.5
index 82aab37d530bcfe9653b562586323d9dc5cab536..2b407817043ffe623458b62fa0ffce8bb45d5f56 100644 (file)
--- a/openssh/ssh_config.5
+++ b/openssh/ssh_config.5
@@ -501,7 +501,7 @@ Set to
 .Dq yes 
 to indicate that the DNS is trusted to securely canonicalize
 the name of the host being connected to. If 
-.Dq no, 
+.Dq no , 
 the hostname entered on the
 command line will be passed untouched to the GSSAPI library.
 The default is

diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index c6ce8515824a5cb579a4505ee4d84289efc4923d..4a18b0582bc021e231913a3589b6b1a440b3c594 100644 (file)
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -139,7 +139,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
        if (options.ciphers != NULL) {
                myproposal[PROPOSAL_ENC_ALGS_CTOS] =
                myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
-       }
+       } 
 
        myproposal[PROPOSAL_ENC_ALGS_CTOS] =
            compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);