[ipfire-2.x.git] / src / patches / samba / samba-3.5.12-dns.patch

From 1b0421a1a3d2b2e0168c0957864c16adf93e326d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Wed, 21 Dec 2011 15:47:35 +0100
Subject: [PATCH] s3-dns: prevent from potentially doing wrong SRV DNS
 lookups.

With an empty sitename we asked for e.g.
_ldap._tcp.._sites.dc._msdcs.AD.EXAMPLE.COM

Guenther
---
 source3/libads/dns.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Index: samba-3.6.6/source3/libads/dns.c
===================================================================
--- samba-3.6.6.orig/source3/libads/dns.c
+++ samba-3.6.6/source3/libads/dns.c
@@ -741,7 +741,7 @@ static NTSTATUS ads_dns_query_internal(T
 				       int *numdcs )
 {
 	char *name;
-	if (sitename) {
+	if (sitename && strlen(sitename)) {
 		name = talloc_asprintf(ctx, "%s._tcp.%s._sites.%s._msdcs.%s",
 				       servicename, sitename,
 				       dc_pdc_gc_domains, realm);
Commit	Line	Data
1d13e637 AF	1	From 1b0421a1a3d2b2e0168c0957864c16adf93e326d Mon Sep 17 00:00:00 2001
	2	From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
	3	Date: Wed, 21 Dec 2011 15:47:35 +0100
	4	Subject: [PATCH] s3-dns: prevent from potentially doing wrong SRV DNS
	5	lookups.
	6
	7	With an empty sitename we asked for e.g.
	8	_ldap._tcp.._sites.dc._msdcs.AD.EXAMPLE.COM
	9
	10	Guenther
	11	---
	12	source3/libads/dns.c \| 2 +-
	13	1 files changed, 1 insertions(+), 1 deletions(-)
	14
	15	Index: samba-3.6.6/source3/libads/dns.c
	16	===================================================================
	17	--- samba-3.6.6.orig/source3/libads/dns.c
	18	+++ samba-3.6.6/source3/libads/dns.c
	19	@@ -741,7 +741,7 @@ static NTSTATUS ads_dns_query_internal(T
	20	int *numdcs )
	21	{
	22	char *name;
	23	- if (sitename) {
	24	+ if (sitename && strlen(sitename)) {
	25	name = talloc_asprintf(ctx, "%s._tcp.%s._sites.%s._msdcs.%s",
	26	servicename, sitename,
	27	dc_pdc_gc_domains, realm);