From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sun, 20 Nov 2011 22:44:06 +0000 (-0500)
Subject: add interface cert to trusted roots list
X-Git-Tag: sfa-2.0-0~14^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=65257382e1dab0241b946830a745f0a3299cebec;p=sfa.git

add interface cert to trusted roots list
---

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index abe8c007..8c1b1d53 100755
--- a/sfa/server/sfa-start.py
+++ b/sfa/server/sfa-start.py
@@ -40,7 +40,8 @@ from sfa.util.sfalogging import logger
 from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.config import Config
 import sfa.client.xmlrpcprotocol as xmlrpcprotocol
-
+from sfa.trust.gid import GID
+from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import GID
@@ -189,6 +190,9 @@ def main():
     server_key_file = auth_info.get_privkey_filename()
     server_cert_file = auth_info.get_gid_filename()
 
+    # ensure interface cert is present in trusted roots dir
+    trusted_roots = TrustedRoots(config.get_trustedroots_dir())
+    trusted_roots.add_gid(GID(filename=server_cert_file))
     if (options.daemon):  daemon()
     
     if options.trusted_certs: