[pubcookie-dev] WEBISO CVS update: willey; flavor_uwsecurid.c,1.1.2.6,1.1.2.7

[Stephen Willey]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv6251
 
 Modified Files:
       Tag: UWash3
 	flavor_basic.c flavor_uwsecurid.c 
 Log Message:
 make username static when changing flavors



Index: webiso/pubcookie/src/flavor_basic.c
diff -c webiso/pubcookie/src/flavor_basic.c:1.42.2.3 webiso/pubcookie/src/flavor_basic.c:1.42.2.4
*** webiso/pubcookie/src/flavor_basic.c:1.42.2.3	Wed Oct  1 12:22:37 2003
--- webiso/pubcookie/src/flavor_basic.c	Wed Oct  1 14:08:24 2003
***************
*** 13,19 ****
   *   will pass l->realm to the verifier and append it to the username when
   *   'append_realm' is set
   *
!  * $Id: flavor_basic.c,v 1.42.2.3 2003/10/01 19:22:37 willey Exp $
   */
  
  
--- 13,19 ----
   *   will pass l->realm to the verifier and append it to the username when
   *   'append_realm' is set
   *
!  * $Id: flavor_basic.c,v 1.42.2.4 2003/10/01 21:08:24 willey Exp $
   */
  
  
***************
*** 446,451 ****
--- 446,452 ----
      /* and set focus */
      if ( (reason == FLB_REAUTH && c != NULL && c->user != NULL) ||
           (reason == FLB_BAD_AUTH && c != NULL && c->user != NULL) ||
+          (reason == FLB_CACHE_CREDS_WRONG && c != NULL && c->user != NULL) ||
           (reason == FLB_PINIT && c != NULL && c->user != NULL) ||
           (reason == FLB_LCOOKIE_EXPIRED && c != NULL && c->user != NULL) ) {
          user_field = get_user_field(p, 


Index: webiso/pubcookie/src/flavor_uwsecurid.c
diff -c webiso/pubcookie/src/flavor_uwsecurid.c:1.1.2.6 webiso/pubcookie/src/flavor_uwsecurid.c:1.1.2.7
*** webiso/pubcookie/src/flavor_uwsecurid.c:1.1.2.6	Wed Oct  1 12:22:37 2003
--- webiso/pubcookie/src/flavor_uwsecurid.c	Wed Oct  1 14:08:24 2003
***************
*** 11,17 ****
   */
  
  /*
!     $Id: flavor_uwsecurid.c,v 1.1.2.6 2003/10/01 19:22:37 willey Exp $
   */
  
  #ifdef HAVE_CONFIG_H
--- 11,17 ----
   */
  
  /*
!     $Id: flavor_uwsecurid.c,v 1.1.2.7 2003/10/01 21:08:24 willey Exp $
   */
  
  #ifdef HAVE_CONFIG_H
***************
*** 347,352 ****
--- 347,353 ----
      /* if it's a reauth then the user field can't be changed */
      if ( (reason == FLB_REAUTH && c != NULL && c->user != NULL) ||
           (reason == FLB_BAD_AUTH && c != NULL && c->user != NULL) ||
+          (reason == FLB_CACHE_CREDS_WRONG && c != NULL && c->user != NULL) ||
           (reason == FLB_LCOOKIE_EXPIRED && c->user != NULL) ) {
          return(get_field_html(p, 
  		libpbc_config_getstring(p,  "tmpl_login_user_static",



end of message