Changeset 213 for trunk

Timestamp:

01/31/06 09:30:28 (19 years ago)

Author:

Nicholas Riley

Message:

LocationDo.py: Another place in Siebel.

action.py: ensureKerberosPrincipalsValid now understands both
"Expired" and "Not Valid" as requiring renewal. I bet these get
localized, too...

Location:

trunk/LocationDo

Files:

• LocationDo.py (modified) (1 diff)
• action.py (modified) (1 diff)

trunk/LocationDo/LocationDo.py

@@ -171 +171 @@
                     elif bssid == '00:0e:83:05:78:a2':
                         location.add('3124 SC')
+                    elif bssid == '00:0e:83:05:78:92':
+                        location.add('2405 SC')
                     elif bssid == '00:0e:83:05:76:b2':
                         location.add('Siebel 2nd floor atrium')

trunk/LocationDo/action.py

@@ -9 +9 @@
 
 def ensureKerberosPrincipalsValid(principals):
-    # XXX still doesn't play well with the automatic ticket renewal the Kerberos app does
     kerberosApp = app(id='edu.mit.Kerberos.KerberosApp')
-    validPrincipals = kerberosApp.caches.filter((its.time_remaining.startswith('Expired')).NOT).principal.get()
+    validPrincipals = kerberosApp.caches.filter( \
+            (its.time_remaining.startswith('Expired').NOT) \
+            .AND(its.time_remaining.startswith('Not Valid').NOT)) \
+            .principal.get()
     for principal in principals:
         if principal not in validPrincipals: