From: Bernard Blackham <dagobah@ucc.asn.au>
Date: Sat, 7 May 2005 10:18:37 +0000 (+0000)
Subject: chmod pin automatically. remove boot up message now it doesnt take so long to boot.
X-Git-Tag: IMPORT-FROM-UCCCVS~34
X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=commitdiff_plain;h=914a96030cc94ddb52fad22cf13c48973e737a76

chmod pin automatically. remove boot up message now it doesnt take so long to boot.
---

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 12ebe5b..22958bd 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -127,8 +127,8 @@ def get_pin(uid):
 		logging.info('getting pin for uid %d: .pin not found in home directory'%uid)
 		return None
 	if s.st_mode & 077:
-		logging.info('getting pin for uid %d: .pin has wrong permissions'%uid)
-		return None
+		logging.info('getting pin for uid %d: .pin has wrong permissions. Fixing.'%uid)
+		os.chmod(pinfile, 0600)
 	try:
 		f = file(pinfile)
 	except IOError:
@@ -710,11 +710,9 @@ def run_forever(rfh, wfh, options, cf):
 
 	if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword)
 
-	vstatus.mk.set_message(GREETING)
 	setup_idlers(v)
 	choose_idler()
-	vstatus.mk.set_message("Booted")
-
+	vstatus.mk.set_message(GREETING)
 
 	# This main loop was hideous and the work of the devil.
 	# This has now been fixed (mostly) - mtearle