Don't confuse {KB, MB, GB} with {KiB, MiB, GiB}.

[invirt/packages/invirt-web.git] / code / getafsgroups.py

diff --git a/code/getafsgroups.py b/code/getafsgroups.py
old mode 100644 (file)
new mode 100755 (executable)
index 4e4b383..7067e53
--- a/code/getafsgroups.py
+++ b/code/getafsgroups.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 import pprint
 import subprocess
+from invirt.config import structs as config
 
 # import ldap
 # l = ldap.open("W92-130-LDAP-2.mit.edu")
@@ -28,7 +29,12 @@ class AfsProcessError(Exception):
     pass
 
 def getAfsGroupMembers(group, cell):
-    p = subprocess.Popen(["pts", "membership", "-encrypt", group, '-c', cell],
+    encrypt = True
+    for c in config.authz:
+        if c.type == 'afs' and c.cell == cell and hasattr(c, 'auth'):
+            encrypt = c.auth
+    subprocess.check_call(['aklog', cell], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    p = subprocess.Popen(["pts", "membership", "-encrypt" if encrypt else '-noauth', group, '-c', cell],
                          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     err = p.stderr.read()
     if err: #Error code doesn't reveal missing groups, but stderr does