Attachment #115718 for bug #157513

Lines 6-13 Link Here

(-)samba35/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= ${SAMBA_BASENAME}35	8	PORTNAME= ${SAMBA_BASENAME}35
9	PORTVERSION= 3.5.6	9	PORTVERSION= 3.5.8
10	PORTREVISION?= 2
11	CATEGORIES?= net	10	CATEGORIES?= net
12	MASTER_SITES= ${MASTER_SITE_SAMBA}	11	MASTER_SITES= ${MASTER_SITE_SAMBA}
13	MASTER_SITE_SUBDIR= . old-versions rc pre	12	MASTER_SITE_SUBDIR= . old-versions rc pre
Lines 74-80 Link Here
74	CPPFLAGS+= -I${LOCALBASE}/include	73	CPPFLAGS+= -I${LOCALBASE}/include
75	LDFLAGS+= -L${LOCALBASE}/lib	74	LDFLAGS+= -L${LOCALBASE}/lib
76		75
77	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \	76	CONFIGURE_ENV+= CPPFLAGS+="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
78	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	77	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
79	PTHREAD_LDFLAGS="${PTHREAD_LIBS}"	78	PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
80	# pkg-config is used to find talloc	79	# pkg-config is used to find talloc

Lines 1-2 Link Here

(-)samba35/distinfo (-2 / +2 lines)
1	SHA256 (samba-3.5.6.tar.gz) = 466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da	1	SHA256 (samba-3.5.8.tar.gz) = 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
2	SIZE (samba-3.5.6.tar.gz) = 30803319	2	SIZE (samba-3.5.8.tar.gz) = 30721269




--- a/lib/util/util_net.c	2011-03-06 13:48:05.000000000 -0500
+++ b/lib/util/util_net.c	2011-06-01 18:35:34.000000000 -0400
@@ -351,13 +351,11 @@
From 325f03d3df7afb758b6815d327739fc121dbbe71 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 6 Jul 2010 16:55:14 +0200
Subject: [PATCH] s3: Fix another aspect of bug 7262 and make paged results work again
---
 source3/passdb/pdb_ldap.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 6ac8f0d..f4c8dbe 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -4483,10 +4483,6 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
 	bool result;
 
  retry:
-	if (state->current_entry == NULL) {
-		return false;
-	}
-
 	if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
 		return False;
 
@@ -4494,6 +4490,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
 	    !ldapsam_search_nextpage(search))
 		    return False;
 
+	if (state->current_entry == NULL) {
+		return false;
+	}
+
 	result = state->ldap2displayentry(state, search,
 					  state->connection->ldap_struct,
 					  state->current_entry, entry);
-- 
1.6.0.4

commit b6afe7ef236a454d8a6abf104b8846f817378f73
Author: Björn Jacke <bj@sernet.de>
Date:   Thu Oct 15 02:02:30 2009 +0200

    util: cope the all loopback addresses IPv4 knows
    
    The fact that we just recogniced 127.0.0.1 as loopback IP address and not the
    rest of the 127.0.0.0/8 IP address range we used the lo interface for sending
    packages even though we should send them to some more physical interface. This
    way we ended up with failing WINS registration and so on like in #6348.
    On the lo interface sendto() returned "Invalid Argument" (EINVAL).

diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 0ce495e..0511a28 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -351,13 +351,11 @@ bool is_broadcast_addr(const struct sockaddr *pss)
 }
 
 /**

Return to bug 157513

Lines 1-60 Link Here

(-)samba35/files/sernet.patch (-57 / +3 lines)
1	0001-s3-Fix-another-aspect-of-bug-7262.patch	1	--- a/lib/util/util_net.c 2011-03-06 13:48:05.000000000 -0500
2	samba3-3.4-honor-all-loopback-ips.patch	2	+++ b/lib/util/util_net.c 2011-06-01 18:35:34.000000000 -0400
3		3	@@ -351,13 +351,11 @@
4	From 325f03d3df7afb758b6815d327739fc121dbbe71 Mon Sep 17 00:00:00 2001
5	From: Volker Lendecke <vl@samba.org>
6	Date: Tue, 6 Jul 2010 16:55:14 +0200
7	Subject: [PATCH] s3: Fix another aspect of bug 7262 and make paged results work again
8	---
9	source3/passdb/pdb_ldap.c \| 8 ++++----
10	1 files changed, 4 insertions(+), 4 deletions(-)
11
12	diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
13	index 6ac8f0d..f4c8dbe 100644
14	--- a/source3/passdb/pdb_ldap.c
15	+++ b/source3/passdb/pdb_ldap.c
16	@@ -4483,10 +4483,6 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
17	bool result;
18
19	retry:
20	- if (state->current_entry == NULL) {
21	- return false;
22	- }
23	-
24	if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
25	return False;
26
27	@@ -4494,6 +4490,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
28	!ldapsam_search_nextpage(search))
29	return False;
30
31	+ if (state->current_entry == NULL) {
32	+ return false;
33	+ }
34	+
35	result = state->ldap2displayentry(state, search,
36	state->connection->ldap_struct,
37	state->current_entry, entry);
38	--
39	1.6.0.4
40
41	commit b6afe7ef236a454d8a6abf104b8846f817378f73
42	Author: Björn Jacke <bj@sernet.de>
43	Date: Thu Oct 15 02:02:30 2009 +0200
44
45	util: cope the all loopback addresses IPv4 knows
46
47	The fact that we just recogniced 127.0.0.1 as loopback IP address and not the
48	rest of the 127.0.0.0/8 IP address range we used the lo interface for sending
49	packages even though we should send them to some more physical interface. This
50	way we ended up with failing WINS registration and so on like in #6348.
51	On the lo interface sendto() returned "Invalid Argument" (EINVAL).
52
53	diff --git a/lib/util/util_net.c b/lib/util/util_net.c
54	index 0ce495e..0511a28 100644
55	--- a/lib/util/util_net.c
56	+++ b/lib/util/util_net.c
57	@@ -351,13 +351,11 @@ bool is_broadcast_addr(const struct sockaddr *pss)
58	}	4	}
59		5
60	/**	6	/**