Author: dumindu
Date: Tue Dec 4 22:44:19 2007
New Revision: 10513
Log:
Removing refereces to TVS.
Modified:
trunk/solutions/identity/modules/mod-cspace/cspace_config.c
trunk/solutions/identity/modules/mod-cspace/mod_cspace.c
trunk/solutions/identity/modules/mod-cspace/mod_cspace.h
Modified: trunk/solutions/identity/modules/mod-cspace/cspace_config.c
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/cspace_config.c (original)
+++ trunk/solutions/identity/modules/mod-cspace/cspace_config.c Tue Dec 4
22:44:19 2007
@@ -49,7 +49,7 @@
void cfg_dir_printf_fn(const char* st, cspace_dir_cfg *cfg, const char* nl)
{
if (cfg)
- printf("%s\t%p, cspace:%s, dir:%s, sess:%s, sso:%s, tvs:%s "
+ printf("%s\t%p, cspace:%s, dir:%s, sess:%s, sso:%s"
"sess_file:%s%s",
st,
(void*)cfg,
@@ -57,7 +57,6 @@
cfg->dirspec,
cfg->session?"true":"false",
cfg->sso?"true":"false",
- cfg->tvs,
cfg->session_file,
nl);
}
@@ -83,14 +82,6 @@
return NULL;
}
-static const char *cmd_cspace_tvs(cmd_parms *cmd, void *mconfig,
- const char *arg)
-{
- cspace_dir_cfg *cfg = (cspace_dir_cfg *)mconfig;
- strcpy(cfg->tvs, arg);
- return NULL;
-}
-
static const char *cmd_cspace_xml_token(cmd_parms *cmd, void *mconfig,
const char *arg)
{
@@ -172,8 +163,6 @@
"directory"),
AP_INIT_FLAG("CardSpaceSessionManage", cmd_session_manage,
NULL, OR_ALL, "whether to enable session management or not"),
- AP_INIT_TAKE1("CardSpaceTVS", cmd_cspace_tvs, NULL, OR_ALL,
- "URL of Token Verification Service"),
AP_INIT_TAKE1("CardSpaceXmlToken", cmd_cspace_xml_token, NULL, OR_ALL,
"Name of the XML token sent"),
AP_INIT_TAKE1("CardSpaceLoginURI", cmd_cspace_login_page, NULL, OR_ALL,
@@ -258,7 +247,6 @@
cfg->dirspec[0] = '\0';
cfg->use_cspace_auth = 0;
- cfg->tvs[0] = '\0';
/*use apr_strncpy*/
strncpy(cfg->xml_token, CSPACE_XML_TOKEN, CSPACE_XML_TOKEN_LEN_MAX);
@@ -294,7 +282,6 @@
merged_cfg->use_cspace_auth = pcfg->use_cspace_auth |
ocfg->use_cspace_auth;
strcpy(merged_cfg->dirspec, ocfg->dirspec);
- strcpy(merged_cfg->tvs, ocfg->tvs);
strcpy(merged_cfg->xml_token, ocfg->xml_token);
/*strcpy(merged_cfg->login_page, ocfg->login_page);*/
if ((!ocfg->login_page) &&
Modified: trunk/solutions/identity/modules/mod-cspace/mod_cspace.c
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/mod_cspace.c (original)
+++ trunk/solutions/identity/modules/mod-cspace/mod_cspace.c Tue Dec 4
22:44:19 2007
@@ -440,14 +440,7 @@
cspace_decode_url((char *)buf);
state = process_token(buf, r, svr_cfg);
-
-/* if (!(ctx = cspace_process_context_create((void *)(r->pool))))
- return HTTP_INTERNAL_SERVER_ERROR;
-
- state = cspace_process_request(ctx, buf, svr_cfg->key_file,
- dir_cfg->tvs, (void *)(r->subprocess_env),
- &set_header);
-*/
+ /*check the return state*/
auth_state = apr_table_get(r->subprocess_env,
CARDSPACE_HEADER_STATE);
@@ -497,12 +490,6 @@
state = process_token(buf, r, svr_cfg);
- /*state = cspace_process_request(ctx, buf, svr_cfg->key_file,
- dir_cfg->tvs,
- (void *)(r->subprocess_env),
- &set_header);*/
-
-
if (state)
return OK;
}
Modified: trunk/solutions/identity/modules/mod-cspace/mod_cspace.h
==============================================================================
--- trunk/solutions/identity/modules/mod-cspace/mod_cspace.h (original)
+++ trunk/solutions/identity/modules/mod-cspace/mod_cspace.h Tue Dec 4
22:44:19 2007
@@ -40,7 +40,6 @@
int session; /*true|false flag*/
int sso; /*true|false flag*/
char dirspec[256]; /*TODO: remove MAGIC numbers*/
- char tvs[1024]; /*TODO: remove MAGIC numbers*/
apr_array_header_t *login_page;
char session_file[1024]; /*TODO: remove MAGIC numbers*/
char xml_token[CSPACE_XML_TOKEN_LEN_MAX];
@@ -68,7 +67,7 @@
#define cfg_dir_printf(st, cfg, nl)
#endif
-const command_rec cspace_cmds[12];
+const command_rec cspace_cmds[11];
void *cspace_svr_cfg_create(apr_pool_t *p, server_rec *s);
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
