From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 3 Jul 1996 02:58:46 +0000 (+0000)
Subject: fixed conflict between two variables called d
X-Git-Tag: samba-4.0.0alpha6~801^2~23470
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=f64bd08ad3056da5843703f87a488e2ce2067bc5

fixed conflict between two variables called d
(This used to be commit 38135c854e6b5d126939e226f815bb1a8d727f69)
---

diff --git a/source3/nameresp.c b/source3/nameresp.c
index 8484cb4fd12..c79c30d46f6 100644
--- a/source3/nameresp.c
+++ b/source3/nameresp.c
@@ -101,14 +101,14 @@ static void dead_netbios_entry(struct subnet_record *d,
 
 			if ((!NAME_GROUP(n->nb_flags)))
 			{
-				struct subnet_record *d = find_subnet(ipgrp);
-				if (d)
+				struct subnet_record *d1 = find_subnet(ipgrp);
+				if (d1)
 				{
 					/* remove the name that had been registered with us,
 					   and we're now getting no response when challenging.
 					   see rfc1001.txt 15.5.2
 					 */
-					remove_netbios_name(d, n->name.name, n->name.name_type,
+					remove_netbios_name(d1, n->name.name, n->name.name_type,
 									REGISTER, n->to_ip);
 				}
 			}