From: R David Murray <rdmurray@bitdance.com>
Date: Wed, 24 Aug 2016 01:12:40 +0000 (-0400)
Subject: #26907: add some missing getsockopt constants.
X-Git-Tag: v3.6.0b1~569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdfa0ebff797b0a93eabe253f8a77a5e9d5f8dc1;p=python

#26907: add some missing getsockopt constants.

Patch by Christian Heimes, reviewed by Martin Panter.
---

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index d0a3c5edab..52c8f7f912 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -281,6 +281,10 @@ Constants
    in the Unix header files are defined; for a few symbols, default values are
    provided.
 
+   .. versionchanged:: 3.6
+      ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``
+      were added.
+
 .. data:: AF_CAN
           PF_CAN
           SOL_CAN_*
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 28f9d9f694..8b85b22da3 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -406,6 +406,10 @@ The :func:`~socket.socket.ioctl` function now supports the :data:`~socket.SIO_LO
 control code.
 (Contributed by Daniel Stokes in :issue:`26536`.)
 
+The :meth:`~socket.socket.getsockopt` constants ``SO_DOMAIN``,
+``SO_PROTOCOL``, ``SO_PEERSEC``, and ``SO_PASSSEC`` are now supported.
+(Contributed by Christian Heimes in :issue:`26907`.)
+
 
 socketserver
 ------------
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d21509e9eb..d896cc0240 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -6582,6 +6582,12 @@ PyInit__socket(void)
 #ifdef  LOCAL_PEERCRED
     PyModule_AddIntMacro(m, LOCAL_PEERCRED);
 #endif
+#ifdef  SO_PASSSEC
+    PyModule_AddIntMacro(m, SO_PASSSEC);
+#endif
+#ifdef  SO_PEERSEC
+    PyModule_AddIntMacro(m, SO_PEERSEC);
+#endif
 #ifdef  SO_BINDTODEVICE
     PyModule_AddIntMacro(m, SO_BINDTODEVICE);
 #endif
@@ -6591,6 +6597,12 @@ PyInit__socket(void)
 #ifdef  SO_MARK
     PyModule_AddIntMacro(m, SO_MARK);
 #endif
+#ifdef SO_DOMAIN
+    PyModule_AddIntMacro(m, SO_DOMAIN);
+#endif
+#ifdef SO_PROTOCOL
+    PyModule_AddIntMacro(m, SO_PROTOCOL);
+#endif
 
     /* Maximum number of connections for "listen" */
 #ifdef  SOMAXCONN