[pubcookie-dev] WEBISO CVS update: fox; webiso/pubcookie/src mod_pubcookie.c,1.129,1.130

[Jim Fox]

Update of /usr/local/cvsroot/webiso/pubcookie/src
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv12636/webiso/pubcookie/src
 
 Modified Files:
 	mod_pubcookie.c 
 Log Message:
 
 Enhance "PubcookieSessionCauseReAuth" to accept a number-of-seconds
 parameter.  If the user has entered a password in less time than
 this parameter he does not have to reenter a password.
 



Index: webiso/pubcookie/src/mod_pubcookie.c
diff -c webiso/pubcookie/src/mod_pubcookie.c:1.129 webiso/pubcookie/src/mod_pubcookie.c:1.130
*** webiso/pubcookie/src/mod_pubcookie.c:1.129	Thu Feb 19 15:07:03 2004
--- webiso/pubcookie/src/mod_pubcookie.c	Fri Feb 20 10:35:24 2004
***************
*** 6,12 ****
  /** @file mod_pubcookie.c
   * Apache pubcookie module
   *
!  * $Id: mod_pubcookie.c,v 1.129 2004/02/19 23:07:03 fox Exp $
   */
  
  
--- 6,12 ----
  /** @file mod_pubcookie.c
   * Apache pubcookie module
   *
!  * $Id: mod_pubcookie.c,v 1.130 2004/02/20 18:35:24 fox Exp $
   */
  
  
***************
*** 2221,2233 ****
  }
  
  /*                                                                            */
! const char *set_session_reauth(cmd_parms *cmd, void *mconfig, int f) {
      pubcookie_dir_rec *cfg = (pubcookie_dir_rec *) mconfig;
  
!     if(f != 0)
!         cfg->session_reauth = PBC_SESSION_REAUTH;
!     else
!         cfg->session_reauth = PBC_SESSION_REAUTH_NO;
  
      return NULL;
  }
--- 2221,2234 ----
  }
  
  /*                                                                            */
! const char *set_session_reauth(cmd_parms *cmd, void *mconfig, const char *v) {
      pubcookie_dir_rec *cfg = (pubcookie_dir_rec *) mconfig;
  
!     if (!v) cfg->session_reauth = 0;
!     else if (!strcasecmp(v, "on")) cfg->session_reauth = 1;
!     else if (!strcasecmp(v, "off")) cfg->session_reauth = 0;
!     else cfg->session_reauth = atoi((const char *) v);
!     if (cfg->session_reauth<0) cfg->session_reauth = 1;
  
      return NULL;
  }
***************
*** 2344,2351 ****
      {"PubCookieDirDepthforAppID", pubcookie_set_dirdepth, NULL, RSRC_CONF, TAKE1,
       "Specify the Directory Depth for generating default AppIDs."},
  
!     {"PubcookieSessionCauseReAuth", set_session_reauth, NULL, OR_AUTHCFG, FLAG,
!      "Force reauthentication for new sessions and session timeouts"},
      {"PubcookieEndSession", set_end_session, NULL, OR_AUTHCFG, RAW_ARGS,
       "End application session and possibly login session"},
      {"PubCookieAddlRequest", pubcookie_add_request, NULL, OR_AUTHCFG, ITERATE,
--- 2345,2352 ----
      {"PubCookieDirDepthforAppID", pubcookie_set_dirdepth, NULL, RSRC_CONF, TAKE1,
       "Specify the Directory Depth for generating default AppIDs."},
  
!     {"PubcookieSessionCauseReAuth", set_session_reauth, NULL, OR_AUTHCFG, TAKE1,
!      "Force reauthentication for new sessions with specified session timeout"},
      {"PubcookieEndSession", set_end_session, NULL, OR_AUTHCFG, RAW_ARGS,
       "End application session and possibly login session"},
      {"PubCookieAddlRequest", pubcookie_add_request, NULL, OR_AUTHCFG, ITERATE,
***************
*** 2481,2490 ****
           "Specify the Directory Depth for generating default AppIDs."
      ),
  
!     AP_INIT_FLAG("PubcookieSessionCauseReAuth",
           set_session_reauth,
           NULL, OR_AUTHCFG,
!          "Force reauthentication for new sessions and session timeouts"
      ),
      AP_INIT_RAW_ARGS("PubcookieEndSession",
           set_end_session,
--- 2482,2491 ----
           "Specify the Directory Depth for generating default AppIDs."
      ),
  
!     AP_INIT_TAKE1("PubcookieSessionCauseReAuth",
           set_session_reauth,
           NULL, OR_AUTHCFG,
!          "Force reauthentication for new sessions with specified timeout"
      ),
      AP_INIT_RAW_ARGS("PubcookieEndSession",
           set_end_session,



end of message