[CalendarServer-changes] [3801] CalendarServer/trunk/calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 3801
          http://trac.macosforge.org/projects/calendarserver/changeset/3801
Author:   wsanchez at apple.com
Date:     2009-03-09 16:16:50 -0700 (Mon, 09 Mar 2009)
Log Message:
-----------
cosmetic

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2009-03-09 21:36:24 UTC (rev 3800)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2009-03-09 23:16:50 UTC (rev 3801)
@@ -26,7 +26,7 @@
 
 from tempfile import mkstemp
 from subprocess import Popen, PIPE
-from pwd import getpwnam
+from pwd import getpwnam, getpwuid
 from grp import getgrnam
 from OpenSSL.SSL import Error as SSLError
 
@@ -210,8 +210,7 @@
 
         def gottaBeRoot():
             if os.getuid() != 0:
-                import pwd
-                username = pwd.getpwuid(os.getuid())[0]
+                username = getpwuid(os.getuid()).pw_name
                 raise UsageError("Only root can drop privileges.  You are: %r"
                                  % (username,))
 
@@ -278,12 +277,12 @@
                 )
 
             if username:
-                uid = getpwnam(username)[2]
+                uid = getpwnam(username).pw_uid
             else:
                 uid = -1
 
             if groupname:
-                gid = getgrnam(groupname)[2]
+                gid = getgrnam(groupname).pw_uid
             else:
                 gid = -1
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090309/165ee54c/attachment.html>