[pubcookie-dev] WEBISO CVS update: willey; webiso/pubcookie/src flavor_uwsecurid.c,2.5,2.6

[Stephen Willey]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv2932
 
 Modified Files:
 	flavor_uwsecurid.c 
 Log Message:
 fixed uwsecurid to always do reauth, merge from UWash3
 



Index: webiso/pubcookie/src/flavor_uwsecurid.c
diff -c webiso/pubcookie/src/flavor_uwsecurid.c:2.5 webiso/pubcookie/src/flavor_uwsecurid.c:2.6
*** webiso/pubcookie/src/flavor_uwsecurid.c:2.5	Fri Feb 13 13:51:36 2004
--- webiso/pubcookie/src/flavor_uwsecurid.c	Thu Jun 17 14:07:45 2004
***************
*** 11,17 ****
   */
  
  /*
!     $Id: flavor_uwsecurid.c,v 2.5 2004/02/13 21:51:36 dors Exp $
   */
  
  #ifdef HAVE_CONFIG_H
--- 11,17 ----
   */
  
  /*
!     $Id: flavor_uwsecurid.c,v 2.6 2004/06/17 21:07:45 willey Exp $
   */
  
  #ifdef HAVE_CONFIG_H
***************
*** 832,843 ****
                           "process_uwsecurid: login in progress, goodbye\n" );
          return LOGIN_INPROGRESS;
  
!     } else { /* valid login cookie */
          pbc_log_activity(p, PBC_LOG_AUDIT,
!                          "flavor_uwsecurid: L cookie valid user: %s", l->user);
          pbc_log_activity(p, PBC_LOG_DEBUG_VERBOSE,
!                          "process_uwsecurid: L cookie valid, goodbye\n" );
!         return LOGIN_OK;
      }
  
  }
--- 832,845 ----
                           "process_uwsecurid: login in progress, goodbye\n" );
          return LOGIN_INPROGRESS;
  
!     } else { /* securid requires reauth */
!         *errstr = "uwsecurid requires reauth"; 
          pbc_log_activity(p, PBC_LOG_AUDIT,
!                          "flavor_uwsecurid: %s: %s", l->user, *errstr);
!         print_login_page(p, l, c, FLUS_REAUTH);
          pbc_log_activity(p, PBC_LOG_DEBUG_VERBOSE,
!                          "process_uwsecurid: login in progress, goodbye\n" );
!         return LOGIN_INPROGRESS;
      }
  
  }



end of message