[Zodb-checkins] CVS: ZODB3/zdaemon - zdrun.py:1.15 zdoptions.py:1.23

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv18770/zdaemon

Modified Files:
	zdrun.py zdoptions.py 
Log Message:
Merge changes from Zope-2_7-branch to the trunk.


=== ZODB3/zdaemon/zdrun.py 1.14 => 1.15 ===
--- ZODB3/zdaemon/zdrun.py:1.14	Mon Jul 14 01:03:41 2003
+++ ZODB3/zdaemon/zdrun.py	Thu Oct  2 14:17:15 2003
@@ -223,8 +223,8 @@
         uid = os.geteuid()
         if uid != 0 and uid != self.options.uid:
             self.options.usage("only root can use -u USER to change users")
-        os.setuid(self.options.uid)
         os.setgid(self.options.gid)
+        os.setuid(self.options.uid)
 
     def run(self):
         self.proc = Subprocess(self.options)


=== ZODB3/zdaemon/zdoptions.py 1.22 => 1.23 ===
--- ZODB3/zdaemon/zdoptions.py:1.22	Thu Feb 20 10:36:53 2003
+++ ZODB3/zdaemon/zdoptions.py	Thu Oct  2 14:17:15 2003
@@ -118,7 +118,7 @@
         add(name, confname)
             Configuration option 'confname' maps to attribute 'name'
         add(name, None, short, long)
-            Command line option '-short' or '--long' maps to 'name' 
+            Command line option '-short' or '--long' maps to 'name'
         add(None, None, short, long, handler)
             Command line option calls handler
         add(name, None, short, long, handler)