git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0924168
)
dont save the gid in sign_gid()
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 6 May 2010 14:59:37 +0000
(14:59 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 6 May 2010 14:59:37 +0000
(14:59 +0000)
sfa/server/sfa-ca.py
patch
|
blob
|
history
diff --git
a/sfa/server/sfa-ca.py
b/sfa/server/sfa-ca.py
index
aac0208
..
127a267
100755
(executable)
--- a/
sfa/server/sfa-ca.py
+++ b/
sfa/server/sfa-ca.py
@@
-65,7
+65,6
@@
def sign_gid(gid, parent_key, parent_gid):
gid.set_issuer(parent_key, parent_gid.get_hrn())
gid.set_parent(parent_gid)
gid.sign()
gid.set_issuer(parent_key, parent_gid.get_hrn())
gid.set_parent(parent_gid)
gid.sign()
- gid.save_to_file(outfile, save_parents=True)
return gid
def sign(options):
return gid
def sign(options):
@@
-75,7
+74,7
@@
def sign(options):
hierarchy = Hierarchy()
config = Config()
default_authority = config.SFA_INTERFACE_HRN
hierarchy = Hierarchy()
config = Config()
default_authority = config.SFA_INTERFACE_HRN
- auth_info = hierarchy.get_auth_info(
parent_hrn
)
+ auth_info = hierarchy.get_auth_info(
default_authority
)
# load the gid
gidfile = os.path.abspath(options.sign)
# load the gid
gidfile = os.path.abspath(options.sign)
@@
-107,7
+106,9
@@
def sign(options):
# check if gid already has a parent
# sign the gid
# check if gid already has a parent
# sign the gid
- sign_gid(gid, parent_key, parent_gid)
+ gid = sign_gid(gid, parent_key, parent_gid)
+ # save the signed gid
+ gid.save_to_file(outfile, save_parents=True)
def export_gid(options):
def export_gid(options):