[pubcookie-dev] WEBISO CVS update: willey; webiso/pubcookie/src mod_pubcookie.c,1.116,1.117 pbc_config.h,1.77,1.78

[Stephen Willey]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv4427
 
 Modified Files:
 	mod_pubcookie.c pbc_config.h 
 Log Message:
 fix bug 99 by setting initialized value of session_reauth



Index: webiso/pubcookie/src/mod_pubcookie.c
diff -c webiso/pubcookie/src/mod_pubcookie.c:1.116 webiso/pubcookie/src/mod_pubcookie.c:1.117
*** webiso/pubcookie/src/mod_pubcookie.c:1.116	Thu May  1 13:09:03 2003
--- webiso/pubcookie/src/mod_pubcookie.c	Fri May  2 15:53:06 2003
***************
*** 18,24 ****
   */
  
  /*
!     $Id: mod_pubcookie.c,v 1.116 2003/05/01 20:09:03 willey Exp $
   */
  
  #ifdef HAVE_CONFIG_H
--- 18,24 ----
   */
  
  /*
!     $Id: mod_pubcookie.c,v 1.117 2003/05/02 22:53:06 willey Exp $
   */
  
  #ifdef HAVE_CONFIG_H
***************
*** 785,791 ****
            PBC_GETVAR_REFERER,
            referer,
            PBC_GETVAR_SESSION_REAUTH,
!           cfg->session_reauth,
  	  PBC_GETVAR_PRE_SESS_TOK,
            pre_sess_tok,
            PBC_GETVAR_FLAG,
--- 785,792 ----
            PBC_GETVAR_REFERER,
            referer,
            PBC_GETVAR_SESSION_REAUTH,
!           (cfg->session_reauth == PBC_UNSET_SESSION_REAUTH ?
! 			PBC_SESSION_REAUTH_NO : cfg->session_reauth),
  	  PBC_GETVAR_PRE_SESS_TOK,
            pre_sess_tok,
            PBC_GETVAR_FLAG,
***************
*** 1095,1100 ****
--- 1096,1102 ----
  
    cfg->inact_exp = PBC_UNSET_INACT_EXPIRE;
    cfg->hard_exp = PBC_UNSET_HARD_EXPIRE;
+   cfg->session_reauth = PBC_UNSET_SESSION_REAUTH;
    cfg->addl_requests = NULL;
  
    return (void *)cfg;
***************
*** 1138,1148 ****
      cfg->hard_exp = (ncfg->hard_exp == PBC_UNSET_HARD_EXPIRE)
  			? pcfg->hard_exp : ncfg->hard_exp;
  
      /* life is much easier if the default value is zero or NULL */
      cfg->appid = ncfg->appid ? 
  		ncfg->appid : pcfg->appid;
-     cfg->session_reauth = ncfg->session_reauth ? 
- 		ncfg->session_reauth : pcfg->session_reauth;
      cfg->end_session = ncfg->end_session ? 
  		ncfg->end_session : pcfg->end_session;
  
--- 1140,1151 ----
      cfg->hard_exp = (ncfg->hard_exp == PBC_UNSET_HARD_EXPIRE)
  			? pcfg->hard_exp : ncfg->hard_exp;
  
+     cfg->session_reauth = (ncfg->session_reauth == PBC_UNSET_SESSION_REAUTH)
+ 		? pcfg->session_reauth : ncfg->session_reauth;
+ 
      /* life is much easier if the default value is zero or NULL */
      cfg->appid = ncfg->appid ? 
  		ncfg->appid : pcfg->appid;
      cfg->end_session = ncfg->end_session ? 
  		ncfg->end_session : pcfg->end_session;
  
***************
*** 1947,1953 ****
      if(f != 0)
          cfg->session_reauth = PBC_SESSION_REAUTH;
      else
!         cfg->session_reauth = 0;
  
      return NULL;
  }
--- 1950,1956 ----
      if(f != 0)
          cfg->session_reauth = PBC_SESSION_REAUTH;
      else
!         cfg->session_reauth = PBC_SESSION_REAUTH_NO;
  
      return NULL;
  }


Index: webiso/pubcookie/src/pbc_config.h
diff -c webiso/pubcookie/src/pbc_config.h:1.77 webiso/pubcookie/src/pbc_config.h:1.78
*** webiso/pubcookie/src/pbc_config.h:1.77	Mon Apr 14 16:54:51 2003
--- webiso/pubcookie/src/pbc_config.h	Fri May  2 15:53:06 2003
***************
*** 26,32 ****
   */
  
  /*
!     $Id: pbc_config.h,v 1.77 2003/04/14 23:54:51 ryanc Exp $
   */
  
  #ifndef PUBCOOKIE_CONFIG
--- 26,32 ----
   */
  
  /*
!     $Id: pbc_config.h,v 1.78 2003/05/02 22:53:06 willey Exp $
   */
  
  #ifndef PUBCOOKIE_CONFIG
***************
*** 144,149 ****
--- 144,152 ----
  #define LOGOUT_ACTION_CLEAR_L_NO_APP 2
  
  #define PBC_SESSION_REAUTH 1
+ #define PBC_SESSION_REAUTH_NO 0
+ #define PBC_UNSET_SESSION_REAUTH -1
+ 
  #define PBC_SUPER_DEBUG 1
  #define PBC_CLEAR_COOKIE "clear"
  #define PBC_SET "set"



end of message