From 1d65bf6101012239a3aa89117dda339d6389ebfa Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 11 Oct 2011 16:08:47 -0400 Subject: [PATCH 1/1] always include a credential thats delegated to the callers root authority --- sfa/client/sfi.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 6fd0a70c..40589cab 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -537,7 +537,6 @@ class Sfi: hrn = self.user gidfile = os.path.join(self.options.sfi_dir, hrn + ".gid") - print gidfile gid = self.get_cached_gid(gidfile) if not gid: user_cred = self.get_user_cred() @@ -989,9 +988,9 @@ class Sfi: user_cred = self.get_user_cred() slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True) creds = [slice_cred] - if opts.delegate: - delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) - creds.append(delegated_cred) + # always include a credential thats delegated to the callers root authority + delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority)) + creds.append(delegated_cred) rspec_file = self.get_rspec_file(args[1]) rspec = open(rspec_file).read() -- 2.45.2