From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Wed, 29 Feb 2012 22:51:57 +0000 (+0000)
Subject: When constructing a list of FQANs, store a reference to the proxy in the chain that... 
X-Git-Tag: gridsite-core_R_1_7_18~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b0fe8d430f8ccf0b683089de5521f36fbc1b3423;p=jra1mw.git

When constructing a list of FQANs, store a reference to the proxy in the chain that contains the attribute. (GGUS #79096).
---

diff --git a/org.gridsite.core/src/grst_x509.c b/org.gridsite.core/src/grst_x509.c
index 2b57800..4e1760f 100644
--- a/org.gridsite.core/src/grst_x509.c
+++ b/org.gridsite.core/src/grst_x509.c
@@ -644,6 +644,7 @@ end:
 /// Get the VOMS attributes in the given extension
 static int GRSTx509ChainVomsAdd(GRSTx509Cert **grst_cert, 
                          time_t time1_time, time_t time2_time,
+			 int delegation,
                          X509_EXTENSION *ex, 
                          GRSTx509Cert *user_cert, char *vomsdir, char *capath)
 ///
@@ -826,6 +827,7 @@ static int GRSTx509ChainVomsAdd(GRSTx509Cert **grst_cert,
                  (*grst_cert)->type = GRST_CERT_TYPE_VOMS;
                  (*grst_cert)->issuer = strdup(acvomsdn);
                  (*grst_cert)->dn = strdup(user_cert->dn);
+		 (*grst_cert)->delegation = delegation;
                }
              else break;
            }
@@ -1114,12 +1116,12 @@ int GRSTx509ChainLoadCheck(GRSTx509Chain **chain,
                        {
                          GRSTx509ChainVomsAdd(&grst_cert, 
                                               new_grst_cert->notbefore,
-                                              new_grst_cert->notafter,                                              
+                                              new_grst_cert->notafter,
+					      (lastcert == NULL) ? i : i+1,
                                               ex,
                                               user_cert,
                                               vomsdir,
                                               capath);
-                         grst_cert->delegation = (lastcert == NULL) ? i : i+1;
                        }
                    }                     
               }