From f2cce7516c4afff35b1285e73e22c3b9b595d19d Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au>
Date: Sun, 15 Sep 2002 06:36:16 +0000
Subject: [PATCH] From Luke Howard: Small fix for NETLOGON: LogonGetDomainInfo

svn path=/trunk/; revision=6297
---
 AUTHORS                  | 3 +++
 packet-dcerpc-netlogon.c | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 01331fd615..0b6d4333a1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1416,6 +1416,9 @@ Jamie Fournier <jafour1[AT]yahoo.com>
 		UBIKDISK, UBIKVOTE, BOSSVR, FTSERVER, CDS_CLERKSERVER,
 		KRB5RPC, REP_PROC, SECIDMAP, TKN4INT, FLDB, AFS4INT
 
+Luke Howard <lukeh[AT]au.padl.com>
+	NETLOGON bugfix for LogonGetDomainInfo
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index f6bba1d66d..087dfe5c64 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *  2002 structure and command dissectors by Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-netlogon.c,v 1.54 2002/08/28 21:00:09 jmayer Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.55 2002/09/15 06:36:16 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -5100,8 +5100,10 @@ static int
 netlogon_dissect_netrlogongetdomaininfo_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
-	offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset,
-		pinfo, tree, drep);
+       /* Unlike the other NETLOGON RPCs, this is not a unique pointer. */
+       offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+               dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_REF,
+               "Server Handle", hf_netlogon_computer_name, 0);
 
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
 		dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE,