removing comments that bracket Bin He's modifications to make the GSSAPI

patch a little leaner

diff --git a/openssh/packet.c b/openssh/packet.c
index f0cc312aad6a07e7c1c378d44b2d638f32465423..b9e0de54aae302a59025e3f54fba9d3e38fe13f4 100644 (file)
--- a/openssh/packet.c
+++ b/openssh/packet.c
@@ -1040,14 +1040,12 @@ packet_get_string(u_int *length_ptr)
        return buffer_get_string(&incoming_packet, length_ptr);
 }
 
-/*modified by binhe*/
 /* Clears incoming data buffer */
 
 void packet_get_all(void)
 {
   buffer_clear(&incoming_packet);
 }
-/*end of modification*/
 
 /*
  * Sends a diagnostic message from the server to the client.  This message

diff --git a/openssh/packet.h b/openssh/packet.h
index 5aaa77551452a6f0b861d85df9d790479e3edf96..12c2e0027b8483c104b3ed31e6fc780a57f847d1 100644 (file)
--- a/openssh/packet.h
+++ b/openssh/packet.h
@@ -53,9 +53,7 @@ void     packet_get_bignum(BIGNUM * value);
 void     packet_get_bignum2(BIGNUM * value);
 void   *packet_get_raw(int *length_ptr);
 void   *packet_get_string(u_int *length_ptr);
-/*modified by binhe*/
-void packet_get_all(void);
-/*end of modification*/
+void   packet_get_all(void);
 void     packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
 void     packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
 

diff --git a/openssh/ssh1.h b/openssh/ssh1.h
index 72c47f9d3c82d5bfba54eb5314345c568e1a924d..4cfe2a3af15c5b6123f19732d3d6b13d06ee8601 100644 (file)
--- a/openssh/ssh1.h
+++ b/openssh/ssh1.h
@@ -70,14 +70,12 @@
 #define SSH_MSG_CHANNEL_INPUT_EOF      SSH_MSG_CHANNEL_CLOSE
 #define SSH_MSG_CHANNEL_OUTPUT_CLOSE   SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
 
-/*modified by binhe*/
 /* GSS-API authentication */
 #define SSH_CMSG_AUTH_GSSAPI                    88      /* int, strings... */
 #define SSH_SMSG_AUTH_GSSAPI_RESPONSE           89      /* string */
 #define SSH_MSG_AUTH_GSSAPI_TOKEN               90      /* string */
 #define SSH_SMSG_AUTH_GSSAPI_HASH               91      /* string */
 #define SSH_MSG_AUTH_GSSAPI_ABORT               92      /* */
-/*end of modification*/
 
 /*
  * Authentication methods.  New types can be added, but old types should not
@@ -93,9 +91,7 @@
                                /* 8 to 15 are reserved */
 #define SSH_PASS_AFS_TOKEN     21
 
-/*modified by binhe*/
 #define SSH_AUTH_GSSAPI                24
-/*end of modification*/
 
 /* Protocol flags.  These are bit masks. */
 #define SSH_PROTOFLAG_SCREEN_NUMBER    1       /* X11 forwarding includes screen */

diff --git a/openssh/sshd.c b/openssh/sshd.c
index c3f54f080f7d656561339752f106cb91b622ee27..3442baa9506d7192d2eff00a39234f58bcdc1718 100644 (file)
--- a/openssh/sshd.c
+++ b/openssh/sshd.c
@@ -77,12 +77,10 @@ RCSID("$OpenBSD: sshd.c,v 1.228 2002/02/27 21:23:13 stevesk Exp $");
 #include "ssh-gss.h"
 #endif
 
-/*modified by binhe*/
 #ifdef GSSAPI
 #include <openssl/md5.h>
 #include "bufaux.h"
 #endif /* GSSAPI */
-/*end of modification*/
 
 #ifdef LIBWRAP
 #include <tcpd.h>
@@ -823,11 +821,9 @@ main(int ac, char **av)
        if (test_flag)
                exit(0);
 
-/*modified by binhe*/
 #ifdef GSSAPI
   gssapi_clean_env();
 #endif /* GSSAPI */
-/*end of modification*/
 
 #ifdef HAVE_SCO_PROTECTED_PW
        (void) set_auth_parameters(ac, av);
@@ -1349,12 +1345,10 @@ do_ssh1_kex(void)
        if (options.challenge_response_authentication == 1)
                auth_mask |= 1 << SSH_AUTH_TIS;
 
-/*modified by binhe*/
 #ifdef GSSAPI
        if (options.gss_authentication)
                auth_mask |= 1 << SSH_AUTH_GSSAPI;
 #endif
-/*end of modification*/
 
        if (options.password_authentication)
                auth_mask |= 1 << SSH_AUTH_PASSWORD;
@@ -1482,7 +1476,6 @@ do_ssh1_kex(void)
                        session_id[i] = session_key[i] ^ session_key[i + 16];
        }
 
-/*modified by binhe*/
 #ifdef GSSAPI
   /*
    * Before we destroy the host and server keys, hash them so we can
@@ -1524,7 +1517,6 @@ do_ssh1_kex(void)
     buffer_free(&buf);
   }
 #endif /* GSSAPI */
-/*end of modification*/
 
        /* Destroy the private and public keys.  They will no longer be needed. */
        destroy_sensitive_data();