a patch for 3.4, please

Gintautas Grigelionis gintas at ki.ericsson.se
Mon Oct 7 15:51:11 EST 2002


Hello,

for the lack of a better, here's my own try at a "AFS token passing
vs. Kerberos 4 PAM" problem.

Gintas

-------------- next part --------------
*** session.c.orig	Wed Jun 26 15:51:06 2002
--- session.c	Mon Oct  7 07:46:39 2002
***************
*** 86,91 ****
--- 86,94 ----
  static void do_authenticated2(Authctxt *);
  
  static int session_pty_req(Session *);
+ #ifdef AFS
+ static int afsfwd = 0;
+ #endif
  
  /* import */
  extern ServerOptions options;
***************
*** 394,399 ****
--- 397,403 ----
  					verbose("AFS token refused for %.100s",
  					    s->authctxt->user);
  				xfree(token);
+ 				afsfwd = success;
  			}
  			break;
  #endif /* AFS */
***************
*** 462,468 ****
--- 466,479 ----
  
  #if defined(USE_PAM)
  	do_pam_session(s->pw->pw_name, NULL);
+ # ifdef AFS
+ 	debug ("AFS token passing: %d", afsfwd);
+ 	if (afsfwd == 0) {
+ # endif
  	do_pam_setcred(1);
+ # ifdef AFS
+ 	}
+ # endif
  	if (is_pam_password_change_required())
  		packet_disconnect("Password change required but no "
  		    "TTY available");
***************
*** 580,586 ****
--- 591,604 ----
  
  #if defined(USE_PAM)
  	do_pam_session(s->pw->pw_name, s->tty);
+ # ifdef AFS
+ 	debug ("AFS token passing: %d", afsfwd);
+ 	if (afsfwd == 0) {
+ # endif
  	do_pam_setcred(1);
+ # ifdef AFS
+ 	}
+ # endif
  #endif
  
  	/* Fork the child. */


More information about the openssh-unix-dev mailing list