Attachment 9056 Details for Bug 10030 – proposed patch

[patch] proposed patch

0001-s4-fix-IP-enumeration-and-IPv6-loopback-detection.patch (text/plain), 1.82 KB, created by Björn Jacke on 2013-07-17 17:02:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2013-07-17 17:02:12 UTC

Size: 1.82 KB

patch

obsolete

>From a343bb398595a4edba3c334581ca40b2a9a051b8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Wed, 17 Jul 2013 18:56:09 +0200
>Subject: [PATCH] s4: fix IP enumeration and IPv6 loopback detection
>
>fixes bug #10030
>
>we used to register ::1 at the DNS if we joined a domain and if "lo" was listed
>in "interfaces".
>---
> python/pyglue.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/python/pyglue.c b/python/pyglue.c
>index 735f03a..3247802 100644
>--- a/python/pyglue.c
>+++ b/python/pyglue.c
>@@ -129,7 +129,7 @@ static PyObject *py_get_debug_level(PyObject *self)
>   return the list of interface IPs we have configured
>   takes an loadparm context, returns a list of IPs in string form
> 
>-  Does not return addresses on 127.0.0.0/8
>+  Does not return addresses on 127.0.0.0/8 or ::1/128
>  */
> static PyObject *py_interface_ips(PyObject *self, PyObject *args)
> {
>@@ -164,7 +164,8 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
> 	/* first count how many are not loopback addresses */
> 	for (ifcount = i = 0; i<count; i++) {
> 		const char *ip = iface_list_n_ip(ifaces, i);
>-		if (!(!all_interfaces && iface_list_same_net(ip, "127.0.0.1", "255.0.0.0"))) {
>+		if (!iface_list_same_net(ip, "127.0.0.1", "255.0.0.0") &&
>+		    !iface_list_same_net(ip, "::1", "128")) {
> 			ifcount++;
> 		}
> 	}
>@@ -172,7 +173,8 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
> 	pylist = PyList_New(ifcount);
> 	for (ifcount = i = 0; i<count; i++) {
> 		const char *ip = iface_list_n_ip(ifaces, i);
>-		if (!(!all_interfaces && iface_list_same_net(ip, "127.0.0.1", "255.0.0.0"))) {
>+		if ( !iface_list_same_net(ip, "127.0.0.1", "255.0.0.0") &&
>+		     !iface_list_same_net(ip, "::1", "128")) {
> 			PyList_SetItem(pylist, ifcount, PyString_FromString(ip));
> 			ifcount++;
> 		}
>-- 
>1.8.2.2
>

Actions: View

Attachments on bug 10030: 9056 | 9180 | 9181