From: Marcel Poul <marcel.poul@cern.ch>
Date: Tue, 26 Feb 2013 22:24:31 +0000 (+0000)
Subject: I should have commit previous patch to the branch not head, revert to older version.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=746d1d795f5a94d4af97e47ab97f5047d9b70c9b;p=jra1mw.git

I should have commit previous patch to the branch not head, revert to older version.
---

diff --git a/org.gridsite.core/interface/gridsite.h b/org.gridsite.core/interface/gridsite.h
index 7e1b9d4..ccdb943 100644
--- a/org.gridsite.core/interface/gridsite.h
+++ b/org.gridsite.core/interface/gridsite.h
@@ -208,9 +208,6 @@ typedef struct { GRSTx509Cert *firstcert; } GRSTx509Chain;
 #ifndef GRST_NO_OPENSSL
 int GRSTx509CertLoad(GRSTx509Cert *, X509 *);
 int GRSTx509ChainLoadCheck(GRSTx509Chain **, STACK_OF(X509) *, X509 *, char *, char *);
-/* For mod_gridsite.so only */
-int GRSTx509ChainLoad(GRSTx509Chain **, STACK_OF(X509) *,
- X509 *, char *, char *);
 #endif
 int GRSTx509ChainFree(GRSTx509Chain *);
 
@@ -406,9 +403,7 @@ int GRSTx509CompactCreds(int *, int, size_t, char *, STACK_OF(X509) *, char *, X
 char *GRSTx509CachedProxyFind(char *, char *, char *);
 char *GRSTx509FindProxyFileName(void);
 int GRSTx509MakeProxyCert(char **, FILE *, char *, char *, char *, int);
-#ifndef GRST_NO_OPENSSL
-char *GRSTx509CachedProxyKeyFind(char *, char *, char *, STACK_OF(X509) *);
-#endif 
+char *GRSTx509CachedProxyKeyFind(char *, char *, char *);
 int GRSTx509ProxyDestroy(char *, char *, char *);
 int GRSTx509ProxyGetTimes(char *, char *, char *, time_t *, time_t *);
 int GRSTx509CreateProxyRequest(char **, char **, char *);