X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=22958bd7a55d678ed58da67cad8ed6c360646bdc;hp=12ebe5b1282f3642e9e9d1555fa7109414021045;hb=a741740a454c7f9fcfbaa0e4a8f5c1578c7a1262;hpb=a559cf6efade5d0fb6449ee1fb4286eacf6bfd88 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