Changeset 2889

Timestamp:

05/18/06 20:18:00 (19 years ago)

Author:

jerome

Message:

Added a small fix for incorrect username used when printing as root.

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• pykota/tool.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -255 +255 @@
         self.JobId = sys.argv[1].strip()
         # use CUPS' user when printing test pages from CUPS' web interface
-        self.UserName = sys.argv[2].strip() or pwd.getpwuid(os.geteuid())[0]
+        self.UserName = sys.argv[2].strip() or self.originalUserName or pwd.getpwuid(os.geteuid())[0]
         self.Title = sys.argv[3].strip()
         self.Copies = int(sys.argv[4].strip())

pykota/trunk/pykota/tool.py

@@ -191 +191 @@
         """Drops priviledges."""
         uid = os.geteuid()
-        if uid :
-            try :
-                username = pwd.getpwuid(uid)[0]
-            except (KeyError, IndexError), msg :    
-                self.printInfo(_("Strange problem with uid(%s) : %s") % (uid, msg), "warn")
+        try :
+            self.originalUserName = pwd.getpwuid(uid)[0]
+        except (KeyError, IndexError), msg :    
+            self.printInfo(_("Strange problem with uid(%s) : %s") % (uid, msg), "warn")
+            self.originalUserName = None
+        else :
+            if uid :
+                self.logdebug(_("Running as user '%s'.") % self.originalUserName)
             else :
-                self.logdebug(_("Running as user '%s'.") % username)
-        else :
-            if self.pykotauser is None :
-                self.logdebug(_("No user named 'pykota'. Not dropping priviledges."))
-            else :    
-                try :
-                    os.setegid(self.pykotauser[3])
-                    os.seteuid(self.pykotauser[2])
-                except OSError, msg :    
-                    self.printInfo(_("Impossible to drop priviledges : %s") % msg, "warn")
+                if self.pykotauser is None :
+                    self.logdebug(_("No user named 'pykota'. Not dropping priviledges."))
                 else :    
-                    self.logdebug(_("Priviledges dropped. Now running as user 'pykota'."))
-                    self.privdropped = 1
+                    try :
+                        os.setegid(self.pykotauser[3])
+                        os.seteuid(self.pykotauser[2])
+                    except OSError, msg :    
+                        self.printInfo(_("Impossible to drop priviledges : %s") % msg, "warn")
+                    else :    
+                        self.logdebug(_("Priviledges dropped. Now running as user 'pykota'."))
+                        self.privdropped = 1
             
     def regainPriv(self) :