Sync with 1.5.11

diff --git a/org.gridsite.core/src/grst_gacl.c b/org.gridsite.core/src/grst_gacl.c
index 8dbfc19..50f26d7 100644 (file)
--- a/org.gridsite.core/src/grst_gacl.c
+++ b/org.gridsite.core/src/grst_gacl.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002-6, Andrew McNab, University of Manchester
+   Copyright (c) 2002-9, Andrew McNab, University of Manchester
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or

diff --git a/org.gridsite.core/src/mod_gridsite.c b/org.gridsite.core/src/mod_gridsite.c
index cec8e56..1180d88 100644 (file)
--- a/org.gridsite.core/src/mod_gridsite.c
+++ b/org.gridsite.core/src/mod_gridsite.c
@@ -2489,6 +2489,8 @@ void GRST_save_ssl_creds(conn_rec *conn, GRSTx509Chain *grst_chain)
    for (grst_cert = grst_chain->firstcert; 
         grst_cert != NULL; grst_cert = grst_cert->next)
       {
+        if (grst_cert->errors) continue;
+        
         if ((grst_cert->type == GRST_CERT_TYPE_VOMS) &&
             (grst_cert->delegation == lowest_voms_delegation))
           {