Merge remote-tracking branch 'origin/master' into janis_work

[gigi.git] / src / org / cacert / gigi / dbObjects / CertificateProfile.java

diff --git a/src/org/cacert/gigi/dbObjects/CertificateProfile.java b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
index 6f57b3ec0a7d1a848841e60b1c099d425ef50552..5704497986388f70123d5bf7230839bed85fde0d 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/CertificateProfile.java
+++ b/src/org/cacert/gigi/dbObjects/CertificateProfile.java
@@ -260,7 +260,15 @@ public class CertificateProfile implements IdCachable {
                     return false;
                 }
             } else if (s.equals("codesign")) {
-                if (actor.isInGroup(Group.CODESIGNING)) {
+                if ( !actor.isInGroup(Group.CODESIGNING)) {
+                    return false;
+                }
+            } else if (s.equals("ocsp")) {
+                if ( !(owner instanceof Organisation)) {
+                    return false;
+                }
+                Organisation o = (Organisation) owner;
+                if ( !o.isSelfOrganisation()) {
                     return false;
                 }
             } else {