aboutsummaryrefslogtreecommitdiffstats
path: root/packet-dcerpc-netlogon.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-02-14 06:17:20 +0000
committerTim Potter <tpot@samba.org>2003-02-14 06:17:20 +0000
commitb99ad855f04c9fc473f05b75a86068f86d925faa (patch)
tree790c64e110e9c45e66fdb2c2a0c2aec68384ad3e /packet-dcerpc-netlogon.c
parentc57fb295abc6015289e27f080ed4e58607bdb756 (diff)
Display user name in COL_INFO for ServerAuthenticate2 request.
Add note about putting DOMAIN\Username in COL_INFO when dissecting LOGIN_IDENTITY_INFO (part of SamLogon RPC). svn path=/trunk/; revision=7147
Diffstat (limited to 'packet-dcerpc-netlogon.c')
-rw-r--r--packet-dcerpc-netlogon.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c
index 423abb30c9..e3978a1358 100644
--- a/packet-dcerpc-netlogon.c
+++ b/packet-dcerpc-netlogon.c
@@ -3,7 +3,7 @@
* Copyright 2001,2003 Tim Potter <tpot@samba.org>
* 2002 structure and command dissectors by Ronnie Sahlberg
*
- * $Id: packet-dcerpc-netlogon.c,v 1.75 2003/02/10 23:45:56 guy Exp $
+ * $Id: packet-dcerpc-netlogon.c,v 1.76 2003/02/14 06:17:20 tpot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -489,6 +489,9 @@ netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset,
tree = proto_item_add_subtree(item, ett_IDENTITY_INFO);
}
+ /* XXX: It would be nice to get the domain and account name
+ displayed in COL_INFO. */
+
offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
hf_netlogon_logon_dom, 0);
@@ -3800,8 +3803,11 @@ netlogon_dissect_netserverauthenticate2_rqst(tvbuff_t *tvb, int offset,
offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset,
pinfo, tree, drep);
- offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep,
- NDR_POINTER_REF, "User Name", hf_netlogon_acct_name, 0);
+ offset = dissect_ndr_pointer_cb(
+ tvb, offset, pinfo, tree, drep,
+ dissect_ndr_wchar_cvstring, NDR_POINTER_REF,
+ "User Name", hf_netlogon_acct_name,
+ cb_str_postprocess, GINT_TO_POINTER(CB_STR_COL_INFO | 1));
offset = netlogon_dissect_NETLOGON_SECURE_CHANNEL_TYPE(tvb, offset,
pinfo, tree, drep);