rename lsa_dissect_LSA_SECURITY_DESCRIPTOR to lsa_dissect_sec_desc_buf

change its signature to match the autogenerated signatures.

add a small wrapper function so tha tthe handwritten lsa can still call the
function through dissect_ndr_pointer()

no changes in functionality,  essentially just a rename of a function and signature change


svn path=/trunk/; revision=13207

3 files changed, 47 insertions, 28 deletions

diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index f29d2a4fea..49c99d1b55 100644
--- a/epan/dissectors/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
@@ -390,11 +390,30 @@ lsa_dissect_sec_desc_buf_data(tvbuff_t *tvb, int offset,
 
 	return offset;
 }
-int
-lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset,
+
+/* call a sec_desc_buf through a pointer.
+   this is just temporary function until all
+   interfaces are autogenerated */
+static int
+pointer_lsa_dissect_sec_desc_buf(tvbuff_t *tvb, int offset,
 			packet_info *pinfo, proto_tree *parent_tree,
 			guint8 *drep)
 {
+	offset=lsa_dissect_sec_desc_buf(tvb, offset,
+			pinfo, parent_tree,
+			drep, 0, 0);
+	return offset;
+}
+
+
+
+
+/* dummy1,2 to make signature compatible with autogenerated dissector */
+int
+lsa_dissect_sec_desc_buf(tvbuff_t *tvb, int offset,
+			packet_info *pinfo, proto_tree *parent_tree,
+			guint8 *drep, int dummy1 _U_, guint32 dummy2 _U_)
+{
 	proto_item *item=NULL;
 	proto_tree *tree=NULL;
  	int old_offset=offset;
@@ -502,7 +521,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset,
 
 	/* security descriptor */
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE,
 		"LSA_SECURITY_DESCRIPTOR pointer: ", -1);
 
 	/* security quality of service */
@@ -1179,7 +1198,7 @@ lsa_dissect_lsarquerysecurityobject_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, guint8 *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE,
 		"LSA_SECURITY_DESCRIPTOR pointer: sec_info", -1);
 
 	offset = dissect_ntstatus(
@@ -1200,7 +1219,7 @@ lsa_dissect_lsarsetsecurityobject_rqst(tvbuff_t *tvb, int offset,
 		hf_lsa_info_type, NULL);
 
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF,
 		"LSA_SECURITY_DESCRIPTOR: sec_info", -1);
 
 	return offset;
@@ -2651,14 +2670,14 @@ lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset,
 		offset = lsa_dissect_LSA_TRUSTED_DOMAIN_AUTH_INFORMATION(tvb, offset, pinfo, tree, drep);
 		break;
 	case 9:
-		offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep);
+		offset = lsa_dissect_sec_desc_buf(tvb, offset, pinfo, tree, drep, 0, 0);
 		break;
 	case 10:
 		offset = lsa_dissect_LSA_TRUST_INFORMATION_EX(tvb, offset,
 			pinfo, tree, drep);
 	        offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_lsa_rid_offset, NULL);
-		offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset, pinfo, tree, drep);
+		offset = lsa_dissect_sec_desc_buf(tvb, offset, pinfo, tree, drep, 0, 0);
 		break;
 	}
 
@@ -3812,7 +3831,7 @@ lsa_dissect_lsartestcall_rqst(tvbuff_t *tvb, int offset,
 
 	/* [in, ref] LSA_SECURITY_DESCRIPTOR *sd */
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF,
 		"LSA_SECURITY_DESCRIPTOR pointer: sd", -1);
 
 	return offset;
@@ -3825,7 +3844,7 @@ lsa_dissect_lsartestcall_reply(tvbuff_t *tvb, int offset,
 {
 	/* [out, ref] LSA_SECURITY_DESCRIPTOR **psd) */
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_UNIQUE,
 		"LSA_SECURITY_DESCRIPTOR pointer: psd)", -1);
 
 	offset = dissect_ntstatus(
@@ -3849,7 +3868,7 @@ lsa_dissect_lsarcreatetrusteddomainex2_rqst(tvbuff_t *tvb, int offset,
 
 	/* [in, ref] LSA_SECURITY_DESCRIPTOR *sd */
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
-		lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_REF,
+		pointer_lsa_dissect_sec_desc_buf, NDR_POINTER_REF,
 		"LSA_SECURITY_DESCRIPTOR pointer: sd", -1);
 
 	/* [in] ULONG unknown */
diff --git a/epan/dissectors/packet-dcerpc-lsa.h b/epan/dissectors/packet-dcerpc-lsa.h
index 119bb570b9..271d051626 100644
--- a/epan/dissectors/packet-dcerpc-lsa.h
+++ b/epan/dissectors/packet-dcerpc-lsa.h
@@ -110,9 +110,9 @@
 #define LSA_LSARADTREPORTSECURITYEVENT		0x51
 
 int
-lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset,
+lsa_dissect_sec_desc_buf(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
-                             guint8 *drep);
+                             guint8 *drep, int dummy1, guint32 dummy2);
 int
 lsa_dissect_sec_desc_buf_data(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 4464103182..181482e684 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -2220,8 +2220,8 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2309,8 +2309,8 @@ netlogon_dissect_DELTA_DOMAIN(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2374,8 +2374,8 @@ netlogon_dissect_DELTA_GROUP(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2579,8 +2579,8 @@ netlogon_dissect_DELTA_ALIAS(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2775,8 +2775,8 @@ netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2864,8 +2864,8 @@ netlogon_dissect_DELTA_TRUSTED_DOMAINS(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -2988,8 +2988,8 @@ netlogon_dissect_DELTA_ACCOUNTS(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);
@@ -3125,8 +3125,8 @@ netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_security_information, NULL);
 
-	offset = lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvb, offset,
-		pinfo, tree, drep);
+	offset = lsa_dissect_sec_desc_buf(tvb, offset,
+		pinfo, tree, drep, 0, 0);
 
 	offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_dummy, 0);