[Tim Potter <tpot@xxxxxxxxx>]

Here's a patch to finally get rid of all the references to the term
MSRPC.


Regards,

Tim.

Index: packet-dcerpc-dfs.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-dfs.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-dfs.h
--- packet-dcerpc-dfs.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-dfs.h	2001/12/16 09:25:38
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_DFS_H
-#define __PACKET_MSRPC_DFS_H
+#ifndef __PACKET_DCERPC_DFS_H
+#define __PACKET_DCERPC_DFS_H
 
 /* Functions available on the NETDFS pipe.  From Samba, include/rpc_dfs.h */
 
Index: packet-dcerpc-lsa.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-lsa.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-lsa.h
--- packet-dcerpc-lsa.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-lsa.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_LSA_H
-#define __PACKET_MSRPC_LSA_H
+#ifndef __PACKET_DCERPC_LSA_H
+#define __PACKET_DCERPC_LSA_H
 
 /* Functions available on the LSA pipe.  From Samba, include/rpc_lsa.h */
 
Index: packet-dcerpc-netlogon.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-netlogon.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-netlogon.h
--- packet-dcerpc-netlogon.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-netlogon.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_NETLOGON_H
-#define __PACKET_MSRPC_NETLOGON_H
+#ifndef __PACKET_DCERPC_NETLOGON_H
+#define __PACKET_DCERPC_NETLOGON_H
 
 /* Functions available on the NETLOGON pipe.  From Samba, 
    include/rpc_netlogon.h */
Index: packet-dcerpc-reg.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-reg.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-reg.h
--- packet-dcerpc-reg.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-reg.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_REG_H
-#define __PACKET_MSRPC_REG_H
+#ifndef __PACKET_DCERPC_REG_H
+#define __PACKET_DCERPC_REG_H
 
 /* Functions available on the WINREG pipe.  From Samba, include/rpc_reg.h */
 
Index: packet-dcerpc-samr.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-samr.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-samr.h
--- packet-dcerpc-samr.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-samr.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_SAMR_H
-#define __PACKET_MSRPC_SAMR_H
+#ifndef __PACKET_DCERPC_SAMR_H
+#define __PACKET_DCERPC_SAMR_H
 
 /* Functions available on the SAMR pipe.  From Samba, include/rpc_samr.h */
 
Index: packet-dcerpc-spoolss.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-spoolss.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-spoolss.h
--- packet-dcerpc-spoolss.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-spoolss.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_SPOOLSS_H
-#define __PACKET_MSRPC_SPOOLSS_H
+#ifndef __PACKET_DCERPC_SPOOLSS_H
+#define __PACKET_DCERPC_SPOOLSS_H
 
 /* Functions available on the SPOOLSS pipe.  From Samba, 
    include/rpc_spoolss.h */
Index: packet-dcerpc-srvsvc.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-srvsvc.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-srvsvc.h
--- packet-dcerpc-srvsvc.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-srvsvc.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_SRVSVC_H
-#define __PACKET_MSRPC_SRVSVC_H
+#ifndef __PACKET_DCERPC_SRVSVC_H
+#define __PACKET_DCERPC_SRVSVC_H
 
 /* Functions available on the SRVSVC pipe.  From Samba, include/rpc_srvsvc.h */
 
Index: packet-dcerpc-wkssvc.h
===================================================================
RCS file: /cvsroot/ethereal/packet-dcerpc-wkssvc.h,v
retrieving revision 1.2
diff -u -r1.2 packet-dcerpc-wkssvc.h
--- packet-dcerpc-wkssvc.h	2001/12/09 00:07:37	1.2
+++ packet-dcerpc-wkssvc.h	2001/12/16 09:25:39
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PACKET_MSRPC_WKSSVC_H
-#define __PACKET_MSRPC_WKSSVC_H
+#ifndef __PACKET_DCERPC_WKSSVC_H
+#define __PACKET_DCERPC_WKSSVC_H
 
 /* Functions available on the WKSSVC pipe.  From Samba, include/rpc_wkssvc.h */
 
Index: packet-smb-pipe.c
===================================================================
RCS file: /cvsroot/ethereal/packet-smb-pipe.c,v
retrieving revision 1.61
diff -u -r1.61 packet-smb-pipe.c
--- packet-smb-pipe.c	2001/12/10 00:25:34	1.61
+++ packet-smb-pipe.c	2001/12/16 09:25:56
@@ -2657,7 +2657,7 @@
 };
 
 #define PIPE_LANMAN     1
-#define PIPE_MSRPC      2
+#define PIPE_DCERPC     2
 
 /* decode the SMB pipe protocol
    for requests
@@ -2814,8 +2814,8 @@
 		if(strncmp(pipe,"LANMAN",6) == 0){
 			trans_subcmd=PIPE_LANMAN;
 		} else {
-			/* assume it is MSRPC*/
-			trans_subcmd=PIPE_MSRPC;
+			/* assume it is DCERPC */
+			trans_subcmd=PIPE_DCERPC;
 		}
 		
 		if (!pinfo->fd->flags.visited)
@@ -2842,7 +2842,7 @@
 			    tree);
 			break;
 
-		case PIPE_MSRPC:
+		case PIPE_DCERPC:
 			/*
 			 * Only dissect this if we know the FID.
 			 */