X-Git-Url: https://git.ralfj.de/saartuer.git/blobdiff_plain/97df5941b08cd53aa66937ded412fa58aac531aa..3313462175e847d3c0c5075e1ecc589f1d264ca7:/tyshell

diff --git a/tyshell b/tyshell
index c9a0927..f8627d2 100755
--- a/tyshell
+++ b/tyshell
@@ -6,6 +6,7 @@ import sys
 import subprocess
 import socket
 import pwd
+import grp
 
 tuerSock = "/run/tuer.sock"
 
@@ -31,12 +32,12 @@ def extcmd(cmd):
 
 def sendcmd(addr, cmd):
 	def run(c):
-		print("Running %s..." % (cmd))
+		print("206 Sending command %s..." % (cmd))
 		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 		s.connect(addr)
-		s.settimeout(10.0)
+		s.settimeout(60.0)
 		s.send(cmd.encode())
-		data = s.recv(4)
+		data = s.recv(256)
 		s.close()
 		print(data.decode('utf-8'))
 	return run
@@ -46,7 +47,8 @@ def exitcmd(c):
 	return True
 
 def whocmd(c):
-	for p in filter(lambda x:x.pw_shell=="/opt/tuer/tyshell",pwd.getpwall()):
+	for n in grp.getgrnam("tuer").gr_mem:
+		p = pwd.getpwnam(n)
 		print (p.pw_name, " - ", p.pw_gecos)
 
 commands = {