[BACK]Return to auth2-gss.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/auth2-gss.c between version 1.10.2.2 and 1.11

version 1.10.2.2, 2006/10/06 03:19:32 version 1.11, 2005/10/13 14:03:01
Line 1 
Line 1 
 /* $OpenBSD$ */  /*      $OpenBSD$       */
   
 /*  /*
  * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.   * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
Line 24 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include <sys/types.h>  #include "includes.h"
   
 #include "xmalloc.h"  #ifdef GSSAPI
 #include "key.h"  
 #include "hostfile.h"  
 #include "auth.h"  #include "auth.h"
 #include "ssh2.h"  #include "ssh2.h"
   #include "xmalloc.h"
 #include "log.h"  #include "log.h"
 #include "dispatch.h"  #include "dispatch.h"
 #include "buffer.h"  
 #include "servconf.h"  #include "servconf.h"
 #include "packet.h"  #include "packet.h"
 #include "ssh-gss.h"  
 #include "monitor_wrap.h"  #include "monitor_wrap.h"
   
   #include "ssh-gss.h"
   
 extern ServerOptions options;  extern ServerOptions options;
   
 static void input_gssapi_token(int type, u_int32_t plen, void *ctxt);  static void input_gssapi_token(int type, u_int32_t plen, void *ctxt);
Line 48 
Line 48 
   
 /*  /*
  * We only support those mechanisms that we know about (ie ones that we know   * We only support those mechanisms that we know about (ie ones that we know
  * how to check local user kuserok and the like)   * how to check local user kuserok and the like
  */   */
 static int  static int
 userauth_gssapi(Authctxt *authctxt)  userauth_gssapi(Authctxt *authctxt)
Line 100 
Line 100 
         }          }
   
         if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {          if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
                 if (ctxt != NULL)  
                         ssh_gssapi_delete_ctx(&ctxt);  
                 xfree(doid);                  xfree(doid);
                 return (0);                  return (0);
         }          }
   
         authctxt->methoddata = (void *)ctxt;          authctxt->methoddata=(void *)ctxt;
   
         packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);          packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
   
Line 291 
Line 289 
         userauth_gssapi,          userauth_gssapi,
         &options.gss_authentication          &options.gss_authentication
 };  };
   
   #endif /* GSSAPI */
Legend:
Removed from v.1.10.2.2  
changed lines
  Added in v.1.11