Fix "samr_dissect_query_information_alias_reply()" to dissect the
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 22 Apr 2002 02:04:37 +0000 (02:04 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 22 Apr 2002 02:04:37 +0000 (02:04 +0000)
ALIAS_INFO structure before the status.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5215 f5534014-38df-0310-8fa8-9805f1628bb7

packet-dcerpc-samr.c

index f29b8e88b24ac38e3609b57a663ad881ff8cf2ff..870163c673658b075d411379b91f2147f2c9f3e5 100644 (file)
@@ -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.33 2002/04/22 00:09:21 guy Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.34 2002/04/22 02:04:37 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1284,20 +1284,6 @@ samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset,
        return offset;
 }
 
-static int
-samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, 
-                                          packet_info *pinfo, 
-                                          proto_tree *tree, char *drep)
-{
-       if (check_col(pinfo->cinfo, COL_INFO))
-               col_set_str(pinfo->cinfo, COL_INFO, "QueryAliasInfo response");
-
-        offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
-                                 hf_samr_rc, NULL);
-
-       return offset;
-}
-
 static int
 samr_dissect_ALIAS_INFO_1 (tvbuff_t *tvb, int offset, 
                              packet_info *pinfo, proto_tree *tree,
@@ -1364,6 +1350,24 @@ samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset,
        return offset;
 }
 
+static int
+samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, 
+                                          packet_info *pinfo, 
+                                          proto_tree *tree, char *drep)
+{
+       if (check_col(pinfo->cinfo, COL_INFO))
+               col_set_str(pinfo->cinfo, COL_INFO, "QueryAliasInfo response");
+
+       offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
+                       samr_dissect_ALIAS_INFO_ptr, NDR_POINTER_REF,
+                       "", -1, 0);
+
+        offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep,
+                                 hf_samr_rc, NULL);
+
+       return offset;
+}
+
 static int
 samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, 
                              packet_info *pinfo, proto_tree *tree,