From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Thu, 20 Oct 2011 21:21:58 +0000 (+0200)
Subject: Issue #9168: now smtpd is able to bind privileged port.
X-Git-Tag: v2.7.3rc1~389
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47fb192ddafa48e3408c054c4ac1b1dc976164db;p=python

Issue #9168: now smtpd is able to bind privileged port.
---

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index e0544e4c52..b4d208b2ee 100755
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -524,6 +524,16 @@ def parseargs():
 if __name__ == '__main__':
     options = parseargs()
     # Become nobody
+    classname = options.classname
+    if "." in classname:
+        lastdot = classname.rfind(".")
+        mod = __import__(classname[:lastdot], globals(), locals(), [""])
+        classname = classname[lastdot+1:]
+    else:
+        import __main__ as mod
+    class_ = getattr(mod, classname)
+    proxy = class_((options.localhost, options.localport),
+                   (options.remotehost, options.remoteport))
     if options.setuid:
         try:
             import pwd
@@ -539,16 +549,6 @@ if __name__ == '__main__':
             print >> sys.stderr, \
                   'Cannot setuid "nobody"; try running with -n option.'
             sys.exit(1)
-    classname = options.classname
-    if "." in classname:
-        lastdot = classname.rfind(".")
-        mod = __import__(classname[:lastdot], globals(), locals(), [""])
-        classname = classname[lastdot+1:]
-    else:
-        import __main__ as mod
-    class_ = getattr(mod, classname)
-    proxy = class_((options.localhost, options.localport),
-                   (options.remotehost, options.remoteport))
     try:
         asyncore.loop()
     except KeyboardInterrupt:
diff --git a/Misc/NEWS b/Misc/NEWS
index 426a42dbf5..dd2874b400 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #9168: now smtpd is able to bind privileged port.
+
 - Issue #12529: fix cgi.parse_header issue on strings with double-quotes and
   semicolons together. Patch by Ben Darnell and Petri Lehtinen.