View | Details | Raw Unified | Return to bug 204 | Differences between
and this patch

Collapse All | Expand All

(-)auth1.c (-2 / +5 lines)
Lines 335-343 Link Here
335 
	if ((style = strchr(user, ':')) != NULL)
 335 
	if ((style = strchr(user, ':')) != NULL)
336 
		*style++ = '\0';
 336 
		*style++ = '\0';
337 

          337
          

        

            

              
              
              338
              
#ifdef KRB5

            

        

          338
          
	/* XXX - SSH.com Kerberos v5 braindeath. */

          339
          
	/* XXX - SSH.com Kerberos v5 braindeath. */

        

          
            

              339
              
	if ((p = strchr(user, '@')) != NULL)


              340
              
	if ((datafellows & SSH_BUG_K5USER) && options.kerberos_authentication)

            

            

              340
              
		*p = '\0';


              341
              
		if ((p = strchr(user, '@')) != NULL)

            

            

              
              

              342
              
			*p = '\0';

            

            


              343
              
#endif

            

        

          341
          

          344
          

        

        

          342
          
	authctxt = authctxt_new();

          345
          
	authctxt = authctxt_new();

        

        

          343
          
	authctxt->user = user;

          346
          
	authctxt->user = user;

        



(-)compat.c
      (-2 / +6 lines)




  

    
      
            Lines 127-134
          
      
      
        Link Here
      
    
  

        

          127
          
		  "1.2.19*,"

          127
          
		  "1.2.19*,"

        

        

          128
          
		  "1.2.20*,"

          128
          
		  "1.2.20*,"

        

        

          129
          
		  "1.2.21*,"

          129
          
		  "1.2.21*,"

        

          
            

              130
              
		  "1.2.22*",		SSH_BUG_IGNOREMSG },


              130
              
		  "1.2.22*",		SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },

            

            

              131
              
		{ "1.3.2*",		SSH_BUG_IGNOREMSG },	/* f-secure */


              131
              
		{ "1.3.2*",		/* F-Secure */

            

            

              
              

              132
              
					SSH_BUG_IGNOREMSG|SSH_BUG_K5USER },

            

            


              133
              
		{ "1.2.1*,"

            

            


              134
              
		  "1.2.2*,"

            

            


              135
              
		  "1.2.3*",		SSH_BUG_K5USER },

            

        

          132
          
		{ "*SSH Compatible Server*",			/* Netscreen */

          136
          
		{ "*SSH Compatible Server*",			/* Netscreen */

        

        

          133
          
					SSH_BUG_PASSWORDPAD },

          137
          
					SSH_BUG_PASSWORDPAD },

        

        

          134
          
		{ "*OSU_0*,"

          138
          
		{ "*OSU_0*,"

        



(-)compat.h
      (+1 lines)




  

    
      
            Lines 53-58
          
      
      
        Link Here
      
    
  

        

          53
          
#define SSH_BUG_DERIVEKEY	0x00040000

          53
          
#define SSH_BUG_DERIVEKEY	0x00040000

        

        

          54
          
#define SSH_BUG_DUMMYCHAN	0x00100000

          54
          
#define SSH_BUG_DUMMYCHAN	0x00100000

        

        

          55
          
#define SSH_BUG_EXTEOF		0x00200000

          55
          
#define SSH_BUG_EXTEOF		0x00200000

        

            

              
              
              56
              
#define SSH_BUG_K5USER		0x00400000

            

        

          56
          

          57
          

        

        

          57
          
void     enable_compat13(void);

          58
          
void     enable_compat13(void);

        

        

          58
          
void     enable_compat20(void);

          59
          
void     enable_compat20(void);

        






  

  Return to bug 204