Changeset 725c55d for fedd/federation/authorizer.py

Timestamp:

Nov 29, 2010 6:13:12 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

027b87b

Parents:

c573278

Message:

Checkpoint - successful swap in and out

File:

• fedd/federation/authorizer.py (modified) (1 diff)

fedd/federation/authorizer.py

@@ -248 +248 @@
     def import_credential(self, file=None, data=None):
         if data:
-            rv = self.context.load_id_chunk(data)
-            print "id %d" % rv
-            if rv == ABAC.ABAC_CERT_SUCCESS: return True
-            rv = self.context.load_attribute_chunk(data)
-            print "attr %d" % rv
-            return rv == ABAC.ABAC_CERT_SUCCESS
-            #if self.context.load_id_chunk(data) != ABAC.ABAC_CERT_SUCCESS:
-        #       return self.context.load_attribute_chunk(data) == \
-        #               ABAC.ABAC_CERT_SUCCESS
-            ##else:
-        #       return True
+            if self.context.load_id_chunk(data) != ABAC.ABAC_CERT_SUCCESS:
+                return self.context.load_attribute_chunk(data) == \
+                        ABAC.ABAC_CERT_SUCCESS
+            else:
+                return True
         elif file:
             if self.context.load_id_file(file) != ABAC.ABAC_CERT_SUCCESS: