aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packet-dcerpc-samr.c27
-rw-r--r--packet-dcerpc-samr.h28
2 files changed, 39 insertions, 16 deletions
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 37d4dd6bdf..818129d7ee 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -3,7 +3,7 @@
* Copyright 2001, Tim Potter <tpot@samba.org>
* 2002 Added all command dissectors Ronnie Sahlberg
*
- * $Id: packet-dcerpc-samr.c,v 1.51 2002/07/16 22:50:45 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.52 2002/08/06 21:58:09 sharpe Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -919,6 +919,22 @@ samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset,
}
static int
+samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset,
+ packet_info *pinfo, proto_tree *tree,
+ char *drep)
+{
+ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+ samr_dissect_connect2_server, NDR_POINTER_UNIQUE,
+ "Server", hf_samr_server, 1);
+
+ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
+ hf_samr_unknown_long, NULL);
+ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
+ hf_samr_access, NULL);
+ return offset;
+}
+
+static int
samr_dissect_connect2_reply(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
@@ -4103,7 +4119,7 @@ samr_dissect_query_information_user_reply(tvbuff_t *tvb, int offset,
}
static dcerpc_sub_dissector dcerpc_samr_dissectors[] = {
- { SAMR_CONNECT_ANON, "ConnectAnonymous",
+ { SAMR_CONNECT, "SamrConnect",
samr_dissect_connect_anon_rqst,
samr_dissect_connect_anon_reply },
{ SAMR_CLOSE_HND, "Close",
@@ -4286,11 +4302,14 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = {
{ SAMR_UNKNOWN_3C, "Unknown 0x3c",
samr_dissect_unknown_3c_rqst,
samr_dissect_unknown_3c_reply },
+ { SAMR_CONNECT4, "Connect4",
+ samr_dissect_connect4_rqst,
+ samr_dissect_connect2_reply },
{0, NULL, NULL, NULL }
};
static const value_string samr_opnum_vals[] = {
- { SAMR_CONNECT_ANON, "ConnectAnonymous" },
+ { SAMR_CONNECT, "SamrConnect" },
{ SAMR_CLOSE_HND, "Close" },
{ SAMR_SET_SEC_OBJECT, "SetSecObject" },
{ SAMR_QUERY_SEC_OBJECT, "QuerySecObject" },
@@ -4351,6 +4370,8 @@ static const value_string samr_opnum_vals[] = {
{ SAMR_SET_USERINFO, "SetUserInfo" },
{ SAMR_UNKNOWN_3B, "Unknown 0x3b" },
{ SAMR_UNKNOWN_3C, "Unknown 0x3c" },
+ { SAMR_CONNECT3, "Connect3" },
+ { SAMR_CONNECT4, "Connect4" },
{ 0, NULL }
};
diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h
index e9a38693b8..b2edf20c7b 100644
--- a/packet-dcerpc-samr.h
+++ b/packet-dcerpc-samr.h
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\samr packet disassembly
* Copyright 2001, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-samr.h,v 1.5 2002/02/08 06:34:44 guy Exp $
+ * $Id: packet-dcerpc-samr.h,v 1.6 2002/08/06 21:58:09 sharpe Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,17 +28,17 @@
/* Functions available on the SAMR pipe. From Samba, include/rpc_samr.h */
-#define SAMR_CONNECT_ANON 0x00
-#define SAMR_CLOSE_HND 0x01
+#define SAMR_CONNECT 0x00
+#define SAMR_CLOSE_HND 0x01
#define SAMR_SET_SEC_OBJECT 0x02
-#define SAMR_QUERY_SEC_OBJECT 0x03
-#define SAMR_SHUTDOWN_SAM_SERVER 0x04
-#define SAMR_LOOKUP_DOMAIN 0x05
-#define SAMR_ENUM_DOMAINS 0x06
-#define SAMR_OPEN_DOMAIN 0x07
-#define SAMR_QUERY_DOMAIN_INFO 0x08
-#define SAMR_SET_DOMAIN_INFO 0x09
-#define SAMR_CREATE_DOM_GROUP 0x0a
+#define SAMR_QUERY_SEC_OBJECT 0x03
+#define SAMR_SHUTDOWN_SAM_SERVER 0x04
+#define SAMR_LOOKUP_DOMAIN 0x05
+#define SAMR_ENUM_DOMAINS 0x06
+#define SAMR_OPEN_DOMAIN 0x07
+#define SAMR_QUERY_DOMAIN_INFO 0x08
+#define SAMR_SET_DOMAIN_INFO 0x09
+#define SAMR_CREATE_DOM_GROUP 0x0a
#define SAMR_ENUM_DOM_GROUPS 0x0b
#define SAMR_CREATE_USER_IN_DOMAIN 0x0c
#define SAMR_ENUM_DOM_USERS 0x0d
@@ -87,7 +87,9 @@
#define SAMR_GET_DOM_PWINFO 0x38
#define SAMR_CONNECT2 0x39
#define SAMR_SET_USERINFO 0x3A
-#define SAMR_UNKNOWN_3B 0x3B
-#define SAMR_UNKNOWN_3C 0x3C
+#define SAMR_UNKNOWN_3B 0x3B
+#define SAMR_UNKNOWN_3C 0x3C
+#define SAMR_CONNECT3 0x3D
+#define SAMR_CONNECT4 0x3E
#endif /* packet-dcerpc-samr.h */