merge from head.

[nodemanager.git] / tools.py

diff --git a/tools.py b/tools.py
index b6e5405..6b3a84b 100644 (file)
--- a/tools.py
+++ b/tools.py
@@ -10,7 +10,7 @@ import threading
 import logger
 
 
-PID_FILE = '/var/run/node_mgr.pid'
+PID_FILE = '/var/run/nm.pid'
 
 def as_daemon_thread(run):
     """Call function <run> with no arguments in its own thread."""
@@ -43,9 +43,10 @@ def fork_as(su, function, *args):
         try:
             os.chdir('/')
             close_nonstandard_fds()
-            pw_ent = pwd.getpwnam(su)
-            os.setegid(pw_ent[3])
-            os.seteuid(pw_ent[2])
+            if su:
+                pw_ent = pwd.getpwnam(su)
+                os.setegid(pw_ent[3])
+                os.seteuid(pw_ent[2])
             child_pid = os.fork()
             if child_pid == 0: function(*args)
         except: