From: Andrew McNab <andrew.mcnab@manchester.ac.uk>
Date: Mon, 24 Apr 2006 21:22:01 +0000 (+0000)
Subject: Try to fix gLite build again
X-Git-Tag: gridsite-core_R_1_1_19~55
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ce0599e20b1834b66ed6431a31115ca8356414af;p=jra1mw.git

Try to fix gLite build again
---

diff --git a/org.gridsite.core/project/configure.properties.xml b/org.gridsite.core/project/configure.properties.xml
index c00c74b..8baac92 100644
--- a/org.gridsite.core/project/configure.properties.xml
+++ b/org.gridsite.core/project/configure.properties.xml
@@ -4,6 +4,6 @@
 
 	<project name="configure options">
         <property name="build.make.arguments"
-               value='prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor} HTTPD_FLAGS="-I ${with.httpd.prefix:-/usr}/include/httpd"' />
+               value='prefix=${stage.abs.dir} GSOAPDIR=${ext.gsoap.subdir} OPENSSL_GLOBUS_FLAGS=-I${with.globus.prefix}/include/${with.globus.dbg.nothr.flavor} OPENSSL_GLOBUS_LIBS=-L${with.globus.prefix}/lib/ FLAVOR_GLOBUS_EXT=_${with.globus.dbg.nothr.flavor} HTTPD_FLAGS="-I${with.httpd.prefix:-/usr}/include/httpd"' />
 	</project>
 
diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c
index a41f248..9feddc4 100644
--- a/org.gridsite.core/src/grst_x509.c
+++ b/org.gridsite.core/src/grst_x509.c
@@ -583,7 +583,7 @@ int GRSTx509GetVomsCreds(int *lastcred, int maxcreds, size_t credlen,
                          char *creds, X509 *usercert, STACK_OF(X509) *certstack,
                          char *vomsdir)
 {
-   int  i, j, vomsfound=0;
+   int  i, j;
    char s[80];
    unsigned char  *ucuser;
    X509_EXTENSION *ex;
@@ -617,14 +617,11 @@ int GRSTx509GetVomsCreds(int *lastcred, int maxcreds, size_t credlen,
 
            if (strcmp(s, GRST_VOMS_OID) == 0) /* a VOMS extension */
              {
-               vomsfound=1;
                GRSTx509ParseVomsExt(lastcred, maxcreds, credlen, creds,
                                  uctime1_time, uctime2_time,
                                  ex, ucuser, vomsdir);
              }
          }
-
-      if (vomsfound) return GRST_RET_OK;
     }
 
    return GRST_RET_OK;
diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index 0408f37..4fbcfbe 100644
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -1613,7 +1613,7 @@ static const char *mod_gridsite_take1_cmds(cmd_parms *a, void *cfg,
     
       sessionsdir = apr_pstrdup(a->pool, parm);
     }
-/* GridSiteOnetimesDir is deprecated : */
+/* GridSiteOnetimesDir is deprecated in favour of GridSiteSessionsDir */
     else if (strcasecmp(a->cmd->name, "GridSiteOnetimesDir") == 0)
     {
       if (a->server->is_virtual)
@@ -1933,7 +1933,7 @@ static const command_rec mod_gridsite_cmds[] =
                    NULL, RSRC_CONF, "GridHTTP port"),
     AP_INIT_TAKE1("GridSiteSessionsDir", mod_gridsite_take1_cmds,
                  NULL, RSRC_CONF, "directory with GridHTTP passcodes and SSL session creds"),
-/* GridSiteOnetimesDir is deprecated: */
+/* GridSiteOnetimesDir is deprecated in favour of GridSiteSessionsDir */
     AP_INIT_TAKE1("GridSiteOnetimesDir", mod_gridsite_take1_cmds,
                  NULL, RSRC_CONF, "directory with GridHTTP passcodes"),
 
@@ -2008,12 +2008,6 @@ int GRST_get_session_id(SSL *ssl, char *session_id, size_t len)
    return GRST_RET_OK;
 }
 
-void GRST_expire_ssl_creds(void)
-{
-
-
-}
-
 int GRST_load_ssl_creds(SSL *ssl, conn_rec *conn)
 {
    char session_id[(SSL_MAX_SSL_SESSION_ID_LENGTH+1)*2], *sessionfile = NULL,
@@ -2168,8 +2162,8 @@ static int mod_gridsite_perm_handler(request_rec *r)
     p = (char *) apr_table_get(r->subprocess_env, "HTTPS");
     if ((p != NULL) && (strcmp(p, "on") == 0)) ishttps = 1;
 
-    /* do we need/have per-connection (SSL) cred variable(s)? */
-    
+    /* reload per-connection (SSL) cred variables? */
+
     sslconn = (SSLConnRec *) ap_get_module_config(r->connection->conn_config, 
                                                   &ssl_module);
     if ((sslconn != NULL) &&