kdo: Upstream krb5 now supports kswitch

[Scripts/git/.git] / barn-growl / barn-growl.py

diff --git a/barn-growl/barn-growl.py b/barn-growl/barn-growl.py
index c040de416c9955f93e61e3bb402fc3ef60ad7873..e36f7198b6de0ccae5874285779f3c649bd2d3e9 100755 (executable)
--- a/barn-growl/barn-growl.py
+++ b/barn-growl/barn-growl.py
@@ -12,6 +12,7 @@ import select
 import sys
 from abstfilter import AbstractConsumer
 import optparse
+import time
 
 class Notifier(AbstractConsumer):
     def __init__(self, usegrowl, usenotify, useprint):
@@ -33,7 +34,7 @@ class Notifier(AbstractConsumer):
             zop = d['opcode'].lower()
             zsender = d['sender'].lower()
             zauth = d['auth'].lower() == 'yes'
-            ztime = ':'.join(d['time'].split(' ')[3].split(':')[0:2])
+            ztime = "%02d:%02d" % time.strptime(d['time'])[3:5]
             zmessage = d['message']
             idtuple = (zclass, zinstance, zsender, ztime)
             id = '%s/\n%s/\n%s\n %s' % idtuple
@@ -49,7 +50,7 @@ class Notifier(AbstractConsumer):
                 print (id, header)
                 print message
             if self.usegrowl:
-                growlnotify = ['growlnotify', '-a', 'MacZephyr', '-n', 'zephyr', '-d', id, '-t', header]
+                growlnotify = ['growlnotify', '-H', 'localhost', '-a', 'MacZephyr', '-n', 'zephyr', '-d', id, '-t', header]
                 g = subprocess.Popen(growlnotify, stdin=subprocess.PIPE)
                 g.stdin.write(message)
                 g.stdin.close()
@@ -106,7 +107,7 @@ def main(argv):
             return 1
 
     if ssh is not None:
-        command = "ssh -K %s 'tzc -si'" % ssh
+        command = "ssh -o GSSAPIAuthentication=yes -o GSSAPIDelegateCredentials=yes -o GSSAPIKeyExchange=yes %s 'tzc -si'" % ssh
     else:
         command = "tzc -si"
     p = os.popen(command)